From nobody Mon Feb 23 00:25:55 2026 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 4fK1qB2zTfz6SMpr; Mon, 23 Feb 2026 00:25:58 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fK1qB1pFMz3t2l; Mon, 23 Feb 2026 00:25:58 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771806358; 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=jYDCRbGyHm2MFcxFfhyh5wk0eyJrJxYflPviNjPvEIo=; b=gPVVyOGNbZXQQAx7eF89QHHhlhJHQB3uXmF8l5XVzZgkYP1575opc+RHhGBMPM46obwfhD yU3xIMtinURwllCqG2q+egqF4hGe8AmkkihgV5B1aYeC5nIWntwsbBeqIBDOFiaV1PwVRP zDypCKDUX8cSuDD+Nkfp4LCyDxe8tzR7aIWDuFabBZPI3F5hQWJyY3DWvY1pnQb0xmc8bB hOii0SO0WeqIB1NXqSFcI2AvjnMj9Qvq768XcQhT6kZnYibp2NJ7e8sB3cZ7Mn1pJpOheY PL/vGVeaLIVB7CgnuxcEW8NCHBMdOhF8SXm6BBFgPm8dGHIwTuW+zMiZsmedaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771806358; a=rsa-sha256; cv=none; b=kBNrRvk3g9cqaURFKaUKT07u2WkBtoTFpTai+w2yuLdtdnH/2PLriJl3Bzs1eI6Kgz9nDk vMHyMCa33uca6QucVSMZe9y8sBeVvgUtMSPhL1ihIyj/OiqZXyExyZueOXxAQfXuOIYEOq mbeo2QmyXT1SzEnSVfGeY0veI0C9GZ/za4k/quuvSjADDk0IR6p45GfRRepmiCYZZqYKvh dmXI4Rv9N2emZfbEhqh07YUnlnGjEitPgYvz1XjeRHQJmXTtM7vXV3K2EyJZAuGZrN+jSu FQwRg2wnbebsjyDqGbVCHl5GtY5MaxdJXvZNYEdt5TkvXHNNxifFiGFiKHXenA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771806358; 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=jYDCRbGyHm2MFcxFfhyh5wk0eyJrJxYflPviNjPvEIo=; b=AHhDITh2YcHeIMNRYbzLZG6I9L78lVriPcQ4YGoBqVEdie53WgPVxD8Vlvg+1apiN3AwxW msruapdOjaf206dzzeZFoUnDxXj9coraQw8bXa1hsPNBzX1FdbeKuq33QSnbggUTXJ7inr C/BkqDNtUqZr9q1p3kW6ABG7Ukb6AToCjRPwu3Gv6AVSPMjWnEt0xsTHurEeZs7vaOHY/r b9ilHtalCO0RcNU+m6tZbnZcPtD41t3tSZyFgwoxVOFIB+eg6RYog9Tm4p15FDWBgODqNk DHHDQFpPku7XLTtoCneaYq79Mw38ne4/9g5vqSbxiJF7YQNvVPyIcw3FE8cpTA== Received: from ltc.des.dev (lfbn-nan-1-698-103.w86-236.abo.wanadoo.fr [86.236.35.103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fK1qB0HXVz1C0C; Mon, 23 Feb 2026 00:25:58 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 40B03F6777; Mon, 23 Feb 2026 01:25:55 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Baptiste Daroussin Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 507c611aeac7 - main - m4: Fix eval output width In-Reply-To: (Baptiste Daroussin's message of "Tue, 17 Feb 2026 16:12:03 +0100") References: <699474ed.430b3.aec99f6@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Mon, 23 Feb 2026 01:25:55 +0100 Message-ID: <86v7fotiek.fsf@ltc.des.dev> 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 Baptiste Daroussin writes: > Did you try to upstream this? espie@ is responsive to such patches in gen= eral. Yes, he passed them on to one of his students, thank you for reminding me. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Mon Feb 23 03:39:03 2026 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 4fK68H4JKTz6Sfwr; Mon, 23 Feb 2026 03:41:03 +0000 (UTC) (envelope-from ivy@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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fK68H2mtSz3FqJ; Mon, 23 Feb 2026 03:41:03 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771818063; 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=PRGFLpU6YP73ePZV7XbbHqmi76Qhdr0itV3fX0Wryto=; b=NJc5RdlY/2Zye9ViOKtPzwg6eVa5ioGs1FahHv/B5MQEo9n3rCYZJrYIptX9D16oNgD2MR rqBqrWa6DnEA3oSrWpXwmsbAbY5GF0RaZoYEDIIBnWgedQO6yX/HZPIh4KvBK4LSnJSXQn zLhGTbAsogKbgEUZqAktXwofEx9qVQdj+a408XRIJE8Sl3lIDOYd5thgJPz6Rhd1UWJ+9k 0HMHh4DZSWdX1ghG4F7Jn3ziDJDsdQJ1bdbTLSD6VmleXUF7ORhS0Y8m+kfA9Q4AHP0r1j /2/4O9sIi08PlGSsQvtnLy4DJw4n6EuklBHqxE157pbb1zMxOW5tK0ND7dbBAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771818063; a=rsa-sha256; cv=none; b=kHll4gQZviyBC8QV94Wcgly7kmQoJx1Wz7aK5V1jshiW/cSByF03/m4RjDTAjBSg7THwIZ QNhP2tnj5HdO0JBvyu6ZwWuMUlhwWajFzsczrmPgpMoB611w8dTV1+rvfhXvpaXu7D6Jrp vZTYnVN9cRV2ZexXdQWA8Dbxa2qfKtPGd4oXc2GqprDcjXal8Gqi0MGE8oyu+wjblCHg8e vU1d4GYotQAknWOGBSRZEg5FPsQU50c9hXkYGOObhPkr1W1MUeYioqo9SHzSrqS1wwxVzv TjXrQLNmgVUevC2+JIpiL8mCrPhPcduDs4HAN2nNHP7gwcb9HUxq77sW14EGNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771818063; 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=PRGFLpU6YP73ePZV7XbbHqmi76Qhdr0itV3fX0Wryto=; b=d5fJ0coxOQjZjKsJEtKZvnBXiOVkDSZyrVxhf192cTrZ5FyvvUqPbxJohWrD1/dtMzvUxf Rcm8BEqEI3j/NgHoo0Ujq7i99cNBKUeMXMBSepln4gJ1xwVjZHN8Oz2j3ICXQDw24RyzgV s7V16RTrxj0Jt+ouP8mFprb5aKkWCkXSeFTN8GZnQ8ietwi7G9YeCah7u11PQtlFpp48t5 ANtZYr265cQsxTf2MGFmgtRMJNDxBEGNvLMg6sc9p/K50PL5r+piozig3gkx7Dzmf9hMA1 W7YIxSn08nWkuFWx2V4nneCKM3rLv7BoA5xvpmqlvNCyQJDPguF6zJptuHT/+Q== Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (using TLSv1.3 with cipher TLS_AES_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: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fK68G54SGz1Gmn; Mon, 23 Feb 2026 03:41:02 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Mon, 23 Feb 2026 03:39:03 +0000 From: Lexi Winter To: Ravi Pokala Cc: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: d4f6cb754249 - main - build: Move all of lp under LPR option Message-ID: Mail-Followup-To: Ravi Pokala , Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <699a2335.220a6.2c3156ae@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-sha512; protocol="application/pgp-signature"; boundary="oKHSM9g455v0w4Ko" Content-Disposition: inline In-Reply-To: --oKHSM9g455v0w4Ko Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Ravi Pokala wrote in : > Why is the package "lp", when the conditional uses "LPR"? i named this package "lp" because it contains support for (line) printers. i suppose you could argue that "lpr" might be a more suitable name on BSD since that's what the traditional frontend is called, but either seems fine to me. > Shouldn't they match? there isn't generally any corresponence between package names and src.conf options, except where this happens naturally, and even when the same name is used, they don't always mean the same thing. for example, WITHOUT_SENDMAIL controls both sendmail and libmilter, but in pkgbase these are two separate packages, so even though the src.conf option has the same name, it means something different. so, as a general rule, there's no particular effort made to ensure package names match src.conf option names. --oKHSM9g455v0w4Ko Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaZvL0wAKCRD1nT63mIK/ YOR4AQCJOTc7he+NYeYEF2HFeNhkjgzq/8tEcACgxYymkdFksAD+P7qcLwHiQmzM qsopdlEkFvfq5RlRbMFY5oGmoVXXBQY= =Uq8n -----END PGP SIGNATURE----- --oKHSM9g455v0w4Ko-- From nobody Mon Feb 23 08:28:20 2026 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 4fKDWm4stMz6SrWT for ; Mon, 23 Feb 2026 08:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKDWm30ldz3kcT for ; Mon, 23 Feb 2026 08:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771835300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FlQ4m6VCd6Ynn4IaElj18idF6dY46dGnnL97xxP55yg=; b=Nnej92mKjM3VNajhTscMTboad3nIgBUPLNkGSlvGlXH+SbfJ//jkSrHSbbcThyOA6GpkN5 gVD0aWoUxqkmn+tmikTm7NKXxQsJUpSEK4iPO6UEG+QE/lVoo84AlDX/0iywBVe8ogm4g2 kLXTCEnb1IdPwQFRm9X0Q0N91TzzYM1cFGhAbY9RXV0IMOV42i96fKkxLHU8olTrkP5AUb TrBN6vRSLJvSFQdAV8mfpoTMFKtUcj3GUKbP9DoNMF6XEnR0Hhs2mD6V63zv7rXzXk0ksM nJVJduFXPP8Kckbgmsbrew4xGQFFj5DzMdHu8IpJRnKQn81jROIvuKXRJeEUYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771835300; a=rsa-sha256; cv=none; b=O6y/nGdNfwG0kPoxdxe+GtPmySEUMsIl/N8w2c8BNNEgTW6LfEKR3TGf7gzr7gMk92vwpC O8SGFBsKxHztjfrOMh98J0DdFr9WRHHUbwHsSRs9cuD3/ieHuSN2IVjNxRwFWItQ30UEBR SqNyYPqdO0LZM0mK/Abl70mxsvp9z3bOblv9lmaUOwIK0TkUE3P9vI3fOSJ4FOiSIVH3xl YH5CfR3Up6Zp6qM0+cXG+Td+Z4bfMBTvWrQ+qVwQHpbLeC5sj+/H3wNvMh4qf4CCBMbKv/ ME1DXkboWCMKiVn0brxBOHWwXgRMETu7VCeVzgArMEdDhBE187bCgVeVwOtxDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771835300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FlQ4m6VCd6Ynn4IaElj18idF6dY46dGnnL97xxP55yg=; b=NvfNbVsFLkj6GtBwGxHevxyMTXLhLkEinc9oel0E+PzU3MY1++QGptmYD3eUr6VSbLCmWL dXvgKsaIo25hJy5g9jhGzs1logMZOaOittAQb8pWCq0vYUgdHJ4+lwSyawdtG76jDcYvdE 7RDT21hHXEIJ4oXe8Qf2Lwq9qgNs3nM5VG4xJMJ+TocWnwDLjdHXp2rDuJECsjNIrjtmGf Nlrd6a9jkkMKE+wJ76nbJM8BjdoxJwcAtAh4apu7TA/6vtn04HWj6dyeL8+/ZTcsOZ2/8C RNnGaKgKMC9YTy77+82ZHb08vKU4yFOB+Ol0Gr91P4SHcuGefcgvFXNppXXc9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKDWm2Wn0z6Lw for ; Mon, 23 Feb 2026 08:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 201a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Feb 2026 08:28:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 9a20515bc9ce - main - sh.1: Add .sh_history and .shrc to FILES 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: 9a20515bc9ce3fe6d7f09fd6bdece0dd45bdbc87 Auto-Submitted: auto-generated Date: Mon, 23 Feb 2026 08:28:20 +0000 Message-Id: <699c0fa4.201a8.29b12b1f@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=9a20515bc9ce3fe6d7f09fd6bdece0dd45bdbc87 commit 9a20515bc9ce3fe6d7f09fd6bdece0dd45bdbc87 Author: Alexander Ziaee AuthorDate: 2026-02-23 08:16:33 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-23 08:18:23 +0000 sh.1: Add .sh_history and .shrc to FILES MFC after: 3 days Reviewed by: bapt (previous), jilles, tembun@bk.ru Differential Revision: https://reviews.freebsd.org/D55295 --- bin/sh/sh.1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 63755bbcf8a9..4f860d89c654 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -3091,6 +3091,10 @@ which may affect the shell as described under .Bl -tag -width "/etc/suid_profileXX" -compact .It Pa ~/.profile User's login profile. +.It Pa ~/.sh_history +Default shell history. +.It Pa ~/.shrc +Default shell resources. .It Pa /etc/profile System login profile. .It Pa /etc/shells From nobody Mon Feb 23 08:32:54 2026 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 4fKDd21y83z6Ss13 for ; Mon, 23 Feb 2026 08:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKDd21RPGz3l62 for ; Mon, 23 Feb 2026 08:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771835574; 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=Jo1BERWZvVWtX7dUwanWqwmTkGDCbYzaZZIXja9+cCs=; b=lvSQ4nOfxhWeRkpwmO3tQqXDx2+r5SjOYff6iV4KbIVrOGPWc7yobAYMMd1EgDKG767HBB Ci654x2PAJ0qOhsCu7EV4fEJsrKg72lrDUzcpKoQhofou+VzJmL40mf0PxXFmU+0YIR6JX TyVxZ/K/cJgXw5QYLSkiKtLpSoFOH8UH3DHITMaVH9CxB503ikpnJUI6QeSwVxPdyQJDqZ 3ZwAkiNXmRF/aaMYRaDc6xuKkPoyHWvOtyDNqq63EI3kv+gUZ75JdVmsOcQK361VqpAKwk IXCGMvomB+EaQvvkksMsIKkJXkGbFRfTK7eIYH8Z78cmTXGv3LBCR3cgviBZ3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771835574; a=rsa-sha256; cv=none; b=FFIQPwoesFjZqRFVA5r1ean0bEgI4ZMWogbhmQAW55AtMlOQJ4hIH3P6IHgQq2rBfSN4nW 92pbHd0VseGKttwNQeJ97camBAp/nFV0x4kM8lX2jVvYvslYeuquKeS/E0nn+lloPIGtzj ZJaticoMMnLr0kkVwpSgLGhP2JwZIrPCfvij+i39ZXJBy12OUEsvuaEmM3kvZPvULc46nl 0gla2PxeX/qdECz6z523JzyzOYHOadMkCFiBouhgxB4DC7LvreEXPDlhIa4HRI/z95ZHDu EJxdTYs263rko4yxRJtY0mVxuGj9Yl7cba1LjRWu/wYPRIlxRUFiJlJvB+Nv4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771835574; 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=Jo1BERWZvVWtX7dUwanWqwmTkGDCbYzaZZIXja9+cCs=; b=u+NK/ainWxjOUkfWwH/fc7CngAfDFOZ2I8Hr6boaCimSZAInD4ddMqvD6o9N0x223QSjZK zwNA1G8LQmY70Wqe8/rWdTKIlXwnkvNOg9EnLr6Pt/2RGXLu/aPlNuUt0iQ7QgS8uppra7 2nuBBfV9Bn68LqlZoOlJ2FQvd4DSx8gomy34bcN7nAFAsthpYopYXieh93VtHuNV6MT4ZD D8K2E8dLgyym+1F/+Vsqr6lf1Lt5VdFnKvxff4BsHmEQKjoh/LihX/wSyRXBViLvqKJbkx MP0yrRWvRCHTsEngJT/WcDuIGDJRjhNCk+lWcHqICeBcyVn0KOmw/dRy/OO4Kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKDd20tVLz6Yl for ; Mon, 23 Feb 2026 08:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 211d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Feb 2026 08:32:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: ab835b37075e - main - debug.sh: Fix a typo 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: ab835b37075e6478ef82f8c807a2335f5d19edaf Auto-Submitted: auto-generated Date: Mon, 23 Feb 2026 08:32:54 +0000 Message-Id: <699c10b6.211d3.4a3957ad@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=ab835b37075e6478ef82f8c807a2335f5d19edaf commit ab835b37075e6478ef82f8c807a2335f5d19edaf Author: Artem Bunichev AuthorDate: 2026-02-23 08:31:31 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-23 08:31:34 +0000 debug.sh: Fix a typo MFC after: 3 days Reviewed by: emaste, guest-seuros, sjg, ziaee Differential Revision: https://reviews.freebsd.org/D55416 --- libexec/rc/debug.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/debug.sh b/libexec/rc/debug.sh index 739c81a709f6..4284a6e3b5fb 100755 --- a/libexec/rc/debug.sh +++ b/libexec/rc/debug.sh @@ -201,7 +201,7 @@ _debugOn() { DEBUG_DO= DEBUG_SKIP=: DEBUG_X=-x - # do this firt to reduce noise + # do this first to reduce noise case ",$DEBUG_SH," in *,$1:debug_add:*) _debugAdd $1;; *,$2:debug_add:*) _debugAdd $2;; From nobody Mon Feb 23 10:05:23 2026 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 4fKGgl4ZC6z6T2m4 for ; Mon, 23 Feb 2026 10:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKGgl3n99z3xwr for ; Mon, 23 Feb 2026 10:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771841123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+njbO6gaymjezJTfocKgXyF84ZP/SyfQ+D1bT4V18YM=; b=j190LRvFGt8Db/apDzuDWxFmD7wbpndGuAdtn0GxNEPc6anzGXYK2W9HYtTh2vmApYd/Bj BYHSZhj/1eNf/b8VInPHKno7o2eEGTbZjoDgMm0fGeGiiPFDaX/TQKpMkf88qSlFl6Pbex YlclTBro4lG7nGHQSszTlwGbFkH0K2Xx5dg1+DJYtN8ILOQ7QGtn72v+r0X+IyrD4srJP9 E+hgSa8SJmYs0jSrXI/DMldLfkqP5x9Hizuls0zNpuhPx/MAkVOEisunxCU9HGkJnJjwN7 9HKkSE5rmqSOHgLCl9/3b17liZsjBkq7LVxjalXVASa1Es8wO8NStDeq8GJCrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771841123; a=rsa-sha256; cv=none; b=ohXqzq4buJ6faR/Q/yK1Rto2SRpXWhQWYFQ6hIQ6QsywJzWgdXTV6jt2q6OMCASfM4231x B24fw8yvVyRZ/ZemgL5NA9Ch9qBh7h0o+Gk2NxE3yNf48HehqMroDjSHThXphF+j8UNU9t bkLZyJZNQ+/f9bWu30wKHhm7gNxo7v/GY3bTkX1neVzp49HW/wTkxsZxfBxvQc/s19jdzu DTb82nJMBtOkjbQ3A6GrCzJWqsi0Yp8KY/vgMXr8/jdp2cIEv/B2KoLQ9xfLOcmBrLKLFR 3nyvjT3SP866iqyLjgitwVawGAUOxH/Ne7gegMHzCJM5qFF6tYfCt/fPGcIoWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771841123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+njbO6gaymjezJTfocKgXyF84ZP/SyfQ+D1bT4V18YM=; b=FQfTrmlyB+rps/QIgKJOk1pY8lqFllyEoZkXpDqoSjpolvymPWFF9Kyb0ek2QyarpAxghx MJtw4bD3iBuN+JLqSNuOslWj81QaAlfpJuS4l7B7xFBUf3qNv6eUVG81iUeFR+COB2XfOi E5w3tRxIQ+LYmreDXUfRZG0BZrZOKymg2owGfS5NdjAWCQuZFYiI2a/34+uySmFesPzQjs 0QxrPNsGxuZOdTNMWQrw8bIGnvAqw8Ix82SceAa26ccA6B0V+4LLHBCXkk5s/o0PM0pHlJ vxoZINroUQ4aRXJBP1fP+c/TmVRjXQ/sTvz7DZX9lllMvA2zHunB5qhImKvnHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKGgl3HRmz99J for ; Mon, 23 Feb 2026 10:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32317 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Feb 2026 10:05:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0076f6d1ad05 - main - sys/_offsetof.h: pacify GCC 12's macro redefinition check 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: 0076f6d1ad05e80d372bef1caf15615cd639fb5c Auto-Submitted: auto-generated Date: Mon, 23 Feb 2026 10:05:23 +0000 Message-Id: <699c2663.32317.683ad64d@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0076f6d1ad05e80d372bef1caf15615cd639fb5c commit 0076f6d1ad05e80d372bef1caf15615cd639fb5c Author: Brooks Davis AuthorDate: 2026-02-23 09:45:58 +0000 Commit: Brooks Davis CommitDate: 2026-02-23 10:05:06 +0000 sys/_offsetof.h: pacify GCC 12's macro redefinition check GCC 12 has a strict definition of identity (all characters including whitespace must be identical) when comparing "redefined" macros. Make our definition exactly match the stddef.h that comes with GCC to fix test-includes of netlink/netlink_snl.h. (Note: later versions of GCC are a bit more flexible and don't have this problem.) Reported by: des Sponsored by: DARPA, AFRL Fixes: 2adc3f0db187 ("stddef.h: centralize definition of offsetof()") --- sys/sys/_offsetof.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/_offsetof.h b/sys/sys/_offsetof.h index 25982fad774a..7a38914818a0 100644 --- a/sys/sys/_offsetof.h +++ b/sys/sys/_offsetof.h @@ -13,7 +13,7 @@ #define _SYS__OFFSETOF_H_ #ifndef offsetof -#define offsetof(type, field) __builtin_offsetof(type, field) +#define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER) #endif #endif /* _SYS__OFFSETOF_H_ */ From nobody Mon Feb 23 12:35:04 2026 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 4fKL0S61bSz6THqJ for ; Mon, 23 Feb 2026 12:35: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKL0S5Qy1z4Myt for ; Mon, 23 Feb 2026 12:35:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771850104; 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=jV6OyKuRjpfg0ccB3kCZNjqKzy60vo3tMfgl8frL9tA=; b=UkXEMGrywCIoLVagptl6axZVJFrWlVlgVBNj10HUdw0D+iicQLW+9cCirtgIqgcwVyO/bQ sIJj1+X03R+Sn/m6xHhfgVDrl8YnDFVXLH5xDezJaIPeHZq9x4QJwT282mFET1O5w4fjf1 gOGrEAZm/dmsLOOEKcF1c5Y7DIbbqEoiigSCqmvUErbBWHXwDnBTkx3ML3FnbC+Vh8JEvs Dff46mIj3sop8NT3NUsLz4ywto6FOw7pM+/f1ZlzgbWv7cHYMp7Wlzjrs11L1pvehvuKsu VSBBV0JmmPBfaTkKdg9FpVovRezMbjZdPnP/kgOQnuo+GRLD7HurgTiXSRvlcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771850104; a=rsa-sha256; cv=none; b=gY9MGEK34TD6NVthMFknYTWf70Ar6SQi1yB/k4J5BwDkXjcw7E7tE4WQWmyMyYjhfq8ImC EEEFw9LJPhxXllt1DLcAqhyvF15YhynnRRa7EUyLNIGCsAygoEQo/Amn/cEvky57dr4jgM 8eWM2wi1kg36Nuy9295qqUW6hoIp8w8Et9PDYsy4DGqUg8pFD42xvc/EIFEqI/T6bx+zWW Xup4hhMSKe6mRcV+G95I1YqKSsdmPsvq4O8E/jHCoH42GYgZrFCIJM8gwpL6JWsofBghjJ orXwXvkLBbFNCgyqXuclZwFofLrXCZD3rPTU+34meZ/zndNxUgRFf7374iVW9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771850104; 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=jV6OyKuRjpfg0ccB3kCZNjqKzy60vo3tMfgl8frL9tA=; b=rfT11mLZ6gBjVfbZwgtDaXXRPqp28ORl4gFagUToMmHUP8dl/kIP9CRBJHN9Eyhg7jRrqU QCbqzT8K2haNd5RV3Oro2UHvcAucibF/P+r/73v2a5N5d4Q43TQnpLsVV59vbZG6ZOk7zJ 0pABduZ1OCAUKPKaFVXOyV4rwrUydvPd9UJTXRXoFuf6zCT0KFNZOXeDr3+Ftc1M9MUV/R wTVkMD/mtOi76BwTp95r178rosoC1og/mBQX0dLD5Eo4N5yp/wsUwutmh15cgEOUgQkOH5 wFX4po0saOXf2Vfcht2ktPrjR4fIGvg/ndEHloJoxrENFXDCDWNhx+97ll2iZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKL0S51ZVzVVS for ; Mon, 23 Feb 2026 12:35:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4150c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Feb 2026 12:35:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Christos Margiolis Subject: git: 06b466526a7f - main - virtual_oss: use hw.snd.default_unit by default 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: 06b466526a7fc35cc6fc5bf6f6269e7f3a0a7aea Auto-Submitted: auto-generated Date: Mon, 23 Feb 2026 12:35:04 +0000 Message-Id: <699c4978.4150c.72371258@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=06b466526a7fc35cc6fc5bf6f6269e7f3a0a7aea commit 06b466526a7fc35cc6fc5bf6f6269e7f3a0a7aea Author: Quentin Thébault AuthorDate: 2026-02-23 12:33:33 +0000 Commit: Christos Margiolis CommitDate: 2026-02-23 12:33:33 +0000 virtual_oss: use hw.snd.default_unit by default Reviewed by: christos MFC after: 1 week Signed-off-by: Quentin Thébault Sponsored by: Defenso PR: 293130 Pull Request: https://github.com/freebsd/freebsd-src/pull/2043 --- libexec/rc/rc.d/virtual_oss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/virtual_oss b/libexec/rc/rc.d/virtual_oss index b8f1e7620582..42353a6c1520 100644 --- a/libexec/rc/rc.d/virtual_oss +++ b/libexec/rc/rc.d/virtual_oss @@ -24,6 +24,7 @@ required_modules="cuse" configs= pidpath="/var/run/${name}" +default_unit=$(sysctl -n hw.snd.default_unit) virtual_oss_default_args="\ -S \ -C 2 \ @@ -32,7 +33,7 @@ virtual_oss_default_args="\ -b 24 \ -s 8ms \ -i 8 \ - -f /dev/dsp \ + -f /dev/dsp${default_unit} \ -d dsp \ -t vdsp.ctl" From nobody Mon Feb 23 16:04:59 2026 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 4fKQfg1XnPz6TfgQ for ; Mon, 23 Feb 2026 16:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKQfg13Bvz3klX for ; Mon, 23 Feb 2026 16:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771862699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6WtkIMf6XYxdPXm6zVQkU/F0kKi/+0PBe8VzYaVstZM=; b=ub0cBbVWAvmG+3NRutGfPHjtL81dHgbunDVJO1P9/smklIXC50szKQtC9/mi+a5jaodmux sCS/GcwMJUnNazRx4i83wgaI7xJLLCMUMNLALORF+l6jL7gvfeveK7xIas9I0N7q9mo88w raMe0knv7YGwLNgDDuhvFi9Hs5C+Shn8X/xWKO2T37v6YYfZLuh4Ndvkc58oLVS5ld7x9A 0QzW0G3Wj743R0wO6P66pw6rdrQrs5CDe84GIWgG7eKa5seD/RtLjx13RispAH3HqTDGOi M6p1vv9kXA2cGVEpXOV8nNxfmXXFqa7LntWlkSnyq6t4BMWW7841nev8G5isLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771862699; a=rsa-sha256; cv=none; b=kIvbhEuxqHmBZavMYJ++RtQ58QDzl4+VBNQsGkxyWeCLeH/c9mhieS8AO4lppL4CRC8GNM 3QebImEv6iDC+2Dvx3u7OrCbhwXt4DLhIj5TlfQiyx0mAsaEcbH4Tp0hz7KQrbQwd/ddWz utL8jzLM4f1DTl5Uji3g0oBocklHQ8JHt5vlxba1gmaevDcW0ZPXCb/fux5zPJVe+1A8qt 2bHp1XXNFK9qEstgWcmg+PyUoCQ94eGj0mFvqd2FqqjVzaOCNeJBxAT6BDLkX/s2cV7W/t QBUvkGu0YCTxarmJmiyiNaIV4AL5pZ+kkhhHksY+jrDcDFoF8CT1QUCTEBjROw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771862699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6WtkIMf6XYxdPXm6zVQkU/F0kKi/+0PBe8VzYaVstZM=; b=j993ylBU9kUx8uAk+fdmao6GgQXYuuZXLO2q0440haG1HC5sXx4ZNUyyGtMBIAr6T/O9Mt 6AZnc9rBO0YJRqJvJ/xQ50kpk6D7iz6WMQT1EFThHoKLh884/Rlo6aG+/1AVL5f2UFZjP8 P+0dU5Zc8NDkjfGgx6gZJxgd6Pws6nbSZ1IXEekbz9AR6a640SRGe17KfUygK5xuUha/f9 e06d4/4TUoJTaK+pjuZL7SXrho4YQfIfWSeOuMAflWbxUGIVhxzI1TWne8J8DHLyn6pdUi V1VNY3s/udcfm9e5fl8LlwbwoKAHbG0W/acnlGldk+NFMDR155Uc2xn9oFFUwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKQfg0RWKzcmr for ; Mon, 23 Feb 2026 16:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25afd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Feb 2026 16:04:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yusuf Yaman Subject: git: 477ab960440c - main - Add records about new ports committer (nxjoseph) 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: nxjoseph X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 477ab960440c5284fb5819c63c6f03aa15606def Auto-Submitted: auto-generated Date: Mon, 23 Feb 2026 16:04:59 +0000 Message-Id: <699c7aab.25afd.7f99284f@gitrepo.freebsd.org> The branch main has been updated by nxjoseph: URL: https://cgit.FreeBSD.org/src/commit/?id=477ab960440c5284fb5819c63c6f03aa15606def commit 477ab960440c5284fb5819c63c6f03aa15606def Author: Yusuf Yaman AuthorDate: 2026-02-23 16:04:02 +0000 Commit: Yusuf Yaman CommitDate: 2026-02-23 16:04:02 +0000 Add records about new ports committer (nxjoseph) Update Mentor and Mentee Information to follow step 5 of the Committers Guide. Reviewed by: osa, vvd (mentors) Approved by: osa (mentor) Differential Revision: https://reviews.freebsd.org/D55457 --- share/misc/committers-ports.dot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index c16ba50a19d1..84a9395fb216 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -257,6 +257,7 @@ netchild [label="Alexander Leidinger\nnetchild@FreeBSD.org\n2002/03/19"] nobutaka [label="Nobutaka Mantani\nnobutaka@FreeBSD.org\n2001/11/02"] nork [label="Norikatsu Shigemura\nnork@FreeBSD.org\n2002/04/01"] novel [label="Roman Bogorodskiy\nnovel@FreeBSD.org\n2005/03/07"] +nxjoseph [label="Yusuf Yaman\nnxjoseph@FreeBSD.org\n2026/02/18"] olivier [label="Olivier Cochard-Labbe\nolivier@FreeBSD.org\n2016/02/02"] olivierd [label="Olivier Duchateau\nolivierd@FreeBSD.org\n2012/05/29"] osa [label="Sergey A. Osokin\nosa@FreeBSD.org\n2003/06/04"] @@ -700,6 +701,7 @@ obrien -> gerald olivier -> pizzamig +osa -> nxjoseph osa -> otis osa -> vg @@ -849,6 +851,8 @@ tz -> mfechner vsevolod -> eugen +vvd -> nxjoseph + wen -> cs wen -> culot wen -> pawel From nobody Mon Feb 23 16:06:43 2026 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 4fKQhh5vHFz6TgQk; Mon, 23 Feb 2026 16:06:44 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKQhh3zjJz3lZW; Mon, 23 Feb 2026 16:06:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771862804; h=from:from:reply-to:subject: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=TyRd5L2o4tj3jxwfr8/jrFA8RbrNkW/1AGN20VbZ/rM=; b=OshlzxYR6lRNSustA+vPIXbb6gcQAUGvIl+dpMlpzq1zO34jNaJV4v4mMW3FNOabyHY/wl 3W8/7Ru7c22LeipfCsvHpzlvAq1hdrN6MIXPwe9lcZU3i58u//Hm7mlMa6x0JYV7LY6uff DzCLpbOYVTlXy9mweGOP21P3YoBgPKsdIAp3zllxZMgGvYVf96ODYbCUcwoTN2Y8TiLdTz ITTWe2ebJYxbMqIJiJWYOoBYBNEH3+UEsIJKmFQeN/QsfaFuXSQUMaghSgimueRCsiZhTx 0qaSTecKATfvQAtif9Ov0quTfRrhMWHtj+cKZb0Nl3jvKEx88EuYdAHZXr5Tpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771862804; a=rsa-sha256; cv=none; b=h0NelkRcIll1G3JVWo9G2z6tpC66Py3V/GoXte3ctu0dZ9cmOgs+zC9CR+1Ti5P3ZYfgLP 4jyTb8krjBSzM14J9891Vjt0AM2fXIEDU2jILkBgyyKWVBncKgWIsx6SYoTinqcUIngygx XWm7NSYMZEe0i0DgKR6cu2Pn9NUnSfczDCGSbixlYQIsn756kJhBPHvDQX4pYAVKiEH/T8 x5dAwEknBjfgsiRwC0Q4nOajqUUYylQr2/aCzbq9h4wTHnB5MmgHWj3NKsplcMcMXaiIs8 OUh91Ga87bawARO+61cS7tvmX1Xq3yqmnd+sEgbRNHmA1oZuJhAIgqAKVbCXew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771862804; h=from:from:reply-to:subject: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=TyRd5L2o4tj3jxwfr8/jrFA8RbrNkW/1AGN20VbZ/rM=; b=WCTFF/+TbXYC0seIIWI6CB/a4HmL89Ds5cjPOwE9WEttdyq7SiYJcwQycwnKAftY4i4BBh ozuTjq62U5ZnH80Tv22iFtqo0haX8d32BqXFGVNOsMyVM+j28JC93rvpyLbYmC2Q5Wulh4 vjgdP0MYW8FPMSj4yvQiKX5AXvYXZ0FYwKllOWEH5la2V/pOUHYeJWfRuQzyX38QiuShkc oUj1qnnBeOog0KCVKOb634LZOMgyTIlrnOUSLmA6zZYHJmsAkQX5V/iFnzvT8kwDK7HM4Q 86JvhwgaDi6IuwYi+99YScksm/UxeVN3N4TCYct9nr2uF+IYk41aU1doFayDSw== Received: from [IPV6:2601:5c0:4202:5670:dd0e:5a2:6441:fcd5] (unknown [IPv6:2601:5c0:4202:5670:dd0e:5a2:6441:fcd5]) (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 4fKQhh1tdqz3kG; Mon, 23 Feb 2026 16:06:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <3c07e539-5024-4462-a085-34fc958aeae6@FreeBSD.org> Date: Mon, 23 Feb 2026 11:06:43 -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: eda36ae09dd1 - main - asmc: resource cleanup simplifications Content-Language: en-US To: Enji Cooper , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <699a632b.4690e.2fab15e8@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <699a632b.4690e.2fab15e8@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/21/26 21:00, Enji Cooper wrote: > The branch main has been updated by ngie: > > URL: https://cgit.FreeBSD.org/src/commit/?id=eda36ae09dd1fab78bd377739fc5d6c65c61f5d7 > > commit eda36ae09dd1fab78bd377739fc5d6c65c61f5d7 > Author: Enji Cooper > AuthorDate: 2026-01-30 06:55:08 +0000 > Commit: Enji Cooper > CommitDate: 2026-02-22 01:59:06 +0000 > > asmc: resource cleanup simplifications > > This change makes `asmc_detach(..)` reentrant by setting freed resources > to known invalid values when done, and makes `asmc_attach(..)` call > `asmc_detach(..)` instead of attempting to the semi-equivalent way of > cleaning up the driver resources allocated in `asmc_detach(..)`. > > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D55413 > --- > sys/dev/asmc/asmc.c | 33 +++++++++++++++++++-------------- > 1 file changed, 19 insertions(+), 14 deletions(-) > > diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c > index bff214c084c5..084b57331dd9 100644 > --- a/sys/dev/asmc/asmc.c > +++ b/sys/dev/asmc/asmc.c > @@ -795,25 +795,21 @@ asmc_attach(device_t dev) > if (sc->sc_irq == NULL) { > device_printf(dev, "unable to allocate IRQ resource\n"); > ret = ENXIO; > - goto err2; > + goto err; > } > > ret = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC | INTR_MPSAFE, > asmc_sms_intrfast, NULL, dev, &sc->sc_cookie); > if (ret) { > device_printf(dev, "unable to setup SMS IRQ\n"); > - goto err1; > + goto err; > } > + > nosms: > return (0); > -err1: > - bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid_irq, sc->sc_irq); > -err2: > - bus_release_resource(dev, SYS_RES_IOPORT, sc->sc_rid_port, > - sc->sc_ioport); > - mtx_destroy(&sc->sc_mtx); > - if (sc->sc_sms_tq) > - taskqueue_free(sc->sc_sms_tq); > + > +err: > + asmc_detach(dev); This cleanup is good. > return (ret); > } > @@ -826,16 +822,25 @@ asmc_detach(device_t dev) > if (sc->sc_sms_tq) { > taskqueue_drain(sc->sc_sms_tq, &sc->sc_sms_task); > taskqueue_free(sc->sc_sms_tq); > + sc->sc_sms_tq = NULL; Does this actually matter? That is, I don't think there is any reason for asmc_detach to be reentrant. New-bus (specifically device_attach()) does not invoke DEVICE_DETACH if DEVICE_ATTACH fails. Instead, DEVICE_ATTACH routines are expected to fully cleanup on failure. The changes to be reentrant here don't hurt, but they generally just add clutter. > } > - if (sc->sc_cookie) > + if (sc->sc_cookie) { > bus_teardown_intr(dev, sc->sc_irq, sc->sc_cookie); > - if (sc->sc_irq) > + sc->sc_cookie = NULL; > + } > + if (sc->sc_irq) { > bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid_irq, > sc->sc_irq); > - if (sc->sc_ioport) > + sc->sc_irq = NULL; > + } > + if (sc->sc_ioport) { > bus_release_resource(dev, SYS_RES_IOPORT, sc->sc_rid_port, > sc->sc_ioport); > - mtx_destroy(&sc->sc_mtx); > + sc->sc_ioport = NULL; > + } > + if (mtx_initialized(&sc->sc_mtx)) { Please do not use this. Code should know if the mutex is initialized or not. That is, always initalize the mutex in attach before any failures that could enter this path. > + mtx_destroy(&sc->sc_mtx); > + } -- John Baldwin From nobody Mon Feb 23 16:11:42 2026 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 4fKQpR5SGyz6TgwN; Mon, 23 Feb 2026 16:11:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKQpR2QRcz3mbl; Mon, 23 Feb 2026 16:11:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771863103; h=from:from:reply-to:subject: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=fTGnMNsrFeeGaXJgBOcsYp3Xtr4S/UUV2DBYNxktmmk=; b=McMxzWFTs3IKrBDSnsnscrJzs8N4cpVDxlcHT9bmsORI6UJUW/LMAMkcJmgmLWiewM+5du tWH0PAhEml5vZjlRfjIIxPhma9+k7tn5f+haGHIxtwbCpGTPsLfmMgIkrI4xRIKxVVdxxc Xjww9DjEko5PjBJbgN/0+BxvcKdsVbKVosimcRuFzVNdzOSMLRgWolkse47TF1wQwQLbio uiG1xfR3vTX28Du8+n5S8Jm6HbKlJ79cZE3n7JDvSTyEc13VRMKZMF6mr4Yn0oJrdqfp5B lsD7oOitcBrIyrMSU6UBcnpYLvCwWuB6nZvE5TckjRRCqldVgSY25EwuAXLmKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771863103; a=rsa-sha256; cv=none; b=RtsXELX8G2YiNopyMfxlVbfteL8Ce6ELqyQEjntpHDKqW7/a9T61vb9nfLEPxA9R9Gmpxn 1FqORFQ82Ac4WZrx9Hq/I259CrlhnreK9OkDp+RFqPzA7OGrukA2hit+K49DH0wMChomXQ 2Imz3GZOr904H9fFoS/1S8rWv2C2RtY1d9cUUKNafYqjPwcjb/SsgJdd2QbnFo/pVXGbMd JWueBVYyFF74bguicNeJZewS2cw2QMwUXgcVJ2i/gQ+GvrjiGYTHIbChTrCievolKqsixe BY5wQ+AkiN9QLaehRrRMwPdfN7FNMf09Gp5dHdlgNRk9EiuPXHSZVxO2kfrznw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771863103; h=from:from:reply-to:subject: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=fTGnMNsrFeeGaXJgBOcsYp3Xtr4S/UUV2DBYNxktmmk=; b=q128QaIhxJgkVC+eRl5I8EH1MB/rDnlt2lbgNFFjzNUCevUF6aRiWPzgjhH0baUl7ELpYe MVWN9t6iCPkcwOmSDptW8klRumjVuNLtkeuRckCzeSR55c2zpdBiHKuvYlYKbzvLJx1iBZ XlFOxTYELudsU8LaMC1v9nPBgO5vjKVv1ADmSwmKtDPY02eSMuJuMTI8kQA9JreQRPX7xp NSw+RKFHscKtmleHtk4ujky847aFw/vfwXjMKA5tGgwygKt+6K7R8rVbQ+n5vMIAMVaIzC /9O6n5GTyQfQsfNN+Q5+h0rga5bYqW1vjgQyoQSnRy08l+EcAiFfKc/EILqM1Q== Received: from [IPV6:2601:5c0:4202:5670:dd0e:5a2:6441:fcd5] (unknown [IPv6:2601:5c0:4202:5670:dd0e:5a2:6441:fcd5]) (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 4fKQpR0YHQz4Bp; Mon, 23 Feb 2026 16:11:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <228a09d3-a7ab-43f6-8903-c73d659f0173@FreeBSD.org> Date: Mon, 23 Feb 2026 11:11:42 -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: 4544f34f2d30 - main - .gitignore: ignore additional unwanted files Content-Language: en-US To: Enji Cooper , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <699a713f.1c7b3.81402c1@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <699a713f.1c7b3.81402c1@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/21/26 22:00, Enji Cooper wrote: > The branch main has been updated by ngie: > > URL: https://cgit.FreeBSD.org/src/commit/?id=4544f34f2d30ee63ab1eec9fa52c31bd92d457ca > > commit 4544f34f2d30ee63ab1eec9fa52c31bd92d457ca > Author: Enji Cooper > AuthorDate: 2026-02-04 07:39:03 +0000 > Commit: Enji Cooper > CommitDate: 2026-02-22 03:00:06 +0000 > > .gitignore: ignore additional unwanted files > > Ignore more files generated by toolchains, e.g., `.pico`, etc. Ignore the > `.DS_Store` produced by macOS as well because all they provide is > additional file metadata that shouldn't be committed to `git`. > > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D55096 > --- > .gitignore | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/.gitignore b/.gitignore > index a53a26f16d4f..91a9252d80f3 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -1,9 +1,17 @@ > *.a > *.core > +*.lo > +*.nossppico > *.o > *.orig > +*.pico > +*.pieo > +*.po > +# Don't ignore translation files under `contrib/...`. > +!contrib/**/po Hmm, do we still generate .po object files since MK_PROFILE was removed? The bsd.*.mk rules for those were removed about a year ago (0e4c4cc4916c965f7f3116e1840396755d6b21f4) and haven't been relevant since 3750ccefb862 (actual date of Nov 2024, not 2021). (Rest of these changes all look good to me FWIW) -- John Baldwin From nobody Mon Feb 23 16:18:53 2026 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 4fKQym6L5kz6ThXV; Mon, 23 Feb 2026 16:18:56 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKQym5s92z3nX5; Mon, 23 Feb 2026 16:18:56 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771863536; 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=ag+IaMfl4yrEMQY3GG6+itr0/7+DPqpuoxtclTPVcMI=; b=CnKoCI1MoWBaIl8tpB3158xGig6uaAIApBKn+SKQLCXaP1QGavry8hQIe7DqP4O9GvllA9 OeHB2aLGCLq2DDQ8WqvPyLcAYCMheM1mptj7TT93zyU7yzln7kbCF+4sw2ZBJIZJqg0CGD UpPkoOXpM6UUpW9eqA5ZM6qR9TJDli9OJDzI1vqX5NzRruA8bTiuGaFlbUQKAEbftegPkA 9u9c4cYctblG2/5/hIXgJ7SHdDxmqdomDyqDDGj88wBozHIOuoUelZxXpI0u67VcUaFJSf pPWiTjDAswlVBUE136XjkrUYEJ6gTQLQ5u5dmBUpSWK24405gsG5bLDjLQeGdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771863536; a=rsa-sha256; cv=none; b=eViYqC8d+gveYLaeSQZ4PMpALIZKDr1ie7xVXWB8+GCqGHOs8ASCrwvCohpvwF2I9bYo4n fGvAuNf4jBWE/CMJKh7h3dQ0wboP1Pq/IsF1H1AuZ7t5dkqbLoDhEhTx/EREFMFjpnxuMW IsAtc9+U/gw1VDGXc/42xZkWU0hKul85O8bLn8HiEDFhe5NR5/V/QiRlnEBPLln27xGS9/ cmKX2C7mwDl83i7JaynIZ0ZDWeZmCk5EQIkmHIAxtdwNt4kARqHuOcaSqFZf4j49RcXWyB 8WnNExs3+gIA9SdhCy7tMfuDBvzqaI1zkvKae8t9aO0OlRMMa1I4ctgLPshMYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771863536; 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=ag+IaMfl4yrEMQY3GG6+itr0/7+DPqpuoxtclTPVcMI=; b=nm84TntiZMsI4ksJwJaKxnA1kJf7cas8Yfh+any4Dgi+KiiREuEnge7rv/Y8t23diCzDT1 HT2yCnkTEid6nb3DyT3vpcUCBhzfKXJTnDRPb2OwpRiJaB97pRXWOsZHC3dgGdPNfnLDE2 up6tFN7kGatueVfOJZ88kAfzdhL/cvqZJxVadUzHaoHZlek2MvwVfNIl6b0rgA+hoYOXQP f+zm2jpBpTC96zlnVd005SvJ3minVzjwfN3xXkBZdWPEMq0YwF5R7/C1dfzuNYFtOWM3cA QwhOz3fbtyApxhA4xFby/IbatDnnmAxWz/dSl9R0IXJ3zRVYFae4h71x//eCgQ== Received: from [172.17.5.105] (dip-pa.panasas.com [65.205.22.243]) (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 4fKQym207mz2mV; Mon, 23 Feb 2026 16:18:56 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.106.26021521 Date: Mon, 23 Feb 2026 11:18:53 -0500 Subject: Re: d4f6cb754249 - main - build: Move all of lp under LPR option From: Ravi Pokala To: Lexi Winter CC: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= , , , Message-ID: <2664C0F5-32C2-41D2-8662-7D1D2D28523F@panasas.com> Thread-Topic: d4f6cb754249 - main - build: Move all of lp under LPR option References: <699a2335.220a6.2c3156ae@gitrepo.freebsd.org> In-Reply-To: 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 Lexi, Fair enough. Thanks, Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: > on behalf of Lexi Winter > Date: Sunday, February 22, 2026 at 22:39 To: Ravi Pokala > Cc: Dag-Erling Sm=C3=B8rgrav >, >, >, > Subject: Re: d4f6cb754249 - main - build: Move all of lp under LPR option Ravi Pokala wrote in >: > Why is the package "lp", when the conditional uses "LPR"? i named this package "lp" because it contains support for (line) printers. i suppose you could argue that "lpr" might be a more suitable name on BSD since that's what the traditional frontend is called, but either seems fine to me. > Shouldn't they match? there isn't generally any corresponence between package names and src.conf options, except where this happens naturally, and even when the same name is used, they don't always mean the same thing. for example, WITHOUT_SENDMAIL controls both sendmail and libmilter, but in pkgbase these are two separate packages, so even though the src.conf option has the same name, it means something different. so, as a general rule, there's no particular effort made to ensure package names match src.conf option names. From nobody Mon Feb 23 16:21:43 2026 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 4fKR1z2Q9rz6Thnm for ; Mon, 23 Feb 2026 16:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKR1z1cJMz3pJm for ; Mon, 23 Feb 2026 16:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771863703; 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=S7GJAty7Tmkt7dVH2D26vRyUxfX794ZiQ7ktvANXOzg=; b=g1MAvL9+Vgu8+C7toapunSpMx0mwtqdC2QGbPFJ6Na6Li2tLU21uKTW8QNEN5bbG0yZWn3 AqwYpgs9NiAVKQcSSPioCOnCf2GcEbgSEMK1btqaIYl3u6iRUaGI4cCVJBkudmwAuT3CrI zqUCNkOvOlptAlDXhdAxceqpkmX9dn/fNcASbWhUqveKjfArfISeyh0Gv83sgAr2v/NbCz Z8TfmRTPgV675TRyDS3AMbHwp2nv4GFoXrjE/B/a+0ILqiHJpoURjPXY6i/d/3ETrpeG2x OTFFOk/JQvhx8Do4OHrHdCoQKdqwIJCqwjUXfDF8KaEwDB+R34wF6uNyzKENXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771863703; a=rsa-sha256; cv=none; b=l6PSA1uxm2I9xf3PPLUcoaA7qicX2wnFW0JYLpXymrvlnHQzvkahSzfr3es68T8/9ZrAZZ IE/Mh5s9bu5ihG6GCuctKuNkemiieYR3jcvYU3YnLx3aN4ws2QrlLBwvobq05T6ToK9H+z lsCidryGDDSX57quEA9Liv0M3uHF6nvurCQxpl7T5WmJXJRzvtlHvA/5f5kW1Ml6n7RCLD oaYR3yoPDSOLUlJ4dw4aA6AEmNTxBUU05rsKMJ37d94RdFy++zNSLDethq2+iRPrtA7gN4 lqmT3ct+9Z0kD8a3Y1kX9UB6/1UG5QIdJm8TKo0FxE24SzgS9P3r1qdSagEaag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771863703; 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=S7GJAty7Tmkt7dVH2D26vRyUxfX794ZiQ7ktvANXOzg=; b=igI4a85aIQ1WM6ryZc+g092dRpRKmTxOXLnjv6RypIYODLiTjlZVMz9eIDomF0P1yKB/Ng Qt+vyaHD7VSV6AQwBAF0pfcgbXE/9Lb9y2LVq1Wb8njL4SmCLOwMGEN9vZLvdeemksZY41 KU2SiX2XfFZDWR/KjosZ103AYZs8CMsRfc/6k02Iwd6c41sEGchr8ZCHZqH5v6c7Gh7027 h5Db7GVNi6wEoYlBlTfRKA8x4jFQeMBq8f58nnTy7OZv7mrrDIVvOH2TQ8BXaLDj5SBozd mVAcDv8WvwkPrU4Nxv0IfNi2Mvb9FxvzChEtMafbuSU/TPCUufn0VChnXtAgFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKR1z16ljzdlN for ; Mon, 23 Feb 2026 16:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31a94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Feb 2026 16:21:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Aymeric Wibo Subject: git: 16822dac32ab - main - acpi_panasonic: Clear wireless RF_KILL on boot and resume 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16822dac32ab8955539ffa4eda05145df8638154 Auto-Submitted: auto-generated Date: Mon, 23 Feb 2026 16:21:43 +0000 Message-Id: <699c7e97.31a94.4a81884f@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=16822dac32ab8955539ffa4eda05145df8638154 commit 16822dac32ab8955539ffa4eda05145df8638154 Author: Abdelkader Boudih AuthorDate: 2026-02-23 16:11:10 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-23 16:11:23 +0000 acpi_panasonic: Clear wireless RF_KILL on boot and resume On Panasonic FZ-Y1 and similar models, the EC latches RF_KILL on shutdown and suspend when battery is at certain level, causing wireless to boot with hard block. Call WLSW.SHRF during attach and resume to clear the block. Tested on Panasonic FZ-Y1 with Intel Wireless 7265. Reviewed by: adrian, obiwac Approved by: adrian, obiwac Differential Revision: https://reviews.freebsd.org/D55265 --- sys/dev/acpi_support/acpi_panasonic.c | 36 +++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/sys/dev/acpi_support/acpi_panasonic.c b/sys/dev/acpi_support/acpi_panasonic.c index 67d51ea9bc1f..8fea47ee45e8 100644 --- a/sys/dev/acpi_support/acpi_panasonic.c +++ b/sys/dev/acpi_support/acpi_panasonic.c @@ -80,6 +80,8 @@ static int acpi_panasonic_probe(device_t dev); static int acpi_panasonic_attach(device_t dev); static int acpi_panasonic_detach(device_t dev); static int acpi_panasonic_shutdown(device_t dev); +static int acpi_panasonic_resume(device_t dev); +static void acpi_panasonic_clear_rfkill(device_t dev); static int acpi_panasonic_sysctl(SYSCTL_HANDLER_ARGS); static UINT64 acpi_panasonic_sinf(ACPI_HANDLE h, UINT64 index); static void acpi_panasonic_sset(ACPI_HANDLE h, UINT64 index, @@ -116,6 +118,7 @@ static device_method_t acpi_panasonic_methods[] = { DEVMETHOD(device_attach, acpi_panasonic_attach), DEVMETHOD(device_detach, acpi_panasonic_detach), DEVMETHOD(device_shutdown, acpi_panasonic_shutdown), + DEVMETHOD(device_resume, acpi_panasonic_resume), DEVMETHOD_END }; @@ -172,6 +175,8 @@ acpi_panasonic_attach(device_t dev) CTLFLAG_MPSAFE, sc, i, acpi_panasonic_sysctl, "I", ""); } + acpi_panasonic_clear_rfkill(dev); + #if 0 /* Activate hotkeys */ status = AcpiEvaluateObject(sc->handle, "", NULL, NULL); @@ -232,6 +237,37 @@ acpi_panasonic_shutdown(device_t dev) return (0); } +static int +acpi_panasonic_resume(device_t dev) +{ + + acpi_panasonic_clear_rfkill(dev); + return (0); +} + +static void +acpi_panasonic_clear_rfkill(device_t dev) +{ + ACPI_HANDLE wlsw_handle; + ACPI_STATUS status; + + /* + * Call WLSW.SHRF to clear wireless RF_KILL on models that have it. + * On FZ-Y1 and similar models, the EC latches RF_KILL on shutdown + * and suspend, causing the wireless card to boot with hard block + * enabled. The SHRF method sets the EC state to deassert RF_KILL + * GPIO on mini-PCIe pin 20 via SMI (ASRV call with function + * 0x0F/0x03). + */ + status = AcpiGetHandle(NULL, "\\_SB.WLSW", &wlsw_handle); + if (ACPI_SUCCESS(status)) { + status = AcpiEvaluateObject(wlsw_handle, "SHRF", NULL, NULL); + if (ACPI_FAILURE(status) && bootverbose) + device_printf(dev, "WLSW.SHRF failed: %s\n", + AcpiFormatException(status)); + } +} + static int acpi_panasonic_sysctl(SYSCTL_HANDLER_ARGS) { From nobody Mon Feb 23 18:59:36 2026 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 4fKVX903zFz6S1RL for ; Mon, 23 Feb 2026 18:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKVX86h78z48wV for ; Mon, 23 Feb 2026 18:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771873176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVgkxAmAADKWgbxDlGlfxm9KuNbVu7walnpDUs37++Y=; b=qhvKAuipLKHdd8cOJsLS7BRXf66GLQaIaJkRODwi1ctfx811Zc2rdtwyahRVDQMEI92EUZ cNod615kXly7ScavTEVgb+YZ0xuJVGmW8UPHoyyaqn3eS35dynM6XZGGrInaCd6QXf2mWJ ku7NOBneBzaZhtzi1vrveyEn97sqYN2CvMDrrn9kTVTptrbWv2/nx1oSWfS5LmNX9AJ+Zd LO2sVeFUEq8wiFJBZephB2/gxXf9JtHEIjYHFZWN3VJz1SH2I1LVUuf2yNy1fHZPOlEQLv aYOt329oudmzsckM79xqwJS+hiMsH9zuD65RaIbKegsmAnNHCgYia31HUor1Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771873176; a=rsa-sha256; cv=none; b=jfoegqe6sQDozfxWm2s9EMrP8nsXrArUJws1o80/IiF+jsIyvMYBvcaFwNxW2xGzHtRfao aVkSuFUTBI5evdW0AgRhBIxchaId7EPDuNZThQxaxz3D0hepdJcU3d/1aw7YDdsbb+nT0s be5GcK/Qg7zvdAmvH3RtUj2tAVreICSn4ea5Nej0arzX7TkVnuTozIJXe4ZOiLdM1xihsm dkIPDDYkLvByvtz5kdEax1TY8jh2bTIMbvvyL9hUokIa3u07YGBknmxPtGoSzUn3temLwZ yllqd2ZRzLnP4tcu7nY6xLMWfxxhx/FiRtEJeUYAhe2nRi5nd5vgzNarLgAVsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771873176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVgkxAmAADKWgbxDlGlfxm9KuNbVu7walnpDUs37++Y=; b=PqV6maMvfKmp/1t2X6IiA4mTHTWoPLk030X8jyKUrQn7qUcU4dwYaxCcRiN+A5UY2ETwrt 7tsNPtkAbFOC5FnsFaMH7p7NEH1sKD2NLuA+s0VgrXqQM2kInBvYL7D1F7mafQI5KHKnLA tim7cwnWqb28KWWllrPwQNsYg+MZ+nnNOqcfbBqqIm5Gj/HlT8R7YUBJpJ8UHcsjsu0Aur XaiqIINgWgpH+VMOogDbKLKTvrr4467zghuN3eCNo9mWZKhwt9fhcBXcopgP7PSKIrDbWI D0Tyr3vCT/jFZTZ2WqeOuY94MBUGBqMooWgbSR4FuqUJ3mu0z6DRhMUHc/E/oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKVX85p7tzjcZ for ; Mon, 23 Feb 2026 18:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41417 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Feb 2026 18:59:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b4305c90a3be - main - lesspipe: Allow zstd to operate on a symlink 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: b4305c90a3be7e1a40b76545b8b761fdbda5c309 Auto-Submitted: auto-generated Date: Mon, 23 Feb 2026 18:59:36 +0000 Message-Id: <699ca398.41417.5923747d@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b4305c90a3be7e1a40b76545b8b761fdbda5c309 commit b4305c90a3be7e1a40b76545b8b761fdbda5c309 Author: Ed Maste AuthorDate: 2026-02-04 16:56:37 +0000 Commit: Ed Maste CommitDate: 2026-02-23 18:57:58 +0000 lesspipe: Allow zstd to operate on a symlink By default zstd refuses to operate on symlinks, so for example `zless /var/crash/vmcore.last.zst` failed to view the uncompressed core file. Add -f to the zstd command line to allow operation on symlinks. Reviewed by: delphij Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55101 --- usr.bin/less/lesspipe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/less/lesspipe.sh b/usr.bin/less/lesspipe.sh index 253914b8b3ee..6fc6cc471638 100644 --- a/usr.bin/less/lesspipe.sh +++ b/usr.bin/less/lesspipe.sh @@ -21,7 +21,7 @@ case "$1" in exec lzma -d -c "$1" 2>/dev/null ;; *.zst) - exec zstd -d -q -c "$1" 2>/dev/null + exec zstd -d -q -c -f "$1" 2>/dev/null ;; *) exec cat "$1" 2>/dev/null ;; From nobody Tue Feb 24 03:10:24 2026 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 4fKjQX1VQMz6Sqfk; Tue, 24 Feb 2026 03:10:28 +0000 (UTC) (envelope-from kevans@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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKjQX0xk4z49NY; Tue, 24 Feb 2026 03:10:28 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771902628; h=from:from:reply-to:subject: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=0f3RCcTn8CfxeHOw3LQjbvIBEztCj1FLBJ+wzLX+JCg=; b=CfEpK4sdvo6Vf+oM3/wUmqiZhV/lQuYZ9v5CEfVcyk2QJqClNK9hguh/9PAbOa+Vy4lG8O ky8qMLx0ULZ94b+yKiQ41/B20+97C5D94xIJF6GUVBQoyygx4lwlhfWTBibyPSBocAm1/m 06tS1bofuQVHNac5b14bBJQ+LW1TcAtcL/Q0ZQybQF38idLCveBorEx2g3fNn0b3p4yNmr /OHTWgVCt8leWe4vBai6rYETPdDNECB2ltw14jMVXZFtiaalDQE+HMhEJD1uwIeB0IYbN9 dei2dBEOekZM3Cq+EPljocjDvkG7xDt01Y/xcRwOqMlJkoOyUBMKobD0EQ3D2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771902628; a=rsa-sha256; cv=none; b=Pug6X6QQRR3hLqbHPi+4uxf0sUMWWk1C7eC5r9d3IDIUQSIPScSIBBeJSuDLgZL1pIBURt +3apYmDx/v6LS8mBjSccq7nvWAi5pkloCmgCwfExpzG4v9GNpKtzFWRjDlEfxsxxFyLc18 Uf+xe5lhsRg0G6X1iOCJfR2HnS+4uWO7CHm2L0atYyDnSR9eN2iyQ0jxDDN9b21tI3jiqG xyNKOLPIoYDsoXQPGs62ezaLLkNXC2Db7NEmPk8NYupmbpjWD+yJG3Y/L3eNR278zbHkTN ShhJleQi0n/dsU8hejVsuN/Qv/ANZW9cEArFV353ifIDf8LcQKo1p5me9P+yuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771902628; h=from:from:reply-to:subject: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=0f3RCcTn8CfxeHOw3LQjbvIBEztCj1FLBJ+wzLX+JCg=; b=G9nz/bNYx5Px0Bf5VH1hMFAktZan7WhcCcsQdM9DQG7nnlLbcyjxCdqVAeJfL2l2xSBuwx eS3ydkbhU9mIWMiXRavspA23C/j6dg5mXWY3gRdicX8M/XY4FHUnGanmwu2wziWMMS5OFM VG0wsJauCJsUrOGI3dlxGc1LGt4urfYPB6b3XHnZEEapne3yKxEcug5F8i3rJUIRtLCZcF Xiv4QCqj8P6Wb9XmnCNsTiUYBgz/D5Zyqs4RDuUttY/2cahT/iBaqe/Cf7CTiqGfkOsZI7 ucbVF8C8poAyPcD64I5w6DE6iMszfdXczMWzviasIVZMKQQkhuOXf1ht29tTOw== Received: from [10.9.4.95] (unknown [209.182.120.176]) (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: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fKjQW4T8RzJBt; Tue, 24 Feb 2026 03:10:27 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: Date: Mon, 23 Feb 2026 21:10:24 -0600 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: 0d3652f67d24 - main - sched_shim: Drop the no-ifunc case To: Mitchell Horne , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, Konstantin Belousov References: <6984c635.1e072.359146aa@gitrepo.freebsd.org> Content-Language: en-US From: Kyle Evans In-Reply-To: <6984c635.1e072.359146aa@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/5/26 10:32, Mitchell Horne wrote: > The branch main has been updated by mhorne: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0d3652f67d246348e2c017205c6782caf4484449 > > commit 0d3652f67d246348e2c017205c6782caf4484449 > Author: Mitchell Horne > AuthorDate: 2026-02-05 16:12:03 +0000 > Commit: Mitchell Horne > CommitDate: 2026-02-05 16:32:16 +0000 > > sched_shim: Drop the no-ifunc case > > Now all architectures support kernel ifunc resolvers. Therefore, the > alternate implementation can be removed. > > Reviewed by: kib > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D55114 > --- > sys/kern/sched_shim.c | 8 -------- > 1 file changed, 8 deletions(-) > Hi, I'm trying to mentally reconcile the commit message with the diff... shouldn't we have kept the `DEFINE_IFUNC` version if all architectures now support ifunc resolvers? To the naked eye it looks like we removed the ifunc bits instead of the non-ifunc bits. Thanks, Kyle Evans > diff --git a/sys/kern/sched_shim.c b/sys/kern/sched_shim.c > index 83e4412494d3..2b1dcecda433 100644 > --- a/sys/kern/sched_shim.c > +++ b/sys/kern/sched_shim.c > @@ -22,20 +22,12 @@ > > const struct sched_instance *active_sched; > > -#ifndef __DO_NOT_HAVE_SYS_IFUNCS > -#define __DEFINE_SHIM(__m, __r, __n, __p, __a) \ > - DEFINE_IFUNC(, __r, __n, __p) \ > - { \ > - return (active_sched->__m); \ > - } > -#else > #define __DEFINE_SHIM(__m, __r, __n, __p, __a) \ > __r \ > __n __p \ > { \ > return (active_sched->__m __a); \ > } > -#endif > #define DEFINE_SHIM0(__m, __r, __n) \ > __DEFINE_SHIM(__m, __r, __n, (void), ()) > #define DEFINE_SHIM1(__m, __r, __n, __t1, __a1) \ > From nobody Tue Feb 24 05:59:23 2026 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 4fKn9R6C5gz6T9Kw for ; Tue, 24 Feb 2026 05:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKn9R5YHYz3Vtq for ; Tue, 24 Feb 2026 05:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771912763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JDg+Zt5IaE+HMwb6d/JW3FR4iT4gmQ3CWQRxlzXGjiE=; b=RQ0LR5J8AyF18mVXFiRInDIb3RHANC9YV03vo0KI+ZnGtrZWLTUuKXuwU0GgUJtaP5Jj49 gdeWsQ1MsqDrWJM9G8447MJKQsC7qdxPzsZK8Ir9K9XYovEeN/UDXeyBQFMHtn2uncz7vT lawll5/HNqisgd7gXjDYhCwx9lGgytYAWngpvSeWHx32mnX7CYzLsQQR1jN9XaDX6geuJx fPL2A8XWiUUsDai+bvVh6PId07KbtNnFKErqpwbvABErs5KiaE5YAbehqKBZ3tOqdZX/72 iOTF2FpHnRSxYnNuDi53NNsNrwPKrAYOurNp8hpPFu/bUeG9G4vi7/nOd/MwfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771912763; a=rsa-sha256; cv=none; b=olF3fHGhh+C5cZMTAUVAxID+lnudgujHqQpZOx8QaQcDq4rVLjPmtFKPn3rqvPy5n54isD Z9gR0ChZvrLRPvR+C0a22KI+i2gFxx3Ul4q098hIX/Cdj50FcW2DjZH9md28nlSLdREx/I d4u7K20Ub6tatk8DwmrSxpJ6YjEXwOnHHimL3j2HeL0Dcn88SxMZkBUivj+Kd72jgwCJsm AKUHxHczCcPVrY22BxUAcVrbcNc7MWQAQzTBIdpZQoD4lQ7BRimWHCGHq8GWQ2fV/o408b yHm7rxRQIZzt5g6ksgPBG7gsF+be/6pYNZxEKRCiW9Rbq3xBcDupw5p+f+MTsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771912763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JDg+Zt5IaE+HMwb6d/JW3FR4iT4gmQ3CWQRxlzXGjiE=; b=RnXDohbUxzoGQPChYs5Z8lh7paFjyyyTJ4RWLBaKz+NgjkvOw4BGyg21Ze+HTJUj8bcPEi ea4FSMHn8uCNPAqy6aVjTXeaDVdZIw/6IyQ6cwB4x89CuBTgk5RgI5t84GNpCordWXyJR0 kNdWEmnEPFYGy8lurK3U7j1jRYkbB8C9T0W0AtJJxMT9qCEvUjWWTY2/JctqsRiLKtG2ra DFRKBarQNHXYRm5/Jt8btvkg25PCVRkBjJVfF7ldb6kbjZ39ZqWxRjhQq7SgRMY4FyZFDR ly14ko0AxcztsAeeHcpfjlUSL3EHCJQcZCCcCR92FgPD1Cv+p4mHxUL1VNOKaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKn9R4xdjz13SN for ; Tue, 24 Feb 2026 05:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f49e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 05:59:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 686280c0fdc4 - main - libjail: avoid a double-free in the MAC label bits 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 686280c0fdc4807676c3e8b896a1816ce62d4457 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 05:59:23 +0000 Message-Id: <699d3e3b.3f49e.3106aad9@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=686280c0fdc4807676c3e8b896a1816ce62d4457 commit 686280c0fdc4807676c3e8b896a1816ce62d4457 Author: Kyle Evans AuthorDate: 2026-02-24 05:55:12 +0000 Commit: Kyle Evans CommitDate: 2026-02-24 05:58:45 +0000 libjail: avoid a double-free in the MAC label bits As written, we'll repeatedly jps_free() the first element, which is obviously bogus. Fix it to index appropriately. Fixes: db3b39f063d9f ("libjail: extend struct handlers [...]") --- lib/libjail/jail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c index baabeb4afed9..95ba336b62ce 100644 --- a/lib/libjail/jail.c +++ b/lib/libjail/jail.c @@ -978,7 +978,7 @@ jailparam_free(struct jailparam *jp, unsigned njp) for (j = 0; j < njp; j++) { free(jp[j].jp_name); if (!(jp[j].jp_flags & JP_RAWVALUE)) { - jps_free(jp); + jps_free(&jp[j]); free(jp[j].jp_value); } } From nobody Tue Feb 24 09:54:05 2026 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 4fKtNX09p9z6TbTX; Tue, 24 Feb 2026 09:54:20 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKtNW3LMjz3wM6; Tue, 24 Feb 2026 09:54:19 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 61O9s5hp066211; Tue, 24 Feb 2026 11:54:08 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 61O9s5hp066211 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 61O9s5Qn066210; Tue, 24 Feb 2026 11:54:05 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 24 Feb 2026 11:54:05 +0200 From: Konstantin Belousov To: Kyle Evans Cc: Mitchell Horne , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 0d3652f67d24 - main - sched_shim: Drop the no-ifunc case Message-ID: References: <6984c635.1e072.359146aa@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-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4fKtNW3LMjz3wM6 X-Spamd-Bar: ---- On Mon, Feb 23, 2026 at 09:10:24PM -0600, Kyle Evans wrote: > On 2/5/26 10:32, Mitchell Horne wrote: > > The branch main has been updated by mhorne: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=0d3652f67d246348e2c017205c6782caf4484449 > > > > commit 0d3652f67d246348e2c017205c6782caf4484449 > > Author: Mitchell Horne > > AuthorDate: 2026-02-05 16:12:03 +0000 > > Commit: Mitchell Horne > > CommitDate: 2026-02-05 16:32:16 +0000 > > > > sched_shim: Drop the no-ifunc case > > Now all architectures support kernel ifunc resolvers. Therefore, the > > alternate implementation can be removed. > > Reviewed by: kib > > Sponsored by: The FreeBSD Foundation > > Differential Revision: https://reviews.freebsd.org/D55114 > > --- > > sys/kern/sched_shim.c | 8 -------- > > 1 file changed, 8 deletions(-) > > > > Hi, > > I'm trying to mentally reconcile the commit message with the diff... shouldn't we have kept the `DEFINE_IFUNC` version if all architectures now support ifunc resolvers? To the naked eye it looks like we removed the ifunc bits instead of the non-ifunc bits. > You are right, thank you for noting. Will you fix it? > Thanks, > > Kyle Evans > > > diff --git a/sys/kern/sched_shim.c b/sys/kern/sched_shim.c > > index 83e4412494d3..2b1dcecda433 100644 > > --- a/sys/kern/sched_shim.c > > +++ b/sys/kern/sched_shim.c > > @@ -22,20 +22,12 @@ > > const struct sched_instance *active_sched; > > -#ifndef __DO_NOT_HAVE_SYS_IFUNCS > > -#define __DEFINE_SHIM(__m, __r, __n, __p, __a) \ > > - DEFINE_IFUNC(, __r, __n, __p) \ > > - { \ > > - return (active_sched->__m); \ > > - } > > -#else > > #define __DEFINE_SHIM(__m, __r, __n, __p, __a) \ > > __r \ > > __n __p \ > > { \ > > return (active_sched->__m __a); \ > > } > > -#endif > > #define DEFINE_SHIM0(__m, __r, __n) \ > > __DEFINE_SHIM(__m, __r, __n, (void), ()) > > #define DEFINE_SHIM1(__m, __r, __n, __t1, __a1) \ > > From nobody Tue Feb 24 13:28:21 2026 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 4fKz7T48xfz6S36S for ; Tue, 24 Feb 2026 13:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKz7T3PK6z3L73 for ; Tue, 24 Feb 2026 13:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771939701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IRXE7Q2PNn3AHhIRG9p51qGKUDXshdZrtot+YGMb6Rw=; b=csi+CrLwPbbZKGb4sFGXOwPKzbXDb8GDtwCw966/JRwyRKWXLEwvBV9rI4vshe44ifeXM3 qF5u+ZUMMO8ibErWLw3xd81cOmL9D1wGLwUyjpUS/2JTKZW82glddkQktnFZEu/ktZKf2N bfS0Ovjn3ZIbb6QJXc0sYAnVLOAMOgkZcRpORY94RfBmxrJRKKg/lJeQYPA4p9VKLMeD+t aIP2YVNVix2uKHHdaoqbHKSdJlEsNilm0xpstMF/NHCGmUbCeEkIzG9AoU3cKqmhy95Gty tT3E6EMPHZEBGFYJOWJCp5Jlg7ORXQsniZ6EPCcS/VSp9nZdn83RpUwP/2ZUrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771939701; a=rsa-sha256; cv=none; b=AD7UjBJSLVhzMDwfwIV20ZbRX166ngkhkmkUtIDm9d0oAt0zApv7mHDbLhkkJw6PFTbvrX gAfMjHSHWPO7eDGDi/Gk8KYvDyISgiMEuNoc1Av5hYb0nTawPxxA3Mrfzr4hj5gOjzEzSq JdCpXFUwDz+rpZqGJyA2lpVZSRcBbUfm/Q6dOQIN4KWth7yPfVcE1a+jIDmL0I2cUOG1b1 KMXtjIEhP3MEr4BCAsLo1M04YV2XaiVxPXUkDe3YQVkrzcXyNED02SzlVPtzdYhOvil2lP rgVIKKgd+nmMhy3+6cQSpFetWSzALodv+3Xbda5wVfUwlEfIgPQISGd7YuAZ+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771939701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IRXE7Q2PNn3AHhIRG9p51qGKUDXshdZrtot+YGMb6Rw=; b=N6PMKw8tZbs+UHjrGjFzXssoULBC5FUgD5TK+mNelvbzINPUzX9rq4xLBBV6HsvgG6HgwA pCpdDJOFm9yspANg/1Gao5U8XK+p0e3LCnyYErOSFRdQ3dTfzMv0bpFBiuE77GwzgCPtSh sUI0V6bksp01jzZARhfC4JLcELCfBHr8gLHI36krqyEP/7vIm0oWNOy33wqXKScGdxf4dz qWylnT4I8KYbdIUIfFVya22n0kio9hNqKb3l8xBqwgi6AZrKox+1sP+6jG0TLr6ZLUJO/I 6ufzYqeUKY0AR2fBAxkM7jcIwjW9Ttg8yyEQFrvgmzjCcos3yipQ8ogCmL4Lkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKz7T30Xcz2vV for ; Tue, 24 Feb 2026 13:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43f64 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 13:28:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: f0b8355db6ba - main - ffs.4: Mlink to ufs.4 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: f0b8355db6ba57a0849c41722e0a09f312d9eef5 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 13:28:21 +0000 Message-Id: <699da775.43f64.5464da66@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=f0b8355db6ba57a0849c41722e0a09f312d9eef5 commit f0b8355db6ba57a0849c41722e0a09f312d9eef5 Author: Alexander Ziaee AuthorDate: 2026-02-24 13:24:16 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-24 13:26:20 +0000 ffs.4: Mlink to ufs.4 PR: 293423 MFC after: 3 days Requested by: bms --- share/man/man4/Makefile | 1 + share/man/man4/ffs.4 | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 9bdd2d2c83ff..a385363138d0 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -719,6 +719,7 @@ MLINKS+=ext2fs.4 ext4fs.4 MLINKS+=fd.4 stderr.4 \ fd.4 stdin.4 \ fd.4 stdout.4 +MLINKS+=ffs.4 ufs.4 MLINKS+=fdt.4 FDT.4 MLINKS+=firewire.4 ieee1394.4 MLINKS+=fwe.4 if_fwe.4 diff --git a/share/man/man4/ffs.4 b/share/man/man4/ffs.4 index 5f8787d6fefc..519ef1d1e8a5 100644 --- a/share/man/man4/ffs.4 +++ b/share/man/man4/ffs.4 @@ -28,11 +28,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 19, 2025 +.Dd February 24, 2026 .Dt FFS 4 .Os .Sh NAME -.Nm ffs +.Nm ffs , +.Nm ufs .Nd Berkeley fast file system .Sh SYNOPSIS In the kernel configuration file: From nobody Tue Feb 24 13:55:04 2026 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 4fKzkJ2ScFz6S6f9 for ; Tue, 24 Feb 2026 13:55: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fKzkJ1lyNz3Pwt for ; Tue, 24 Feb 2026 13:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771941304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BH8w/T1V9VXC9B9KPHmq7jv2cXPYCYF4uiZujHamZu8=; b=fdJHLFBlCAz79wvokUeh3jf4guwx/yTjImHU4L39LQSDU2CmuD4DOHiiTBV8kdlf0D/WEl IyVbLghjXePveVxrDeJsU8gxC0ZIDBlR2KwEx544xDru87NddOzLVnwL/BLzoGqKp0cI7v PjBBIEUYYzujpfnsQU9zt7vI3cmMHMPq1SE+jx7jVgTEJl9TPawXBWHvUQvGqEPhT9h240 0c8zWbDeyyuUE1gl4qJNSnjA+VFVbnLyL8MrCUNSsY0TA5E/h6wn0QjpGgTqOn+Z7Pk8RF 2BDKby1zyZppdw2zMINE92pZwLgLuA6+FhH8muGuZK+4dcGHveyJAyIqlfhSew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771941304; a=rsa-sha256; cv=none; b=jc0UhUwPsPl7W2BixbqqQ2H/eSnjUtwfLKbcQhjM+tccAtZVy3WHg3iHcW7fEUhYE+J8iV M4MFhOZOWjUumASRNLPcFZv8HzSSPfS0qJ0kJ/2MaqWnPDsw62o6CAHiD94KswFyyiLhzM Dz3k+HeqSP+j80EGlcA4XPtrd/VOG4qb8djGDL5GWDI1yzuDjfXe+5b17NMWp9KfgPcYF/ xh5d4xDtNFhaI5DrEGwdOdI7zkBUK3GN7ptuspSPE7DM3JEErF4QkU6W38syA5nBnxijkt MXhNoYzsGuWpGoeEWjj7g/PmmTUpAyILe3MiJJet8ljuxA9WjI+yrIoGhmW/cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771941304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BH8w/T1V9VXC9B9KPHmq7jv2cXPYCYF4uiZujHamZu8=; b=RJWn31Gqsx1r3Xm5t7c2diBYyJhmNH7K5iUvmROn0NisnTizXL7tBTFvyTkxNAMMzrZLCs 9E0hvFoJxVpr0DbKVKgUZ0ahqRNjHsW9aSlOkqXlX9FJbdghATFG5kg05tty7dr5OPw3zF ucQdmAvuvZXMhUSgNVfMP6AxF0eOsJJoeelYvz762OTP7YOGhJtbQRxovzHB+V8wDL0joU HiWUsx8CGlZIUXec92PeAtDji11yY2PRs9kC8j7AQJ0iPwHcMavXs/eiHaF49d1wzDjtTk ygR5txjZqzfUdbDvVYAz/+Ox3vieMC1xawS/Cx1kBmYsazFrJElCrkEHvT4ZiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fKzkJ11fwz3Pt for ; Tue, 24 Feb 2026 13:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1938f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 13:55:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: b7ef4f4b230f - main - sys: Restore sorting in sys/elf_common.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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7ef4f4b230f01968473269f280bd7e4e86a3ec9 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 13:55:04 +0000 Message-Id: <699dadb8.1938f.22a54dfd@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=b7ef4f4b230f01968473269f280bd7e4e86a3ec9 commit b7ef4f4b230f01968473269f280bd7e4e86a3ec9 Author: Jessica Clarke AuthorDate: 2026-02-24 13:52:21 +0000 Commit: Jessica Clarke CommitDate: 2026-02-24 13:52:21 +0000 sys: Restore sorting in sys/elf_common.h These various definitions are meant to be kept sorted by machine prefix. Fixes: 2bb61497ca76 ("elf_common.h: Add definitions for LoongArch ELF files") --- sys/sys/elf_common.h | 350 +++++++++++++++++++++++++-------------------------- 1 file changed, 175 insertions(+), 175 deletions(-) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 9520bd63cbea..353ac882350b 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -345,6 +345,25 @@ typedef struct { #define EF_ARM_VFP_FLOAT EF_ARM_ABI_FLOAT_HARD /* Pre-V5 ABI name */ #define EF_ARM_MAVERICK_FLOAT 0x00000800 +/* + * Loongson LoongArch Specific e_flags + * + * Definitions from LoongArch ELF psABI v2.01. + * Reference: https://github.com/loongson/LoongArch-Documentation + * (commit hash 296de4def055c871809068e0816325a4ac04eb12) + */ + +/* LoongArch Base ABI Modifiers */ +#define EF_LOONGARCH_ABI_SOFT_FLOAT 0x00000001 +#define EF_LOONGARCH_ABI_SINGLE_FLOAT 0x00000002 +#define EF_LOONGARCH_ABI_DOUBLE_FLOAT 0x00000003 +#define EF_LOONGARCH_ABI_MODIFIER_MASK 0x00000007 + +/* LoongArch Object file ABI versions */ +#define EF_LOONGARCH_OBJABI_V0 0x00000000 +#define EF_LOONGARCH_OBJABI_V1 0x00000040 +#define EF_LOONGARCH_OBJABI_MASK 0x000000C0 + #define EF_MIPS_NOREORDER 0x00000001 #define EF_MIPS_PIC 0x00000002 /* Contains PIC code */ #define EF_MIPS_CPIC 0x00000004 /* STD PIC calling sequence */ @@ -383,25 +402,6 @@ typedef struct { #define EF_RISCV_RVE 0x00000008 #define EF_RISCV_TSO 0x00000010 -/* - * Loongson LoongArch Specific e_flags - * - * Definitions from LoongArch ELF psABI v2.01. - * Reference: https://github.com/loongson/LoongArch-Documentation - * (commit hash 296de4def055c871809068e0816325a4ac04eb12) - */ - -/* LoongArch Base ABI Modifiers */ -#define EF_LOONGARCH_ABI_SOFT_FLOAT 0x00000001 -#define EF_LOONGARCH_ABI_SINGLE_FLOAT 0x00000002 -#define EF_LOONGARCH_ABI_DOUBLE_FLOAT 0x00000003 -#define EF_LOONGARCH_ABI_MODIFIER_MASK 0x00000007 - -/* LoongArch Object file ABI versions */ -#define EF_LOONGARCH_OBJABI_V0 0x00000000 -#define EF_LOONGARCH_OBJABI_V1 0x00000040 -#define EF_LOONGARCH_OBJABI_MASK 0x000000C0 - #define EF_SPARC_EXT_MASK 0x00ffff00 #define EF_SPARC_32PLUS 0x00000100 #define EF_SPARC_SUN_US1 0x00000200 @@ -1226,6 +1226,162 @@ typedef struct { #define R_IA_64_DTPREL64LSB 0xb7 /* word64 LSB @dtprel(S + A) */ #define R_IA_64_LTOFF_DTPREL22 0xba /* imm22 @ltoff(@dtprel(S+A)) */ +/* + * Loongson LoongArch relocation types. + * + * LoongArch ELF psABI: https://github.com/loongson/LoongArch-Documentation + * (commit hash 9b3bd9f4a497115913c22f1a2a47863798fbc02a) + */ + +/* Relocation types used by the dynamic linker */ +#define R_LARCH_NONE 0 +#define R_LARCH_32 1 +#define R_LARCH_64 2 +#define R_LARCH_RELATIVE 3 +#define R_LARCH_COPY 4 +#define R_LARCH_JUMP_SLOT 5 +#define R_LARCH_TLS_DTPMOD32 6 +#define R_LARCH_TLS_DTPMOD64 7 +#define R_LARCH_TLS_DTPREL32 8 +#define R_LARCH_TLS_DTPREL64 9 +#define R_LARCH_TLS_TPREL32 10 +#define R_LARCH_TLS_TPREL64 11 +#define R_LARCH_IRELATIVE 12 +#define R_LARCH_MARK_LA 20 +#define R_LARCH_MARK_PCREL 21 +#define R_LARCH_SOP_PUSH_PCREL 22 +#define R_LARCH_SOP_PUSH_ABSOLUTE 23 +#define R_LARCH_SOP_PUSH_DUP 24 +#define R_LARCH_SOP_PUSH_GPREL 25 +#define R_LARCH_SOP_PUSH_TLS_TPREL 26 +#define R_LARCH_SOP_PUSH_TLS_GOT 27 +#define R_LARCH_SOP_PUSH_TLS_GD 28 +#define R_LARCH_SOP_PUSH_PLT_PCREL 29 +#define R_LARCH_SOP_ASSERT 30 +#define R_LARCH_SOP_NOT 31 +#define R_LARCH_SOP_SUB 32 +#define R_LARCH_SOP_SL 33 +#define R_LARCH_SOP_SR 34 +#define R_LARCH_SOP_ADD 35 +#define R_LARCH_SOP_AND 36 +#define R_LARCH_SOP_IF_ELSE 37 +#define R_LARCH_SOP_POP_32_S_10_5 38 +#define R_LARCH_SOP_POP_32_U_10_12 39 +#define R_LARCH_SOP_POP_32_S_10_12 40 +#define R_LARCH_SOP_POP_32_S_10_16 41 +#define R_LARCH_SOP_POP_32_S_10_16_S2 42 +#define R_LARCH_SOP_POP_32_S_5_20 43 +#define R_LARCH_SOP_POP_32_S_0_5_10_16_S2 44 +#define R_LARCH_SOP_POP_32_S_0_10_10_16_S2 45 +#define R_LARCH_SOP_POP_32_U 46 +#define R_LARCH_ADD8 47 +#define R_LARCH_ADD16 48 +#define R_LARCH_ADD24 49 +#define R_LARCH_ADD32 50 +#define R_LARCH_ADD64 51 +#define R_LARCH_SUB8 52 +#define R_LARCH_SUB16 53 +#define R_LARCH_SUB24 54 +#define R_LARCH_SUB32 55 +#define R_LARCH_SUB64 56 +#define R_LARCH_GNU_VTINHERIT 57 +#define R_LARCH_GNU_VTENTRY 58 + +/* + * Relocs whose processing do not require a stack machine. + * + * Spec addition: https://github.com/loongson/LoongArch-Documentation/pull/57 + */ +#define R_LARCH_B16 64 +#define R_LARCH_B21 65 +#define R_LARCH_B26 66 +#define R_LARCH_ABS_HI20 67 +#define R_LARCH_ABS_LO12 68 +#define R_LARCH_ABS64_LO20 69 +#define R_LARCH_ABS64_HI12 70 +#define R_LARCH_PCALA_HI20 71 +#define R_LARCH_PCALA_LO12 72 +#define R_LARCH_PCALA64_LO20 73 +#define R_LARCH_PCALA64_HI12 74 +#define R_LARCH_GOT_PC_HI20 75 +#define R_LARCH_GOT_PC_LO12 76 +#define R_LARCH_GOT64_PC_LO20 77 +#define R_LARCH_GOT64_PC_HI12 78 +#define R_LARCH_GOT_HI20 79 +#define R_LARCH_GOT_LO12 80 +#define R_LARCH_GOT64_LO20 81 +#define R_LARCH_GOT64_HI12 82 +#define R_LARCH_TLS_LE_HI20 83 +#define R_LARCH_TLS_LE_LO12 84 +#define R_LARCH_TLS_LE64_LO20 85 +#define R_LARCH_TLS_LE64_HI12 86 +#define R_LARCH_TLS_IE_PC_HI20 87 +#define R_LARCH_TLS_IE_PC_LO12 88 +#define R_LARCH_TLS_IE64_PC_LO20 89 +#define R_LARCH_TLS_IE64_PC_HI12 90 +#define R_LARCH_TLS_IE_HI20 91 +#define R_LARCH_TLS_IE_LO12 92 +#define R_LARCH_TLS_IE64_LO20 93 +#define R_LARCH_TLS_IE64_HI12 94 +#define R_LARCH_TLS_LD_PC_HI20 95 +#define R_LARCH_TLS_LD_HI20 96 +#define R_LARCH_TLS_GD_PC_HI20 97 +#define R_LARCH_TLS_GD_HI20 98 +#define R_LARCH_32_PCREL 99 +#define R_LARCH_RELAX 100 + +/* + * Relocs added in ELF for the LoongArch™ Architecture v20230519, part of the + * v2.10 LoongArch ABI specs. + * + * Spec addition: https://github.com/loongson/la-abi-specs/pull/1 + * + * Note that the 101 and 104 relocation numbers are defined as R_LARCH_DELETE + * and R_LARCH_CFA respectively in psABI 2.10. But they are marked as reserved + * in psABI v2.20 because they were proved not necessary to be exposed outside + * of the linker. + */ +#define R_LARCH_ALIGN 102 +#define R_LARCH_PCREL20_S2 103 +#define R_LARCH_ADD6 105 +#define R_LARCH_SUB6 106 +#define R_LARCH_ADD_ULEB128 107 +#define R_LARCH_SUB_ULEB128 108 +#define R_LARCH_64_PCREL 109 + +/* + * Relocs added in ELF for the LoongArch™ Architecture v20231102, part of the + * v2.20 LoongArch ABI specs. + * + * Spec addition: https://github.com/loongson/la-abi-specs/pull/4 + */ +#define R_LARCH_CALL36 110 + +/* + * Relocs added in ELF for the LoongArch™ Architecture v20231219, part of the + * v2.30 LoongArch ABI specs. + * + * Spec addition: https://github.com/loongson/la-abi-specs/pull/5 + */ +#define R_LARCH_TLS_DESC32 13 +#define R_LARCH_TLS_DESC64 14 +#define R_LARCH_TLS_DESC_PC_HI20 111 +#define R_LARCH_TLS_DESC_PC_LO12 112 +#define R_LARCH_TLS_DESC64_PC_LO20 113 +#define R_LARCH_TLS_DESC64_PC_HI12 114 +#define R_LARCH_TLS_DESC_HI20 115 +#define R_LARCH_TLS_DESC_LO12 116 +#define R_LARCH_TLS_DESC64_LO20 117 +#define R_LARCH_TLS_DESC64_HI12 118 +#define R_LARCH_TLS_DESC_LD 119 +#define R_LARCH_TLS_DESC_CALL 120 +#define R_LARCH_TLS_LE_HI20_R 121 +#define R_LARCH_TLS_LE_ADD_R 122 +#define R_LARCH_TLS_LE_LO12_R 123 +#define R_LARCH_TLS_LD_PCREL20_S2 124 +#define R_LARCH_TLS_GD_PCREL20_S2 125 +#define R_LARCH_TLS_DESC_PCREL20_S2 126 + #define R_MIPS_NONE 0 /* No reloc */ #define R_MIPS_16 1 /* Direct 16 bit */ #define R_MIPS_32 2 /* Direct 32 bit */ @@ -1426,162 +1582,6 @@ typedef struct { #define R_RISCV_TLSDESC_CALL 65 #define R_RISCV_VENDOR 191 -/* - * Loongson LoongArch relocation types. - * - * LoongArch ELF psABI: https://github.com/loongson/LoongArch-Documentation - * (commit hash 9b3bd9f4a497115913c22f1a2a47863798fbc02a) - */ - -/* Relocation types used by the dynamic linker */ -#define R_LARCH_NONE 0 -#define R_LARCH_32 1 -#define R_LARCH_64 2 -#define R_LARCH_RELATIVE 3 -#define R_LARCH_COPY 4 -#define R_LARCH_JUMP_SLOT 5 -#define R_LARCH_TLS_DTPMOD32 6 -#define R_LARCH_TLS_DTPMOD64 7 -#define R_LARCH_TLS_DTPREL32 8 -#define R_LARCH_TLS_DTPREL64 9 -#define R_LARCH_TLS_TPREL32 10 -#define R_LARCH_TLS_TPREL64 11 -#define R_LARCH_IRELATIVE 12 -#define R_LARCH_MARK_LA 20 -#define R_LARCH_MARK_PCREL 21 -#define R_LARCH_SOP_PUSH_PCREL 22 -#define R_LARCH_SOP_PUSH_ABSOLUTE 23 -#define R_LARCH_SOP_PUSH_DUP 24 -#define R_LARCH_SOP_PUSH_GPREL 25 -#define R_LARCH_SOP_PUSH_TLS_TPREL 26 -#define R_LARCH_SOP_PUSH_TLS_GOT 27 -#define R_LARCH_SOP_PUSH_TLS_GD 28 -#define R_LARCH_SOP_PUSH_PLT_PCREL 29 -#define R_LARCH_SOP_ASSERT 30 -#define R_LARCH_SOP_NOT 31 -#define R_LARCH_SOP_SUB 32 -#define R_LARCH_SOP_SL 33 -#define R_LARCH_SOP_SR 34 -#define R_LARCH_SOP_ADD 35 -#define R_LARCH_SOP_AND 36 -#define R_LARCH_SOP_IF_ELSE 37 -#define R_LARCH_SOP_POP_32_S_10_5 38 -#define R_LARCH_SOP_POP_32_U_10_12 39 -#define R_LARCH_SOP_POP_32_S_10_12 40 -#define R_LARCH_SOP_POP_32_S_10_16 41 -#define R_LARCH_SOP_POP_32_S_10_16_S2 42 -#define R_LARCH_SOP_POP_32_S_5_20 43 -#define R_LARCH_SOP_POP_32_S_0_5_10_16_S2 44 -#define R_LARCH_SOP_POP_32_S_0_10_10_16_S2 45 -#define R_LARCH_SOP_POP_32_U 46 -#define R_LARCH_ADD8 47 -#define R_LARCH_ADD16 48 -#define R_LARCH_ADD24 49 -#define R_LARCH_ADD32 50 -#define R_LARCH_ADD64 51 -#define R_LARCH_SUB8 52 -#define R_LARCH_SUB16 53 -#define R_LARCH_SUB24 54 -#define R_LARCH_SUB32 55 -#define R_LARCH_SUB64 56 -#define R_LARCH_GNU_VTINHERIT 57 -#define R_LARCH_GNU_VTENTRY 58 - -/* - * Relocs whose processing do not require a stack machine. - * - * Spec addition: https://github.com/loongson/LoongArch-Documentation/pull/57 - */ -#define R_LARCH_B16 64 -#define R_LARCH_B21 65 -#define R_LARCH_B26 66 -#define R_LARCH_ABS_HI20 67 -#define R_LARCH_ABS_LO12 68 -#define R_LARCH_ABS64_LO20 69 -#define R_LARCH_ABS64_HI12 70 -#define R_LARCH_PCALA_HI20 71 -#define R_LARCH_PCALA_LO12 72 -#define R_LARCH_PCALA64_LO20 73 -#define R_LARCH_PCALA64_HI12 74 -#define R_LARCH_GOT_PC_HI20 75 -#define R_LARCH_GOT_PC_LO12 76 -#define R_LARCH_GOT64_PC_LO20 77 -#define R_LARCH_GOT64_PC_HI12 78 -#define R_LARCH_GOT_HI20 79 -#define R_LARCH_GOT_LO12 80 -#define R_LARCH_GOT64_LO20 81 -#define R_LARCH_GOT64_HI12 82 -#define R_LARCH_TLS_LE_HI20 83 -#define R_LARCH_TLS_LE_LO12 84 -#define R_LARCH_TLS_LE64_LO20 85 -#define R_LARCH_TLS_LE64_HI12 86 -#define R_LARCH_TLS_IE_PC_HI20 87 -#define R_LARCH_TLS_IE_PC_LO12 88 -#define R_LARCH_TLS_IE64_PC_LO20 89 -#define R_LARCH_TLS_IE64_PC_HI12 90 -#define R_LARCH_TLS_IE_HI20 91 -#define R_LARCH_TLS_IE_LO12 92 -#define R_LARCH_TLS_IE64_LO20 93 -#define R_LARCH_TLS_IE64_HI12 94 -#define R_LARCH_TLS_LD_PC_HI20 95 -#define R_LARCH_TLS_LD_HI20 96 -#define R_LARCH_TLS_GD_PC_HI20 97 -#define R_LARCH_TLS_GD_HI20 98 -#define R_LARCH_32_PCREL 99 -#define R_LARCH_RELAX 100 - -/* - * Relocs added in ELF for the LoongArch™ Architecture v20230519, part of the - * v2.10 LoongArch ABI specs. - * - * Spec addition: https://github.com/loongson/la-abi-specs/pull/1 - * - * Note that the 101 and 104 relocation numbers are defined as R_LARCH_DELETE - * and R_LARCH_CFA respectively in psABI 2.10. But they are marked as reserved - * in psABI v2.20 because they were proved not necessary to be exposed outside - * of the linker. - */ -#define R_LARCH_ALIGN 102 -#define R_LARCH_PCREL20_S2 103 -#define R_LARCH_ADD6 105 -#define R_LARCH_SUB6 106 -#define R_LARCH_ADD_ULEB128 107 -#define R_LARCH_SUB_ULEB128 108 -#define R_LARCH_64_PCREL 109 - -/* - * Relocs added in ELF for the LoongArch™ Architecture v20231102, part of the - * v2.20 LoongArch ABI specs. - * - * Spec addition: https://github.com/loongson/la-abi-specs/pull/4 - */ -#define R_LARCH_CALL36 110 - -/* - * Relocs added in ELF for the LoongArch™ Architecture v20231219, part of the - * v2.30 LoongArch ABI specs. - * - * Spec addition: https://github.com/loongson/la-abi-specs/pull/5 - */ -#define R_LARCH_TLS_DESC32 13 -#define R_LARCH_TLS_DESC64 14 -#define R_LARCH_TLS_DESC_PC_HI20 111 -#define R_LARCH_TLS_DESC_PC_LO12 112 -#define R_LARCH_TLS_DESC64_PC_LO20 113 -#define R_LARCH_TLS_DESC64_PC_HI12 114 -#define R_LARCH_TLS_DESC_HI20 115 -#define R_LARCH_TLS_DESC_LO12 116 -#define R_LARCH_TLS_DESC64_LO20 117 -#define R_LARCH_TLS_DESC64_HI12 118 -#define R_LARCH_TLS_DESC_LD 119 -#define R_LARCH_TLS_DESC_CALL 120 -#define R_LARCH_TLS_LE_HI20_R 121 -#define R_LARCH_TLS_LE_ADD_R 122 -#define R_LARCH_TLS_LE_LO12_R 123 -#define R_LARCH_TLS_LD_PCREL20_S2 124 -#define R_LARCH_TLS_GD_PCREL20_S2 125 -#define R_LARCH_TLS_DESC_PCREL20_S2 126 - #define R_SPARC_NONE 0 #define R_SPARC_8 1 #define R_SPARC_16 2 From nobody Tue Feb 24 14:26:04 2026 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 4fL0Q506bvz6S9wT for ; Tue, 24 Feb 2026 14:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL0Q46jPnz3T7g for ; Tue, 24 Feb 2026 14:26:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771943164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qPrg7naIr2VU+Zeg4F3ADs8OyeUybPYPvjp5OyAmjA=; b=LkqwVYwqXf6GKSuujmN14o1wXv0vinIWxdkbgyEXzzHodJNdsLQ4JU6G0dYbEPNxXCV6JO r4u55X5HAP7xIZnvR98T9tFrlY6eDIOv3Sr4NQTHJ1rsfCYaK8aPzB/ro/klnvf58ZUv1A Wy7cE2pB7IZx0KZV1V7MNk76IsMB9ucaJJ3V/8xalXy/ek1IEe4255uS2mPSXx7biIck4u mOtHVxQ/HlOhyRQKTjWMlecnM+1J0gVJFEP6M/Oe9Utp16UMAF8UVd0FRliVr3gJ0IhNaF xpFZAbyGGOfTcrGh9zaFMgOpAJ4e7vMjjFu3fR9x5zaLVJpOD0+feTDAW6LFUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771943164; a=rsa-sha256; cv=none; b=eXYMtnWX4+B1o/AMM4HkdJZEfpADoifQMn9J6NWrra8E6XBgYXO0UV8HTBCLTpnVduYxmc DGdz6x2n7H3aCKloL5msrUoLbLcSCjz81RnnhN/5nZe8r+gDHgPP555xzNWMCsYKQfLGV1 DohLvgkkywXcS4MFX/dY5NCvpkgFxcyb+bd1IG4vyp0VyotX8CYKqLBSCgpRINfSWB+i6a kIPxe7bSTDndQwpbfmkxZx+llC60yqQfEX0o4hqtDmnQ4vfEaVXcbMd+YsTIySSqsQqAv6 7NA7s6nReVhlBXB3gIIUk4ujcqb+PmzvxK6yTXwD6Isf6+Oe/VbKEqCk7oDulA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771943164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qPrg7naIr2VU+Zeg4F3ADs8OyeUybPYPvjp5OyAmjA=; b=QJKCp0pWc81is7Oqyl0K3sSO25LNIqZuMvY44lA8LcBz64xZLCQHrCjX7TXXVvKgZGRcdC k6ABQVZu2SSFrcFUFiTUvxZpJ+BqJALlf5wKKOZOuUUf1UFynZZh0Rn+TY+IwUJ/7LjDxw XW1CCFbQv0b5siWoZQceDP0h+2VSDNkMQirVdHfo+JHXLRE/I7+mPCgcTSu+4PmfZS4K17 MZVYd1wSO6oJF+8JOSjylZbknrYgNxDvtcvPid9Dfc6gaTutyrlX917Sx8K4WUAItOEdHi pzOb32FKjakdAnr0ptevP1t/GCdiBI5l7aRaiEjVdQ+Ww396VT3qMRownlCsNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL0Q46JtQz4XD for ; Tue, 24 Feb 2026 14:26:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cf24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 14:26:04 +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: 6c4777c59325 - main - ngctl: Fix getline loop 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: 6c4777c59325c2cfefcce0c466b3bf475404a550 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 14:26:04 +0000 Message-Id: <699db4fc.1cf24.4f3430f0@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6c4777c59325c2cfefcce0c466b3bf475404a550 commit 6c4777c59325c2cfefcce0c466b3bf475404a550 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-24 14:23:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-24 14:25:57 +0000 ngctl: Fix getline loop I misremembered when I wrote this code: getline() returns -1 on EOF, not zero, so the loop condition and the error check are both incorrect (though in practice getline() will never return 0). MFC after: 3 days Fixes: 3cbdcabf714d ("ngctl: Modernize code somewhat") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55487 --- usr.sbin/ngctl/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c index b58de1e042b3..2b711fd4155a 100644 --- a/usr.sbin/ngctl/main.c +++ b/usr.sbin/ngctl/main.c @@ -243,7 +243,7 @@ ReadFile(FILE *fp) unsigned int lineno = 0; int rtn = CMDRTN_OK; - while ((len = getline(&line, &sz, fp)) > 0) { + while ((len = getline(&line, &sz, fp)) >= 0) { lineno++; if (*line == '#') continue; @@ -252,7 +252,7 @@ ReadFile(FILE *fp) break; } } - if (len < 0) + if (ferror(fp)) rtn = CMDRTN_ERROR; free(line); return (rtn); From nobody Tue Feb 24 14:29:32 2026 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 4fL0V43kRnz6SB91 for ; Tue, 24 Feb 2026 14:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL0V40vWpz3Ts9 for ; Tue, 24 Feb 2026 14:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771943372; 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=ZlGxSzDoEVk6OnAAFMvDo9XXJXYmgA0kt++rYgmbVgA=; b=CCG1Zte9+VRCEU6/TMeER58uBf93Z5TXZN5vRihocWTp7p7W65e9nW40jq2HjSfKYDNJ+/ ObVbVZ3qBW8Sq8Uzdwx+IRYKcNNRYjJaJJ5vLbW4xR/Uup4VzXWbyk5Kr/4M6U2myENx4D L3+3BxIPP/fyxijOF/Gu9GT/HjUTDa8mF7rDWig0hGz13A9i8xvGmoQ6yuo6AoMl3G8gn8 cLIyDiNT5pC62yKp3KOIDEbx22zBDNtaazloZT7XtV4rGQLgP7mB7dHjVzGXFN5yOC/Doc 7LIQh4/WGA+gWEVXckQpnJpE3B/N+/Pn4Nq2M+f8Gjd48X++eWH25cb7L9mJsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771943372; a=rsa-sha256; cv=none; b=Q7RYkEh98Z0kt5unZo7+dYl+YLsdZ+JC1qvDY9B7IxqpXKm8WSqECAheDV18FKTm9FFrqT qfzmoXCiKXQRrQPLvXfv3MQQuEQPC8h9p4K525c3ImKxHo8PW1e16vw2NqJX5XNN989EUQ HzvdqjisxOmFFAk4EnuahWpX9Rl0F9FyMQSZ5yPUXPI80yDCcpTZMSL5vHhbv5nQQ1DiHK TB+wWSUnsSR02s/eKPD0nPXz7DIY9wRBjWyz63FqP3wub9+5Ulrz9z1sf/G6zTLr70Au+L sZLhLhz+/Q+NrQe8hk14bbidMwQNieyh6/dM7doIUfC70kjeUUAYXZPPPMFeuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771943372; 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=ZlGxSzDoEVk6OnAAFMvDo9XXJXYmgA0kt++rYgmbVgA=; b=QMN0vkVbptXUvk7h0dpvbvTTqYAwVgn2Vqs5DeWc2NYtrrESwRM8aF8ZrQh4WAM+g4fa/f Hu54oWGQjbucRPc57Erra5uQfU0SBW3GsM/sCesUElLUtDuP1lyXm7jK5oF1qME7j87OXS /w1+JY2bvM/zNUgihNlhJaYMNNeEEZmgJtWoc3KnmOhkw6lnaHPYk0fSK2Nyf/ezLxnYPe ior/AILQMvc57kiakhjSQxpxjQCQNnjtVvgSMxT6TeHDHHWf8NTeKTFvMhS6FpZotFmtJB X/Icut1l9kvWXzuiGlfgSzSZCcdQ0xMKIhCt1amRHsExohUB1nvldM3zR5+pjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL0V405sKz42q for ; Tue, 24 Feb 2026 14:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c45d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 14:29:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: David Marker From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 9ed56cd8d692 - main - ngctl.8: fix incorrect synopsis 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: 9ed56cd8d6929e3ee733e1e61d2e0c6b81122983 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 14:29:32 +0000 Message-Id: <699db5cc.1c45d.3b7f09bf@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9ed56cd8d6929e3ee733e1e61d2e0c6b81122983 commit 9ed56cd8d6929e3ee733e1e61d2e0c6b81122983 Author: David Marker AuthorDate: 2026-02-24 14:27:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-24 14:29:01 +0000 ngctl.8: fix incorrect synopsis Tiny manpage bug I caused in D50241 I left a line in the manpage that shouldn't be there. MFC after: 3 days Fixes: 72d01e62b082 ("netgraph: teach ngctl to attach and run itself in a jail") Reviewed by: des, markj Differential Revision: https://reviews.freebsd.org/D55485 --- usr.sbin/ngctl/ngctl.8 | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8 index 63b8f58ed3df..2fb22fd59646 100644 --- a/usr.sbin/ngctl/ngctl.8 +++ b/usr.sbin/ngctl/ngctl.8 @@ -44,7 +44,6 @@ .Op Fl f Ar filename .Op Fl n Ar nodename .Op Ar command Op Ns Ar argument ... -.Op Ar command ... .Sh DESCRIPTION The .Nm From nobody Tue Feb 24 14:49:29 2026 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 4fL0xC3lz2z6SDLf for ; Tue, 24 Feb 2026 14:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL0xB738Xz3XdH for ; Tue, 24 Feb 2026 14:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771944575; 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=0stQO3jGYf6rDjT4j6W6yj4RaKvRbE1z6/QXouJyTjc=; b=T06FomlC/MbU4NjR2DZQZx7i8aAmalBnXRAA8fHtUaawvIqpE52wvbbrcE7eT6cuEV6QFz BIHrY9oOk/PuC7S61TFvFiW3wXSTD1JxF5ZbWNAg8B4NaXX54DoAC2cc2qP2TXDKn66wDC xMB6Oj90ZXsUFIS6RVKpTtHMq3S0nyxWljXKRJMaku/9qmBVHMRVeVjmfP0GjmeCa6717W q2ScoQfchaRCSd1vEQ6lvV88lFj8pd4mtMNIRiwrBqvc3m/d6uu9iGcHbOtMqlTXlsVrE2 cu/CNGr2dhaG9HZ5LQrwh8/pkNEr0teon9zU3II+oBNrv2smZgP6H5viG/jMAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771944575; a=rsa-sha256; cv=none; b=fDhh58oThpbUnnm/jN2HeBrVtABe2WWPUup8DP7X3b/63+HdqYq2BXYNPHleBkarzpl+aZ GsA/6dhXgAgCZwwqJo4y3E56UIGdfy3B66uRIgLAMaQxbtfpIncNHAoH5+CtCCf/O352xW PflXKEeLKzi94BjjeRwbKT6UMRfuGua8E6d+X/Kd4tV2HmBuKlB79xm/aOg9rwtKXJ+hQu dSH0h03+relrWHyuDAtubT2UaNMYMsplE5sjPl2+sCcL0jGNOQJfRTLXNde9Nd00Rxl7Q7 dTCcgK6C88tQ8xLLaOj5NnhmWk80oUCV9MKZ+5kLmcbwlVKBZvg65H3n6F0n2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771944575; 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=0stQO3jGYf6rDjT4j6W6yj4RaKvRbE1z6/QXouJyTjc=; b=LFVHKYyXTbfyaswaAI8Wg9tDaVJVtvbjgbQ0SWrHif675uX4GcRKgkqGQJvx0D00oD17SS sUZ6f12Wgg0uO8Ob5jTuru7EZUc1HA+iYSkLaAL9HCAOouWFHaDnVj2RJjdEPEf9IM0d8b 71ZSJVbchkj8v2BqJ/p0U21UOpRvr+G0XhhLWVWQUbyrhzLGnJRVa47xjgQkH7yACxW+b+ sQhHki3HCC1ya8mbqTfLV6MWHYqtzqrUGyPb3TlCNS928HXL1SgcGVQWvTc8v0DTYUaeus 2lBsIOG5uwbF8SFPN0zH+uwVmKVVc/WiHXY1Jw64e8G1Mgo89K1VoE0hsyCLRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL0xB6cX5z4xc for ; Tue, 24 Feb 2026 14:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e1c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 14:49:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Dmitry Lukhtionov From: Ed Maste Subject: git: f4f9054dc47b - main - camcontrol: Print 'transport revision' 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: f4f9054dc47b430872d38c7a75fea753c6fe796f Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 14:49:29 +0000 Message-Id: <699dba79.1e1c3.76bd3c1c@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f4f9054dc47b430872d38c7a75fea753c6fe796f commit f4f9054dc47b430872d38c7a75fea753c6fe796f Author: Dmitry Lukhtionov AuthorDate: 2026-02-23 14:42:59 +0000 Commit: Ed Maste CommitDate: 2026-02-24 14:48:58 +0000 camcontrol: Print 'transport revision' As described in Serial ATA Revision 3.5a Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/2044 --- sbin/camcontrol/camcontrol.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index c2deafbd81da..7ad177c3e4b6 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -1674,6 +1674,35 @@ atacapprint(struct ata_params *parm) } printf("\n"); + printf("transport revision "); + if (parm->transport_major == 0 || parm->transport_major == 0xffff) { + printf("Unknown"); + } else { + if (parm->transport_major & 0x0400) + printf("SATA Rev 3.5"); + else if (parm->transport_major & 0x0200) + printf("SATA Rev 3.4"); + else if (parm->transport_major & 0x0100) + printf("SATA Rev 3.3"); + else if (parm->transport_major & 0x0080) + printf("SATA Rev 3.2"); + else if (parm->transport_major & 0x0040) + printf("SATA Rev 3.1"); + else if (parm->transport_major & 0x0020) + printf("SATA Rev 3.0"); + else if (parm->transport_major & 0x0010) + printf("SATA Rev 2.6"); + else if (parm->transport_major & 0x0008) + printf("SATA Rev 2.5"); + else if (parm->transport_major & 0x0004) + printf("SATA II: Extensions"); + else if (parm->transport_major & 0x0002) + printf("SATA 1.0a"); + else if (parm->transport_major & 0x0001) + printf("ATA8-AST"); + } + printf("\n"); + if (parm->media_rotation_rate == 1) { printf("media RPM non-rotating\n"); } else if (parm->media_rotation_rate >= 0x0401 && From nobody Tue Feb 24 15:16:03 2026 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 4fL1Wm3W21z6SHSF for ; Tue, 24 Feb 2026 15:16: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL1Wm0ZCMz3bfg for ; Tue, 24 Feb 2026 15:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771946164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=umiwpMs2n/SUCd3etabwJepLhA6CKjqXkYYCAFNNzeQ=; b=pIIr+81exMbIfb/zFCmaWCtAhuDjMi5oF5yfDVLa31ESwkovxh4UF8VJAAOizOJj++llWU TK9aBNI3v9huMyCNDlgZmCnZZCCAvicJCg6CCkaTSu7LD8AMOyLYqyo/q0u1dybtr44wCa jFfzE8jun1qY91EzdZIOqTkmgjL3JX86/IiD8Oq/C+qWqhZ4IGy1oYrKLj5sTY9IpP/FZd bYxUiNAATHFm6iB/CuX/ymEEFtZuqskXXgpeMCcQw1d6fNLnrPJMpz+SQAgkrJJipq0rpY 3yXvi2mvVBtPjqUJvBiyZ/pXGokk5UA6WXVw3kArd+dCQOo+5BEr8scg/E/kfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771946164; a=rsa-sha256; cv=none; b=LHIE/xIzJRV+77+Fq00SgEiWQh9xqwXkC8A/rrlp2DOsziDPHtC4+v8HHzidmAKh7Ycydq cczO5iWSEDCwthCRRZ8mlNSW8VeMEELI9D0jdYPEVRUB5NY7oD/DQPtQKp6IOh79dvfulZ hUBTddRpOL+ce9TBlm4hqbC82DEp8MzxS5gIP46YMNluyj5nmwVVmnyhrzox42GDW8fRXK OE+DQbU7Ph2mjQ5Jx0ZD2k6J5AecGWRFVmLIxcjBEPrVCi20uv5rRVX4OimtcbRRTPBdfg OULkKVrYWXLuDGyO+NX5ZckV0P4fKOCKGL87XHjLNg6CL0py4hp3K0Ba1FKomw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771946164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=umiwpMs2n/SUCd3etabwJepLhA6CKjqXkYYCAFNNzeQ=; b=OllWWixV7JuXdebJjsYQTXy816FLR72bk+CPcndqr+ZogZxWXE5hF7n02sq1fZ98CFNZLr ZZB9THyqMN4cxBzvfaXox4xKMYozFMQYbbmusZctHd0GT+il4BrupZLC4qDaL9FEBn06nP 4+La/KuD7dsb1I0xaPxwxeCf7TPfteBDdATXSOw/msBdWMA8GGF61QzyRqBahrDlGu5ghh BAesfINIbq6tfgqmhzE2lXJ1hFvXRv2wQoa4StLPfmFNjyiZ7KBkG11TUVeUERMk58z6a+ RHzB3TwlW6iPamDFF7y7b05g813gWmAkM2FLaFCIwawJ321Ef22D1SwdpRYTlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL1Wm01g5z60n for ; Tue, 24 Feb 2026 15:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21550 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 15:16:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d7d4da91de20 - main - bhyve: Fix truncate_iov() 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: d7d4da91de201841c57a6b8f89b450754b9b8696 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 15:16:03 +0000 Message-Id: <699dc0b3.21550.38192579@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d7d4da91de201841c57a6b8f89b450754b9b8696 commit d7d4da91de201841c57a6b8f89b450754b9b8696 Author: Mark Johnston AuthorDate: 2026-02-24 15:14:39 +0000 Commit: Mark Johnston CommitDate: 2026-02-24 15:14:39 +0000 bhyve: Fix truncate_iov() The implementation was simply wrong. It would always just return the first entry in the iovec, even if the requested length is larger than that first entry. Note, this function will be removed soon, see D53468. Reported by: Vinod p n Reviewed by: des, emaste, Hans Rosenfeld MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55438 --- usr.sbin/bhyve/iov.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bhyve/iov.c b/usr.sbin/bhyve/iov.c index 5ebc426227a6..2bad55267ff3 100644 --- a/usr.sbin/bhyve/iov.c +++ b/usr.sbin/bhyve/iov.c @@ -81,19 +81,14 @@ count_iov(const struct iovec *iov, int niov) void truncate_iov(struct iovec *iov, int *niov, size_t length) { - size_t done = 0; int i; - for (i = 0; i < *niov; i++) { - size_t toseek = MIN(length - done, iov[i].iov_len); - done += toseek; - - if (toseek <= iov[i].iov_len) { - iov[i].iov_len = toseek; - *niov = i + 1; - return; - } + for (i = 0; i < *niov && length > 0; i++) { + if (length < iov[i].iov_len) + iov[i].iov_len = length; + length -= iov[i].iov_len; } + *niov = i; } ssize_t From nobody Tue Feb 24 15:18:15 2026 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 4fL1ZJ2yqzz6SHf6 for ; Tue, 24 Feb 2026 15:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL1ZJ0X4pz3cDH for ; Tue, 24 Feb 2026 15:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771946296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=71d4M9kThsnG7W7/TKJnOJx4G66BJxX70BUafF/Lz8Y=; b=I1NjHNhRWnqxsvLWaMtciaNySy2cpHMVmmunslz3hEEVouhU8+Lf9YcvqqlN4admOHLA7f 6qw/DLwxKczdQ7iTBjVT7QyW0yR5o4HJ5JTdg3kQuy8uJwxjDImYBp2+aqhPfVGM0/L6JK F4OykoPD4wXx43196PqyUZm/yZD/ZfC5SmSDwETiM/+m5vxqeGrxTvzpSTKhIz+G/f1B4q Ih4dY/0P4ics+U/0yzVZuUKsHtlHxJqLDGb+hM0+R5LKPYE/KEbs7GTxGBNsamuZnGIAhV ymkGqW2rDP+JYGIOLtASfux76+Nm3ZgM3qOCpzSTtUko0ljrG3oBrWFK7IYqfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771946296; a=rsa-sha256; cv=none; b=rHLuAGmRgicj1BEbl4dCOYsFEwTLR8W6n+45NHZ00dogHAH8wgK21LI9NfNQrwMpYKjDiw lnr/ITakeCjHRC6OvBTEwlwuxVAOiA+hRV1MIYJ1LCwy6pRyZA10zcmEC+uoqLR5Ch7TzO 08DFngSNEKkT0WeekH3hfqpidVr2aRFkZUNm93yDw9jxOmVxcuqHiui2h+2PIg3MO4W1XT +3prM6xSvjj/emUQeCeGQNi9ZcxFXCm00+1FDBYesI7nxbSltyPBStSXYJGvT+fnUj/J1B 61pPzqH1ra8kr6tevDQY6O1ndE5vsb5mvYJnf2iicdlLbRW2OfsB96dPCfhOdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771946296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=71d4M9kThsnG7W7/TKJnOJx4G66BJxX70BUafF/Lz8Y=; b=RSsrUwu5c8SpXnPHtiyYh7ptgg7BL2Kp/Ri0ETCQWRuFTpfhrVOGAXixvVEQV3Aw7jIb6l nf6Tb2XkjONkwpdupH5vKx3glYRKlqBGaHy7EqRSrIpLrpZ3YUF93179KEjvlPPik2PrPa 5okVTsaI98hGzZfeyPvm5sOYTCDHATHz4W6WMQkadIkVhkjO/HGsj4v5anzNOrlaEduDgO SpG0SN3UaPaBaxs+YpC7kwPDOghFKl6tSV5ilrEtgAHhqnyZQ1jhpQ4MaXHtQrqb+Fh0bm a8cLwU7vZ+qQGOHgmrG0uLRPzuWjLzvIBYlyKtNDP4Y/z0FQSbKyOFYaDcBqbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL1ZH6wGkz5WB for ; Tue, 24 Feb 2026 15:18:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22690 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 15:18:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0ff08b8c402b - main - elf_common.h: Sort SHT_ entries 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: 0ff08b8c402b3c555125e4c72df0b80b4d084d56 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 15:18:15 +0000 Message-Id: <699dc137.22690.4273b464@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0ff08b8c402b3c555125e4c72df0b80b4d084d56 commit 0ff08b8c402b3c555125e4c72df0b80b4d084d56 Author: Ed Maste AuthorDate: 2026-02-24 14:26:55 +0000 Commit: Ed Maste CommitDate: 2026-02-24 15:17:48 +0000 elf_common.h: Sort SHT_ entries Reviewed by: jrtc27 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55488 --- sys/sys/elf_common.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 353ac882350b..42252d2e21af 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -470,8 +470,6 @@ typedef struct { #define SHT_HISUNW 0x6fffffff #define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ #define SHT_LOPROC 0x70000000 /* reserved range for processor */ -#define SHT_X86_64_UNWIND 0x70000001 /* unwind information */ -#define SHT_AMD64_UNWIND SHT_X86_64_UNWIND #define SHT_ARM_EXIDX 0x70000001 /* Exception index table. */ #define SHT_ARM_PREEMPTMAP 0x70000002 /* BPABI DLL dynamic linking @@ -512,6 +510,9 @@ typedef struct { #define SHT_SPARC_GOTDATA 0x70000000 +#define SHT_X86_64_UNWIND 0x70000001 /* unwind information */ +#define SHT_AMD64_UNWIND SHT_X86_64_UNWIND + #define SHTORDERED #define SHT_HIPROC 0x7fffffff /* specific section header types */ #define SHT_LOUSER 0x80000000 /* reserved range for application */ From nobody Tue Feb 24 16:00:00 2026 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 4fL2VT3fbBz6SP95 for ; Tue, 24 Feb 2026 16:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL2VS7476z3jN3 for ; Tue, 24 Feb 2026 16:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771948801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CJud7bP+Tdxn4xyy+K2ev/nRrLNA63tyRiPmnlpX02Y=; b=gx3XqRE1X+eaBiyzrv+lqfybMovoupi0bhJ5If5nh72BJwWyEQQP7gfdIioXv9l9rxGAYk ODO7arP6ehJYqgsLaM68B8hJpcsZLxTwjJjSn5KJaD4xiZlZywHHDCiIcCSDvEzhBNUmyJ 9lRdFnaHMcodoC4HRcbfFj+piI1gkI0LC+/PsYgOj8J/juMwjQnHsZ5mglUt8xJTWLM47v zkSRXpRQg5RZz04iw4psbYfX2JjjCbplpzvZ3Icxysn66ys1fN+2Aa61a5Kq4cNy5mGNtK SSM5b57586ICcMRuX+00kBxcqQK1PcZune1ZweLE9xxhhLuhzXOf5O0HhdzIaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771948801; a=rsa-sha256; cv=none; b=yotrBzL9i2sHHUiFI/b8aJ2tXhkx3IFHLPUfehdA81YMAfHa54/+DoSRyeC0tNALj8JaNB lSKUJpVyU/QnD+h1RIeA96WAs2cuV2Jet5BWBisYcvk6RrXJAWdUVx4FDB53mAyqu0aVS9 hwB/ZkWLDwWZ+OjgZt8C7ti1u63UpNwm8XRA6qFP0CkJ29qV76wRTSljEbegO6w3nFQPOm lD0H+yeKAKaeBxbcBRJF5uEWm7f6/2RxG6P26xSzyrpBu+Pkn+Ndv7HXplYEMkTcwlFocU BVHkJmQvsxhX00Ga0Kw2TywfV7k87bVLJy+pbnLMsEAE91Nr+QSGtvpI7le+Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771948801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CJud7bP+Tdxn4xyy+K2ev/nRrLNA63tyRiPmnlpX02Y=; b=lbQ8AlsIkTnJrrLXQI2CVBOUYfBUe/yw1jv0PygZWRKmuA/Ax9fktB1Na5LroKMcuxUH0X UwDXrQ4K+zHHqG2e7M6K6AKPJeOS6ChgvtqFv4wrN69SugiaAoVVnb+TDO+UintUAzVXM+ Q996npLMXVLMrpXJ6FO9NxF+s2FZqjegK0iHEq0ef0ESY/SH1YnrFnVJyRUSuMkUYLUnqD rW+FMYQV9HukPa89CXJfi2na0jmekmBx4xXVFN+7B5AarmW7Yt01fBBYJmphoDRuKRNfVy +59kPhBY2DtO6Q689BO8IYr6jGrQUc60TjBqNbiK+G3grqpFo9UhkxGZjALQoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL2VS6gnlz6wZ for ; Tue, 24 Feb 2026 16:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26afa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 16:00:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f3be7df50f01 - main - rtsock: Fix stack overflow 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: f3be7df50f01d9a6ead9f27b55bb4dfd7dc4f9d2 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 16:00:00 +0000 Message-Id: <699dcb00.26afa.1fe11e3c@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f3be7df50f01d9a6ead9f27b55bb4dfd7dc4f9d2 commit f3be7df50f01d9a6ead9f27b55bb4dfd7dc4f9d2 Author: Mark Johnston AuthorDate: 2026-02-23 15:52:50 +0000 Commit: Mark Johnston CommitDate: 2026-02-24 15:58:48 +0000 rtsock: Fix stack overflow Approved by: so Security: FreeBSD-SA-26:05.route Security: CVE-2026-3038 Fixes: 92be2847e845 ("rtsock: Avoid copying uninitialized padding bytes") --- sys/net/rtsock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 774537366910..5251d4d75f15 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1875,8 +1875,8 @@ rtsock_msg_buffer(int type, struct rt_addrinfo *rtinfo, struct walkarg *w, int * #endif dlen = SA_SIZE(sa); if (cp != NULL && buflen >= dlen) { - KASSERT(dlen <= sizeof(ss), - ("%s: sockaddr size overflow", __func__)); + if (sa->sa_len > sizeof(ss)) + return (EINVAL); bzero(&ss, sizeof(ss)); bcopy(sa, &ss, sa->sa_len); sa = (struct sockaddr *)&ss; From nobody Tue Feb 24 16:49:11 2026 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 4fL3bC6V6Hz6SWPP for ; Tue, 24 Feb 2026 16:49:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL3bC5pyXz3HvH for ; Tue, 24 Feb 2026 16:49:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771951751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YO+rZhagu5meueQLP2TkCkm+ikWeK0pH7ZDGFOvXyAY=; b=Idvim92668x2xEzo8DKznYWmf1QznQG0WuHF//dWvejYNPlrA9hP+VbV907q722FtPiW8P fHXbZzwgRYon+i7BSh/Pop0+d3f/uuVs4fekpcw7yKHlsLwq0aI610jbeCxV5Qqk5VMprW SIE3LnXoI9qFALq1d+59Qx7noAXWo7qdqVoEr2PtrJLs9IqafPgFoPmSvBpAS9ChWe6j31 3BEFTd3mEUeNIRm5acg7i0+kHJV8jz8neapYMlJKgxGtdUIK48wkVhNENXBMwT6ib7TQ1D EAfrm75nVdsUb2vPPyT1oBGlAMt0739PL7uSbKgp8HpSsz62apDygUuxr9MeJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771951751; a=rsa-sha256; cv=none; b=VF6250kfE0xs7SQHB3TVdzoOI1gohmhyRo8Hz6Vmmlx8sDnMIO1AgT5RvvoagfekLDlx4v Aut/qLBElvuNKTq/D1mLvfNUdo7hCQUsvQ1GDsxLb71hZZ566C/Ljls9ijScvi9M+fl0Py f8K3QKQrKtVwIM9jgwZoOE626T/a/TppkrZTDauyQfMztiZy6pqFE+9wMDwuwq15j0UHnk 5FW43UHtPJqfxaxAKiVBkOErJocskZVmMTLPvC7QT/ypUxxRLQWV4b9lOX/+JCS93EzxRN oVqRSsJHrDUJAan0K+TW8tZqAfivMi5+OiD8DMjzBAUN8dsnmcqxxbnNiP2lng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771951751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YO+rZhagu5meueQLP2TkCkm+ikWeK0pH7ZDGFOvXyAY=; b=r95MZLwAC8GhQeqtkMhJP0kw1kF5kCV0hHcrJNnIJJH2Jr5jwnnDEWKHM964jTZk2bkqLf PFn2iPDFpOmF0vaFwCs7XkDfewixuVkfpiop4wmwUgNo56NhVJ3iZWwxd2e7zj+3Jhe1mI gK93dZmORs1WO443NQQkiEthNkG8EL1TJUUpt5jNegZFxkRTDk3I5l8DgbzKDcE6Jg44Uy 6tLRmobq5IuCaPdaKBLy52Xb1/ZFaduAbi+0RIHWQiSb4HNecH748okTouslZ0AOFZfhKI El8CvpJEwShWhIjwA2uaXWoErddo/j7PGTEUB3zI++DA64D1sLmL0zxKrzbALg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL3bC5F30z7wY for ; Tue, 24 Feb 2026 16:49:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34343 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 16:49:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 9063968e8e39 - main - Mitigate a case where TCP rack can send an extra ack. 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: 9063968e8e394b8062a855592e12607b143c1b0f Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 16:49:11 +0000 Message-Id: <699dd687.34343.32dd11f9@gitrepo.freebsd.org> The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=9063968e8e394b8062a855592e12607b143c1b0f commit 9063968e8e394b8062a855592e12607b143c1b0f Author: Randall Stewart AuthorDate: 2026-02-24 16:47:36 +0000 Commit: Randall Stewart CommitDate: 2026-02-24 16:47:36 +0000 Mitigate a case where TCP rack can send an extra ack. Rack will in theory send an extra rate limited ack when we get to a closing state (sending a FIN) so that if we have only 1 packet outstanding we might encourage the connection to close out. However it does this always which is not always wise. Change it so that it only does that if its been more than an srtt since we have had some activity i.e. a send or a receive of a packet. Reviewed by:tuexen, rscheff Differential Revision: --- sys/netinet/tcp_stacks/rack.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index f55abbf919b7..42c6757b4b2a 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -20742,8 +20742,17 @@ just_return_nolock: * The idea behind that is instead of having to have * the peer wait for the delayed-ack timer to run off * we send an ack that makes the peer send us an ack. + * + * Note we do not send anything if its been less than + * a srtt. */ - rack_send_ack_challange(rack); + uint64_t tmark; + + tmark = tcp_get_u64_usecs(&tv); + if ((tmark > rack->r_ctl.lt_timemark) && + (((tmark - rack->r_ctl.lt_timemark) / 1000) > tp->t_srtt)) { + rack_send_ack_challange(rack); + } } if (tot_len_this_send > 0) { rack->r_ctl.fsb.recwin = recwin; @@ -21143,7 +21152,7 @@ send: to.to_tsecr = tp->ts_recent; to.to_flags |= TOF_TS; if ((len == 0) && - (TCPS_HAVEESTABLISHED(tp->t_state)) && + (tp->t_state == TCPS_ESTABLISHED) && ((ms_cts - rack->r_ctl.last_rcv_tstmp_for_rtt) > RCV_PATH_RTT_MS) && (tp->snd_una == tp->snd_max) && (flags & TH_ACK) && From nobody Tue Feb 24 17:54:55 2026 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 4fL53633sxz6ShPh; Tue, 24 Feb 2026 17:54:58 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL5362bDWz3SPr; Tue, 24 Feb 2026 17:54:58 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771955698; 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=9td9AehFmPQCnja9mVQhzqlIMy8dj4HSPzS0zg+LWxY=; b=nFjBN4Ul1GfAv7ZjkMSfTWSNHHhhFNVwTaIiNM/sRIVSTKMgJ7iDvlgao2tdKcJJQnzvFN 7HlOhf76LpqoFnHsjkUexqtsTXyqhkOuaK5RRpZJpdis6lUZZM/9I7Ym/rTIdAIVe9DfzK nM8cUJPJNWPGIIti8AFj1KOUHO8Q1Nt2JYI6lMil+cIyTAC2MGmQWD6u4V5VpJtT/LkUi4 WDKTfeik6SWf9OKylOSVphtm3SJFTt1Jrt1mxH6A+MzeTLfbOlYc6nHeVjm57hMnJ3wtaQ ga5Hev5eYb4D4oG6HGvoZ5y48BlucZrjmMGjmCVwCW2KTGUwjTR81+q+gR0Gqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771955698; a=rsa-sha256; cv=none; b=UKU585/84wKePB9fw43qjpa4K7mT7+NOeaOwoCdzhvjvglxVvlN2Y2mkEAT04BwVn2LiR7 liy7Umrq+E2/py8n8WF2hXIfZfJQfwwhDdor7suGK0aflP2zicpNifIAzJpV7RHxy3I1Qa 9o87QAyEFG3KXtMQnfvlw7cG0XhWXiFLf8Zte9HdIaV5DkcIxHpHs3J/ls90OwCCdpzIl7 bQUNkScayans1LlsGuJhkfFpnwzPqnxDJt351R2hEXnIukoimRksQGW+oyx5MVII6iseGa JkAlJwpkLTZZyqH0kenZIu7DDgcJELDAshNg7wZ9fryuRC0Rs3ek/1ieoU+yCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771955698; 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=9td9AehFmPQCnja9mVQhzqlIMy8dj4HSPzS0zg+LWxY=; b=MV+8pHfDGqw0F2R/hKfKUiY4zn5JMR93xo5+wCSRT++eb8qzRHaeb3P5P9cJnPw95Fh7zO T1GrNzE1uHWDPSxJngsng5lzN2Flx27VHt7kIZv4eD3dkzx7QVEp91o5tT7zP+x8v7MlBN UWU/KOsy70NHprHVYoWaEIImytrIM19sn5Skq6LhzF8Hs3wYGPj9oUbmencDZa/7DKyeoP awZ2hqwvUdpc9cVVQGX6J+HKUzrQHqXKdR7Svn7JYASc0uJfi393afDPlzVHkNFqSGHfiT ZbufM/+bPEUN47ZsNML+jElrBY/F7yOWpKzjLRX7/eSHUC1EzaRdq2jmdUx3GA== 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 4fL5354M98ztrM; Tue, 24 Feb 2026 17:54:57 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Tue, 24 Feb 2026 09:54:55 -0800 From: Gleb Smirnoff To: "Enji Cooper (yaneurabeya)" Cc: John Baldwin , Enji Cooper , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: d1f1402dff63 - main - libnetbsd: import `__CTASSERT(..)` macros Message-ID: References: <6998e4cc.32d8e.74c069d@gitrepo.freebsd.org> <2D23AD65-FC83-486F-99BD-1C2DAF6BCE05@gmail.com> 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-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <2D23AD65-FC83-486F-99BD-1C2DAF6BCE05@gmail.com> On Sat, Feb 21, 2026 at 09:53:14AM -0800, Enji Cooper (yaneurabeya) wrote: E> > FYI, _Static_assert is not a FreeBSD-ism, it's part of C11. Our old CTASSERT is E> > a FreeBSD-ism that this extends, but really, these should be implemented in E> > terms of _Static_assert when possible. Something like: E> > E> > #if is_c11 E> > #define __CTASSERT(x) __Static_assert(x) E> > #else E> > /* all the rest */ E> > #endif E> > E> > If __CTASSERT0 is used directly anywhere, you could emulate it via something like E> > E> > #define __CTASSERT0(x, y, z) __Static_assert(x, __STRING(y) "_" __STRING(z)) E> > E> > (Note that we build all of userspace as C17 by default in 15.0 and later.) E> E> E> Hi jhb@! E> E> Excellent points. Incorporating our macros/adaptations can cause grief sometimes and I don’t want to porting more code than necessary, so I have incorporated these macros (and a few others) wholesale from NetBSD (I got these from [1]). E> E> -Enji E> E> 1. https://github.com/NetBSD/src/blob/c26cc77b3a0b26b95a2df2e0154e2b2f7292ab20/sys/sys/cdefs.h#L168-L182 I don't expect any grief if __CTASSERT() is implemented via __Static_assert(). -- Gleb Smirnoff From nobody Tue Feb 24 20:24:28 2026 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 4fL8Mk3pvwz6Sq4s for ; Tue, 24 Feb 2026 20:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL8Mj5vzSz3npX for ; Tue, 24 Feb 2026 20:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771964673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f/bgFFj7beYZ978SRnWCdpOK4GY72/xwO2YXU3tNe9s=; b=m3Q0zAEZSLQpE9eaB9HqwzlRdQzWdFYLqudhS+DvQXVd+TwuZSoWxuYXC03Ci1SHcIb3kq 4ZxxSDVWa/2PpddKQIXX+VWUkCTb9AvzAiypSNc7Xj9lHQtMRzcfxkMvCwsdYEZqx1qENi kaaibsE8L2MKc5pwwgwuXLV2DXUAqOyP6pla7z+yvghehW2VwG5L6m+Kzhpn7kfWEq8zAe XxgjSFbA+x1qq1MVNotAZKefkAfm8tI5HEt+i5UTlhLUsy2ZS81W7H7khdH91gRBXbBfeR FeE7KZb7rsq6J6uovTJjNRDHIVXuSCZJ3PWMSLpfAiLuaDTRsVDTTNEK2YuAyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771964673; a=rsa-sha256; cv=none; b=f2VUovXf92NaEPUsVmuLLevjyLeBubRqC7tfGx4Q1Rj2XmTaiwBKEecWtIy4eRSI/yd+74 s9095+6g6BWPPmK8A0BeSZVNVtumFdIlrTtku71JBbgRaAgP957sfdxGAT1CmJLLl27pAd EzV0i2A0/EV+pwgO/fa2WLwcT8RCtNmqQ8wWbDMQCburPsx1ZredkzScpurLPTl7VxsE3X l/tE012klVj/081IK9j0lKZeNqAC91GwQl0SmdkSgFOIHp56WPCCfe4/mHm/YzeFv486qQ 5olt7Li+OSCzGtoM4sbd4gpwXo19ebFcekl8FQKlXpFJ3HbnpnYF3cW47/mBTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771964673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f/bgFFj7beYZ978SRnWCdpOK4GY72/xwO2YXU3tNe9s=; b=VLGPVMcgwS+Y4jAe7M0Mw7ka5E4nbkZC/DglVCBdWh5eIO0GOHgf3VpHCn1PiE1ZvnkzTJ FkR3/NTJ6bqVe9N7MdoWPUMAViONphmiQWObKs1WWBLhbjGbT+gZw9uMhk6lEdXyMwe6y/ HFxVQcv5UR/KUAQc02eJR0NtnPPJsI4Gtc13nqdCgkWxIAcTb7ZtqhPH9b/fzFP5qpzoEi RxIQztsOg7dY/ArclBzojhRvtRRL0ZhTtIgZEC5QxgyawiHN0cbxBCY8dntKIv3E6RDgpX 7vt4EWFoTNkE0/hojWxRYXJHuUbpC1dcdXbwMSUr14L1Oxk2Fgk+c6SWFpm/iA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8Mj5L0JzWnp for ; Tue, 24 Feb 2026 20:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23d15 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:24:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5faceb84142f - main - __builtin_align_down: Cast value to __uintptr_t in the fallback 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: 5faceb84142f3c9886f38a03dd5214785ac6961f Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:24:28 +0000 Message-Id: <699e08fc.23d15.721aa131@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5faceb84142f3c9886f38a03dd5214785ac6961f commit 5faceb84142f3c9886f38a03dd5214785ac6961f Author: John Baldwin AuthorDate: 2026-02-24 20:24:17 +0000 Commit: John Baldwin CommitDate: 2026-02-24 20:24:17 +0000 __builtin_align_down: Cast value to __uintptr_t in the fallback This matches the behavior of the fallbacks for __builtin_align_up and __builtin_is_aligned. Reviewed by: arichardson, ngie, kib Differential Revision: https://reviews.freebsd.org/D55161 --- sys/sys/cdefs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index ea6a92ad0056..132d4809b0ed 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -649,7 +649,7 @@ #endif #if !__has_builtin(__builtin_align_down) #define __builtin_align_down(x, align) \ - ((__typeof__(x))((x)&(~((align)-1)))) + ((__typeof__(x))((__uintptr_t)(x)&(~((align)-1)))) #endif #define __align_up(x, y) __builtin_align_up(x, y) From nobody Tue Feb 24 20:25:59 2026 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 4fL8PS38Hzz6SqGM for ; Tue, 24 Feb 2026 20:26: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL8PS1Vfsz3pK9 for ; Tue, 24 Feb 2026 20:26:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771964764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rG3EDX0Kqzmqv3p6vjns4tKdKuXTAvQ1Jw7V7DR/t6c=; b=kv5YCZiuOYCAAvCi8/n8XLSD1t+ZTYxFiHKsnR74N91T9wb8PDziMnvHFYGrZu4T+f2CS4 OGqxaI9DrdWb59U3soJ6clO9nqOikgA04X+2TsnIBKmnADEySu5YyNuR45sL8hxIJTxMZc xIA3+W8pSO1CyEpMD4hzESoaSBFvB7rxwBcSz1fEAbgCExaqWtZCmf88c3YfPpDut/5JPf yIA+XelsAWNjE3ryI8z4JlBYojKKqr5nkuhBsAmABcc6lfTNEtdr/ycoQNHNodOhHOpxvg rRlrFfBZxhD+9Xt6zjWq1sCe2IaKpn6QPolwjcCvJQGUaCgB+U07n2Z+X6Tv4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771964764; a=rsa-sha256; cv=none; b=HSjiM9d66P3zqI+xulHk+e1wqplP2enjY/NNaGHBSXfXCYwTNc4ndKu98Swbk/eKjS/xiE Pa6ieQMH1G/Bju+wL6wQnG9MKX63ZYWOJdBD8kkMc2d3/IKBG4lHOVaGzbKOWZzMMPYdBv krUzY2sS9uWHImU6CfQvNTGHiuXLirusMNdi1eMAeUp9ATf7jQ7LK0OhMkmqPf/0JZLMM5 rYtyrNZ4l+an2FfxJuUDqMGlkZhS9cPvF/jMq6i5Es79OQTgqT28DQM0TRy4i7tl6QfOTq 1+aktm5ijQTe+ifYQkNe8/vjaA83pstL/qNvwYjh3hrykvlFwmJtrY2q10DvKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771964764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rG3EDX0Kqzmqv3p6vjns4tKdKuXTAvQ1Jw7V7DR/t6c=; b=tp/H/ikJWaKvSbcFz2HyaaqRjWh21On/Tu1pA8tr8Karf6oHj/42fRgqdscCG85okKFdwu fmoiLNZGy59ERxGRrrz2PPmnkZF+e7UMGtUbryvQHZRFcY0EDHv6chi+Xv2phf4RHmKCae upK0i7toDTFxILVQRulnWSuXG6kGoLuVgZ4YoIH4V7P/BglA00VOIEhqcG1mBWIiRJud66 7t2f5wqKPzQ44xGrcHS4khi25M1V6LaYVfNWsdUqvSc7trKa5x23B4brNgrcjpeHR2jB9k WnoexYJtTrXmqhhylVwUZPmmX6d8CwJNW3k0KjnOYQGayI2V4N6vgBNNM5UgVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8PS0pxGzX79 for ; Tue, 24 Feb 2026 20:26:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2412f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:25:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8d3f41dbcb2a - main - ccp: Don't name anonymous structure and union types 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: 8d3f41dbcb2a949b52660501d7efc6bb12850b09 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:25:59 +0000 Message-Id: <699e0957.2412f.67bd42ba@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8d3f41dbcb2a949b52660501d7efc6bb12850b09 commit 8d3f41dbcb2a949b52660501d7efc6bb12850b09 Author: John Baldwin AuthorDate: 2026-02-24 20:25:45 +0000 Commit: John Baldwin CommitDate: 2026-02-24 20:25:45 +0000 ccp: Don't name anonymous structure and union types Keep the dword labels as comments instead. Anonymous structs and unions don't have type names in C11+. Differential Revision: https://reviews.freebsd.org/D55144 --- sys/crypto/ccp/ccp_hardware.h | 10 +++++----- sys/modules/ccp/Makefile | 3 --- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/crypto/ccp/ccp_hardware.h b/sys/crypto/ccp/ccp_hardware.h index 95779491acf2..1a1063acbe13 100644 --- a/sys/crypto/ccp/ccp_hardware.h +++ b/sys/crypto/ccp/ccp_hardware.h @@ -259,7 +259,7 @@ enum ccp_passthru_byteswap { */ struct ccp_desc { - union dword0 { + union /* dword0 */ { struct { uint32_t hoc:1; /* Halt on completion */ uint32_t ioc:1; /* Intr. on completion */ @@ -382,7 +382,7 @@ struct ccp_desc { uint32_t length; uint32_t src_lo; - struct dword3 { + struct /* dword3 */ { uint32_t src_hi:16; uint32_t src_mem:2; uint32_t lsb_ctx_id:8; @@ -390,12 +390,12 @@ struct ccp_desc { uint32_t src_fixed:1; }; - union dword4 { + union /* dword4 */ { uint32_t dst_lo; /* NON-SHA */ uint32_t sha_len_lo; /* SHA */ }; - union dword5 { + union /* dword5 */ { struct { uint32_t dst_hi:16; uint32_t dst_mem:2; @@ -407,7 +407,7 @@ struct ccp_desc { uint32_t key_lo; - struct dword7 { + struct /* dword7 */ { uint32_t key_hi:16; uint32_t key_mem:2; uint32_t reserved_5:14; diff --git a/sys/modules/ccp/Makefile b/sys/modules/ccp/Makefile index d268f0b58a91..9ab5f524b35c 100644 --- a/sys/modules/ccp/Makefile +++ b/sys/modules/ccp/Makefile @@ -10,9 +10,6 @@ SRCS+= device_if.h SRCS+= cryptodev_if.h SRCS+= pci_if.h -CFLAGS+= -fms-extensions -CFLAGS.clang+= -Wno-microsoft-anon-tag - MFILES= kern/bus_if.m kern/device_if.m opencrypto/cryptodev_if.m \ dev/pci/pci_if.m From nobody Tue Feb 24 20:33:25 2026 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 4fL8Yx5lGTz6SrMT for ; Tue, 24 Feb 2026 20:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL8Yx2srSz3qBF for ; Tue, 24 Feb 2026 20:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+QogX0OQaCqyZwcREcENjK64XJ9q1ZsXCfWB2B8buo=; b=bzsERMw0Vkz7Yy8qsO82P/aHuvW8AV33tKDWGjpqspp77VbOb7/plkI7pH25sHN39Xka0B ko7d2j906ilYvSM5ifS+Wm3NYTIaO/7fr1HNtlZYFOMJd0swghPbV62uwsLn5bgvxDAD6v 8a6do3swN6wjvK2Q+VTp+Ts3wxnoR3s8wAc28veE46HMpBtNzgAr+mwb7goS8tzy/KGIcV Ws9mE5c6SlJ6RkXsXqxTXiy3uJZZqsYEkXefU6QaLjO+MOZGqoS4tPtRUWiMfwIaBYDROa e92tBcsrG0f2luZ8ULFM9d44dWjlfsWCJna8Sa0lepebC+0gOxwo596d8A2gqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771965205; a=rsa-sha256; cv=none; b=NDfHEka3Nq/x2zi/8u1a4hCgALxZG2e+rXgQrnSxElT8AAPYmj4aSJ4CjLPsKVZaZI9Vo8 hCwZUnfpykfHs7SE+Xe+WeXVqMKqjp1+XFYY6nUg2MxR53y7peWAz8fe+RXPHjLjvhycCY eFI7TLjxrkfLhzw2UlkLjNbQO/fxUQswcZa8+SbScrhZuWwNAi8gyXNa0CspKupGurrq0T EjVU4YvHeeLY32oUjmq52pDFU+KY7xDMwXBBOJXnULXv7C9nmVtCrxOmrEXu0EkopKmt80 k1boyReM9SYSTMxStNplK9LmyqlVwQ5DGVreP2M88vHER7mtDA8+Jdu8OULV1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+QogX0OQaCqyZwcREcENjK64XJ9q1ZsXCfWB2B8buo=; b=uZw993s2cukHdU9GvAdxdkpUgSDX/QZq20/+m8SK8owk3F5zTLGYcA3xplU5Lxj2ixWnX1 0Yi+QhPocyf2hhMnI/pXN1C/DJFTFOanfgv9S6opwenbOBQt/i4y6uViQgboEOHmH2hEfT zGibgjl3m17iBw3ftSdMOFxzoqVCSE1EUXjGRlEf4xMujCDN2vhy9z2QuA5b5WwlqXSUmB z19r5ogELn3RnGR6MgGW0ZPXQT2TL83m8CVx5caZEC49URLZlHrIGyVayYUIkqLk43wrs/ IoEFosOHJecWcdX9PPeNprLHQo5GlWsuMyH6dQDFt59lmjHMx/+OJRLC+XH4Ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8Yx2R1BzXP4 for ; Tue, 24 Feb 2026 20:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24ce3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:33:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 82b293ea6987 - main - sdiob: Forward-declare struct sdio_func 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: 82b293ea6987ebcadf1142acd2218f50ab5e3fc8 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:33:25 +0000 Message-Id: <699e0b15.24ce3.15a2d099@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=82b293ea6987ebcadf1142acd2218f50ab5e3fc8 commit 82b293ea6987ebcadf1142acd2218f50ab5e3fc8 Author: John Baldwin AuthorDate: 2026-02-24 20:26:55 +0000 Commit: John Baldwin CommitDate: 2026-02-24 20:26:55 +0000 sdiob: Forward-declare struct sdio_func Currently this happens as a side effect of the return type of sdio_get_function() in the expansion of __BUS_ACCESSOR, but this is fragile and can break if __BUS_ACCESSOR changes to define other functions first. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55351 --- sys/dev/sdio/sdiob.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/sdio/sdiob.h b/sys/dev/sdio/sdiob.h index f356cca42588..3875ced43731 100644 --- a/sys/dev/sdio/sdiob.h +++ b/sys/dev/sdio/sdiob.h @@ -73,6 +73,8 @@ enum sdiob_dev_enum { SDIOB_IVAR_DRVDATA, }; +struct sdio_func; + #define SDIOB_ACCESSOR(var, ivar, type) \ __BUS_ACCESSOR(sdio, var, SDIOB, ivar, type) From nobody Tue Feb 24 20:33:26 2026 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 4fL8Yy6Cm9z6SrPb for ; Tue, 24 Feb 2026 20:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL8Yy3pCkz3qRJ for ; Tue, 24 Feb 2026 20:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EEQzk4SZBLM/m9J3m0M6kfPzd3SYii5+yFy2V2Py3ZA=; b=ogUbMaEJX/cA/zc5siewnAq3a2MODG8u4WxX6b5DyR8bFwSykt8LLarvpORBMRO9qIL7Hg gkD2o4o3a8q8lRf+38LHm82B51+n6liTVEn4bN+V8MDefD5g2MRRIberEKbVmsZZ5wv6Su ygapIIHKSqE53giT570ouDEFG7acvXm7oUEBFZKzcO92xbAyML98RiTtwLI1JM8mDH2VHU 0pFXEVf+ivHk/2E2h/L101I9flXeZTwz1ZR1gMs14CTg9WHXeN874u6RYyQqvLECiHTjBO nyD8V2ftUm7pQPiTzxqmA7lZNUXrOXArEczL5ev7+A90s1L+0BwWDFrafR3k9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771965206; a=rsa-sha256; cv=none; b=ij4dy5dKu2kOz0KninHFzAgU8H6HiWYcQtLyoqYhjDfo8IGsPtzXR7LmjnmUPfGAUo8pE8 1gENBVQOWkMyuAl9CH17k4FqZw/TWev0Fd/8l/9csCzKUss8yYJLz0YulO7ATVo/jiO4h3 dpI6SGLmwUqq7T8GWI5VD4fkRSSgTWNfYJc3a4JQbnlh7r6DWqPOe94D1sjbhtrT8YTF5y 9c/TtXD44THKuGWf5Dwe/fSCkdUvKa9Tg4gdSz7XkMZ3JV4GZbz8yEnvIbppq+dFDvOqiK Uo6oy32/AIsr0kxH93oVO/5bOrYagCoeYa0+hd/cRLSfx+ARdrhPxauOhPqNhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EEQzk4SZBLM/m9J3m0M6kfPzd3SYii5+yFy2V2Py3ZA=; b=fJ5VhJZebpvMJnn2569oHQEJSLZUZTj8cwjuHpgWy+HxK62MbXrwhqzEzqA0fmh5x2PKFr YHh6mYVTRCFZpL74/DgcZHQ3sLz7gQ+xGDthEJnviW1m7Cyfi/wDMecRGEeUYYaaX4wxMZ px/x16on74eDIm6TjPdH5IL/VPFW41Rw4u5tTfG/f9f8sjf5LEg1U8j7NIzOUlQVQajf3Z NN9mgpDIMCooU2ZY8R1KmhUs7eGsQDLMuRzzeZGsBrL+mB3Z0WTBFR1NYoz90fSctVXV4m TtJFIaLWflLOjamdZjDVJp9/xP2fVEY1HCyCxO2h7MotNrU9iruZvEbaCOh9lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8Yy3DMxzXM7 for ; Tue, 24 Feb 2026 20:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23f75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:33:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: cb5a0eb05310 - main - bus: Add a new IVAR accessor to check for the existence of an IVAR 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: cb5a0eb05310d06e9853a01a542be55b9adee038 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:33:26 +0000 Message-Id: <699e0b16.23f75.68e9cd60@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cb5a0eb05310d06e9853a01a542be55b9adee038 commit cb5a0eb05310d06e9853a01a542be55b9adee038 Author: John Baldwin AuthorDate: 2026-02-24 20:28:28 +0000 Commit: John Baldwin CommitDate: 2026-02-24 20:28:28 +0000 bus: Add a new IVAR accessor to check for the existence of an IVAR _has_ returns true if the given IVAR can be read. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55352 --- sys/sys/bus.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index d90e2a81f054..0d1baaafb4cd 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -945,6 +945,17 @@ DECLARE_MODULE(_name##_##busname, _name##_##busname##_mod, \ */ #define __BUS_ACCESSOR(varp, var, ivarp, ivar, type) \ \ +static __inline bool \ +varp ## _has_ ## var(device_t dev) \ +{ \ + uintptr_t v = 0; \ + int e; \ + \ + e = BUS_READ_IVAR(device_get_parent(dev), dev, \ + ivarp ## _IVAR_ ## ivar, &v); \ + return (e == 0); \ +} \ + \ static __inline type \ varp ## _get_ ## var(device_t dev) \ { \ From nobody Tue Feb 24 20:33:27 2026 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 4fL8Yz5TLZz6SrV0 for ; Tue, 24 Feb 2026 20:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL8Yz4N3yz3qRP for ; Tue, 24 Feb 2026 20:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+136S8HjmJy7VKSskPCY23TPBnI7Zoy0murx2qfMgNU=; b=pVqTlFx4m/lKF+InTd3VE94O6ptUuEaDRv0vWthGGFCXuhGflYzIIcDfStyRBQLxwjb4jr 3ERfQO/QAGq14j2IUZhQy67JhymSKyx7kJBUVF9OacwIndLqPy1Vrq8Vrr3fTz/UaHrXAM y2edUHXY18hiyBfGGoGRR+FIcsmfqGuABMRYSwvQNhMrh7zOZckVbj5OMi+Wq/tm5uixkM zyg+ILRKAvY2sMY8j+3A5vOEtqVZKp2qe/Rtlz++VsdVPy7HCanzZ7sv4x7wevNTfHrD6Y EoxArd2wkrJo4pHyi0I0E7mICibdOXvpZO2zZQ9YbjOr7xUXgOW30dTXqwQ4EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771965207; a=rsa-sha256; cv=none; b=hzzil3BwINM1g52kKzl7ouxncPmvAu6hYx/+pZwyrWOaTYcjmuFZ2a4/TeoWc3QI5rJ7Ju Bguif3SvgUWyOSoOFB3+G/AyF6IeGKClUnktBld/o7UXOxDRxzWjFcUO1qi+qtX6u2+onu qimPh1rPWnCuBgBOgFaWKfg3B8JRYdVE3DHsLi0TzRrqV6gq7rQgCFgrvdYuw7kKSduxOO PK6qJmKTVPH2pXvzMylMckElfyLwzUJ4x10apM59wGpsFJe9WUgB0ZJwC6N1hc499EfKZe puQUOA2KPuyKqcrueIDr5Gf9NK9NORhPG0ig0MSjGS0vM/HI2VIOlzPZq2LXuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+136S8HjmJy7VKSskPCY23TPBnI7Zoy0murx2qfMgNU=; b=wuE1c60DgkwcYLMJWsLge7Qj0PGm09EkC//vwZYGEWTdH3biqRub1B3Pxj1/YmvxxRnvyI eouuP7W3oSpAvxNXIRjfF5bjQMHpytdBnSyr7sF728E1/Plmk3WqirTpQMj29k6zng17fl tdK5yb1AEaQBFQSDwA+lrU7zxdA5G/oqkEL9iXC+RK5n0T+tWu7hN2m5HCRlUVxq8NSDf5 bFpXpT8xG60J8NlYyl8c6du4NLZd54tDCl5e12A7x5ejQvik2qJlUatDai87AS2uBJzU/l owYnQZNC130dDcWwvKzVoAv0JZUxiWwsQxa5JwKzt4xjuYkztJ6/UzhAc0ShDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8Yz3z9gzWpG for ; Tue, 24 Feb 2026 20:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22878 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:33:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b937f9bf7509 - main - bus: Add __BUS_ACCESSOR_DEFAULT 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: b937f9bf750907602606691dd92fb6d70e9f88da Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:33:27 +0000 Message-Id: <699e0b17.22878.7d05cc3d@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b937f9bf750907602606691dd92fb6d70e9f88da commit b937f9bf750907602606691dd92fb6d70e9f88da Author: John Baldwin AuthorDate: 2026-02-24 20:29:40 +0000 Commit: John Baldwin CommitDate: 2026-02-24 20:29:40 +0000 bus: Add __BUS_ACCESSOR_DEFAULT This macro is similar to __BUS_ACCESSOR in that it creates three helper routines for an ivar, but the "get" wrapper returns a default value if BUS_READ_IVAR does not return a value. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55353 --- sys/sys/bus.h | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 0d1baaafb4cd..a2e315bb9dee 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -943,7 +943,7 @@ DECLARE_MODULE(_name##_##busname, _name##_##busname##_mod, \ /** * Generic ivar accessor generation macros for bus drivers */ -#define __BUS_ACCESSOR(varp, var, ivarp, ivar, type) \ +#define __BUS_ACCESSOR_COMMON(varp, var, ivarp, ivar, type) \ \ static __inline bool \ varp ## _has_ ## var(device_t dev) \ @@ -956,29 +956,47 @@ varp ## _has_ ## var(device_t dev) \ return (e == 0); \ } \ \ +static __inline void \ +varp ## _set_ ## var(device_t dev, type t) \ +{ \ + uintptr_t v = (uintptr_t) t; \ + int e __diagused; \ + e = BUS_WRITE_IVAR(device_get_parent(dev), dev, \ + ivarp ## _IVAR_ ## ivar, v); \ + KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \ + __func__, device_get_nameunit(dev), \ + device_get_nameunit(device_get_parent(dev)), e)); \ +} + +#define __BUS_ACCESSOR(varp, var, ivarp, ivar, type) \ + __BUS_ACCESSOR_COMMON(varp, var, ivarp, ivar, type) \ + \ static __inline type \ varp ## _get_ ## var(device_t dev) \ { \ uintptr_t v = 0; \ int e __diagused; \ + \ e = BUS_READ_IVAR(device_get_parent(dev), dev, \ ivarp ## _IVAR_ ## ivar, &v); \ KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \ __func__, device_get_nameunit(dev), \ device_get_nameunit(device_get_parent(dev)), e)); \ return ((type) v); \ -} \ +} + +#define __BUS_ACCESSOR_DEFAULT(varp, var, ivarp, ivar, type, default) \ + __BUS_ACCESSOR_COMMON(varp, var, ivarp, ivar, type) \ \ -static __inline void \ -varp ## _set_ ## var(device_t dev, type t) \ +static __inline type \ +varp ## _get_ ## var(device_t dev) \ { \ - uintptr_t v = (uintptr_t) t; \ - int e __diagused; \ - e = BUS_WRITE_IVAR(device_get_parent(dev), dev, \ - ivarp ## _IVAR_ ## ivar, v); \ - KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \ - __func__, device_get_nameunit(dev), \ - device_get_nameunit(device_get_parent(dev)), e)); \ + uintptr_t v = 0; \ + int e; \ + \ + e = BUS_READ_IVAR(device_get_parent(dev), dev, \ + ivarp ## _IVAR_ ## ivar, &v); \ + return (e == 0 ? (type) v : (default)); \ } struct device_location_cache; From nobody Tue Feb 24 20:33:28 2026 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 4fL8Z11Tfwz6SrPm for ; Tue, 24 Feb 2026 20:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL8Z052DHz3qkB for ; Tue, 24 Feb 2026 20:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Q2ZbYVOw7tK3fZP09d5cyuFTb1S397dak49XxNqJSE=; b=TTkNlUdkqA74/5OwC/rLO01HVGGHKn7UmLfhjjYHIBJLntQHK8FASA/rpGRBoGnOFkEae6 kkcPvOA6h+w1/ObdAWU1nXcwWkrDTffmmBRIyzW/nQSZYzvgKswQyvYDq4ve3Jmdd4PfMN a62jpPMotqafHEmTuk+uaKseDof4gS7vEdUtx+/PKFhzZPi7Tyb0XLES50n0YH9f3wQQum ait+CY1pg7fBd4dniV7mkVWjqBPb9NpYtdbuojp+l2TEQ+j5S7qsMpo+6KtGspBAJsfMgs LMKP3CidzjLCBUqk4P4q8vVqGfYM+zU1dnEdbdeLWXCxZmmqKMTraBL1+YW1nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771965208; a=rsa-sha256; cv=none; b=YGcPU3oCUsH5isN+e8DOOwAb5PCyXsE+BV1q3FMJt1hIoAmXVU8TRudJLzUJ10yqlWk9hI tlaLPJlw0trFMGQ2ckeVwD4PCo94qccf9St5QDkBgzle2bdQPkjJHfrUcDYpTGgSAqkbQs L9XbbS18UQ0uldsTu/zcXxx7mR5/q9QF1d2hdVtg2fH6MR7g3u4Fz9wiIDKtbq0c709Q7x b4VBj7779fFlJgSllI4QkAgopthgwXBDCmRVx9DeEzZSbYPW5PCKnGrbQswIo9GdI7Nlyb qQxULgr+byKWDKlnlq+XoqK26IyFdgYd1JLnXrh8CZ0M2M81o0p+4/joGDQnKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Q2ZbYVOw7tK3fZP09d5cyuFTb1S397dak49XxNqJSE=; b=H8VR9khgDJ5h2Bh5M2UPVo/rPuJGU7pxXuw9PuNAyA8ZFEiLG7kzSLGqockka9hGtG8qSr POHHd1/DB3wUJvp7wOY5v3BOTVQcTJOn+n0YgjyUy4nHrHC+sRbZnZU9W4Xv2vSXnV24hK R2mfUApEfFCEiXdAWXVUZKvCcz2mFxx4sfDAVSLpbWo4jUy8gAxIYPX2DuldiWFSZ/BOHa R2acxIFOLNBB+6Gc0tDgiI2wQxqQByDGP3GHHfOjtjIwztpxdkJteJg/wiZcYdgx/sBJti c5S72XjMFtG5JSt3AFmeY4X3aMYQa/3e/KLSSGXvuRQqkDfnAS/IgCNpu9Z75g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8Z04M7bzXMC for ; Tue, 24 Feb 2026 20:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22961 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:33:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0bb867e9f565 - main - acpi: Split ACPI IVARs into global and private sets 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: 0bb867e9f56500e30948ea7c440dd1166097df7f Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:33:28 +0000 Message-Id: <699e0b18.22961.3b3524d9@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0bb867e9f56500e30948ea7c440dd1166097df7f commit 0bb867e9f56500e30948ea7c440dd1166097df7f Author: John Baldwin AuthorDate: 2026-02-24 20:30:06 +0000 Commit: John Baldwin CommitDate: 2026-02-24 20:30:06 +0000 acpi: Split ACPI IVARs into global and private sets ACPI_IVAR_HANDLE is the only true "global" IVAR that can be used across multiple bus drivers. The other IVARs are private to direct children of acpi0. However, they need to be numbered after ISA IVARs as ACPI mimics an ISA bus device. To ensure this remains true, add an ISA_IVAR_LAST to use in assert that the private ACPI IVARs do not overlap with ISA IVARs. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55354 --- sys/dev/acpica/acpi.c | 3 +++ sys/dev/acpica/acpivar.h | 6 +++--- sys/isa/isavar.h | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index f903f265f9fa..3a664523c27e 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -1154,6 +1154,9 @@ acpi_child_deleted(device_t dev, device_t child) free(dinfo, M_ACPIDEV); } +_Static_assert(ACPI_IVAR_PRIVATE >= ISA_IVAR_LAST, + "ACPI private IVARs overlap with ISA IVARs"); + /* * Handle per-device ivars */ diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index d1d55d2b7e5f..336f6ed1dc94 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -278,10 +278,10 @@ extern int acpi_override_isa_irq_polarity; * attach to ACPI. */ enum { - ACPI_IVAR_HANDLE = BUS_IVARS_ACPI, - ACPI_IVAR_PRIVATE, + ACPI_IVAR_PRIVATE = 20, ACPI_IVAR_FLAGS, - ACPI_IVAR_DOMAIN + ACPI_IVAR_DOMAIN, + ACPI_IVAR_HANDLE = BUS_IVARS_ACPI }; /* diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h index f0b880de2930..39eb7c2bc76c 100644 --- a/sys/isa/isavar.h +++ b/sys/isa/isavar.h @@ -128,7 +128,8 @@ enum isa_device_ivars { ISA_IVAR_CONFIGATTR, ISA_IVAR_PNP_CSN, ISA_IVAR_PNP_LDN, - ISA_IVAR_PNPBIOS_HANDLE + ISA_IVAR_PNPBIOS_HANDLE, + ISA_IVAR_LAST }; /* From nobody Tue Feb 24 20:33:29 2026 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 4fL8Z221ypz6SrMp for ; Tue, 24 Feb 2026 20:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL8Z15v7dz3qb1 for ; Tue, 24 Feb 2026 20:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j06MmnWpoPbAQeTmgcdaUCCMJoA0pexlN378S6MRIZA=; b=Aa+xcqfG6Y5b0/vWO/tPRTxJf0d/u4qS9ekAm2Zriun57Ph5rCCAJMwD94s5ED4hFI1iCo P0ghFz3pT2W5/XJPBeGIZ/hLoI7A+4QRets+gM9MCO/BB/o3nj+LewsrlB+BZFIvvSSAqG /63lv1qUQNmEDTwbJct+nq/VznqqhorxStlqEouFOUIPEOMHtCm/An5ilQgdAsTy4QwcAJ VPT3SJK7hvAHEOIhetMp0G19QPmNQPz9HgHN0UbEbBua6YKQtVqGQkF+F7klIJm+z8oJIw H8L6GAtjzPZUBXQH9Lq3eHd3tlanx8aSCKDrQuKoG1zSCSTSM/o22PjGcukdlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771965209; a=rsa-sha256; cv=none; b=AwMHAKxXXZ/1IpYt0Edb2M/PlqUkeH3n96y2lb3r+tIeJarJLVk77rZBV0iHOJzVFUu38T 2/zOwtV84IsV5dv2b6xUQp8mNe7jFldGnChQQAdI08fMq7sELvO/WxZzaiLy3L0PhBLKQp pzxVzUtj1ft3J61mCTUQNAWv9TBkdDBO+Vce5jW5GPoe3E0vjXbn0bxOaAdOdykUWKoV62 GZ/BWcG9tFsl/owuEnbGkR/AstFoWMKMqchuInOOnKlBq4BcQEnzOfliexK0d7cdoT/Yke 5YzNrKSNI5LW5ZFKMEXyEdK2AS7YUqI50AhumlMQMs49o72HnVA4/p/Ly5jAIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j06MmnWpoPbAQeTmgcdaUCCMJoA0pexlN378S6MRIZA=; b=nl7lwQlmbB6rXMqqCEUjmT0ycPbVYSYzHF6TMiWuPKpMe8/XYavQPldW32/PZ+SzylETrb 8Mo6YY2mpMuCy60hJZosAshi8t8epwvViFb3PMs9AcVcGDUaEnaM2d50UTRbiZqtsaFDon Omcg4y7VqsMOPTPyIcYuZgOyRJ4rw5MwduzTLECnmUU1FzFaTF9dd7h/05Ffjc/cWcJzjR fq1okxGz1rVU1xVkS0HyASUv73e2ZFj3LsJrTh+KwNB/7A/CiKbMHvGgw+V4cloWLS/cD4 dqr5o9MMLnd/xzQim+z1DanXBlf+YI8Vec0nhoce/6Qmo09FWAWXxWgOg8+xhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8Z1594JzXMD for ; Tue, 24 Feb 2026 20:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 239d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:33:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 591127bd4839 - main - acpi: Use __BUS_ACCESSOR_DEFAULT and __BUS_ACCESSOR for IVARs 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: 591127bd4839d00fc218d74096ca07088ad30703 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:33:29 +0000 Message-Id: <699e0b19.239d6.2a99f979@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=591127bd4839d00fc218d74096ca07088ad30703 commit 591127bd4839d00fc218d74096ca07088ad30703 Author: John Baldwin AuthorDate: 2026-02-24 20:30:36 +0000 Commit: John Baldwin CommitDate: 2026-02-24 20:30:36 +0000 acpi: Use __BUS_ACCESSOR_DEFAULT and __BUS_ACCESSOR for IVARs - Use __BUS_ACCESSOR_DEFAULT for the global handle IVAR to preserve existing behavior for acpi_get_handle. - Use __BUS_ACCESSOR for the private ACPI IVARs as these are only used with direct children of acpi0. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55355 --- sys/dev/acpica/acpivar.h | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 336f6ed1dc94..aa8d5bd0971f 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -289,31 +289,10 @@ enum { */ #define ACPI_DEV_DOMAIN_UNKNOWN (-1) -/* - * Accessor functions for our ivars. Default value for BUS_READ_IVAR is - * (type) 0. The accessor functions don't check return values. - */ -#define __ACPI_BUS_ACCESSOR(varp, var, ivarp, ivar, type) \ - \ -static __inline type varp ## _get_ ## var(device_t dev) \ -{ \ - uintptr_t v = 0; \ - BUS_READ_IVAR(device_get_parent(dev), dev, \ - ivarp ## _IVAR_ ## ivar, &v); \ - return ((type) v); \ -} \ - \ -static __inline void varp ## _set_ ## var(device_t dev, type t) \ -{ \ - uintptr_t v = (uintptr_t) t; \ - BUS_WRITE_IVAR(device_get_parent(dev), dev, \ - ivarp ## _IVAR_ ## ivar, v); \ -} - -__ACPI_BUS_ACCESSOR(acpi, handle, ACPI, HANDLE, ACPI_HANDLE) -__ACPI_BUS_ACCESSOR(acpi, private, ACPI, PRIVATE, void *) -__ACPI_BUS_ACCESSOR(acpi, flags, ACPI, FLAGS, int) -__ACPI_BUS_ACCESSOR(acpi, domain, ACPI, DOMAIN, int) +__BUS_ACCESSOR_DEFAULT(acpi, handle, ACPI, HANDLE, ACPI_HANDLE, NULL) +__BUS_ACCESSOR(acpi, private, ACPI, PRIVATE, void *) +__BUS_ACCESSOR(acpi, flags, ACPI, FLAGS, int) +__BUS_ACCESSOR(acpi, domain, ACPI, DOMAIN, int) void acpi_fake_objhandler(ACPI_HANDLE h, void *data); static __inline device_t From nobody Tue Feb 24 20:45:42 2026 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 4fL8r66yS7z6StLR for ; Tue, 24 Feb 2026 20:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL8r66GPwz3tfQ for ; Tue, 24 Feb 2026 20:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PDacF/p6ezyiERG6v9TJKmDTqrDXvHnMmg+0vIZDY0o=; b=LNQ1+XRuelvZ1/EB/h/RFOL2otbytORgKGRMzlGyS5wF/PuflzE3svl5GIMzpT+mlV0TgM yYNtL9Crn5rzdMe9zamiAvHA8Bqjc/3d4EvC4algxSt006geI+7je9ZjxGft0AVDsrZXI+ VRJQYOuaV5uHHn9OoBYZZ4LXcZP4w99zXZL86gTZ6ZG3ECGvFPiwBUEgIBy4rLNzt/Ns/V ZqCBRzgmX7KNu7U2HvWOswRrrjLVqExaqVp/zVb8BrBiaAA/6DmSF6B2mGGH/r31LbFShW Fx1pFDk8bYl7PCjCpWzgJLFlilWggEK8z1MNDPkqk7XRF1pjpuok4Qeu1VqyBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771965942; a=rsa-sha256; cv=none; b=Nms57wuei+Dow6R7Ri/ADplUQV5zKa0UZ02VK7nIwtOppLm7xLtrqhC9lnmtIKSIDHEzns ikX2NKqy2BdIyiGDEOnjZyVDbtx3s7sTdZDqtj30X9KYM9wxBbyvlG0atN5D05L30lZ9YI 92cf5Meh3cSvchzWFPaK+7ziOLjyRang5WXv96X05U2BFzVTJnCPQ+GmE9ewtobNhAz+kd VjB/Uo6MCHb4jtUbtwwUVzQGMz4lbBZngKWZPLfJyuN57fNn6dbInh6du5qYRFYz7EXHJI b89biLbAdglYIcr4FoevfNU87OmW4pcYLgSVXDs3Y5pkCZGLUIBEsNVOybs13Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PDacF/p6ezyiERG6v9TJKmDTqrDXvHnMmg+0vIZDY0o=; b=gtfZgrjlpdib/FJD5KDa5GryNzCPFRvyvD19L7yDSlEbjwE+oigVcRDZVaqLRmOmBv8Gzz gcvrJW16cclaBUzfGl2B26KVTG0838T4AByRxRmrcIgtKaxgDz7cndH8p+b+vdCkLG2Fyt hc4cQ0nkaOVQc72ruV5X4KS8Fac34uLLYTnwJpUdxdGe3fHWTd2j/QHCWDLTXuIjvzXRxB 0DQzSVqYqsemzF7eBRJSzXDTYc9d27VPCG8pPxnVEcnZdgc0W7Q/rrksEY5fRHDdz4BXgX egyxKJbCfFDlW+hQxTdaWnshZ8/n7OeK9urjsfy21Hn1AthCZFFUc+EJKjPhmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8r65bhpzXnT for ; Tue, 24 Feb 2026 20:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23cd1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:45:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 0c075db78a98 - main - tools/build/stddef.h: fix stock clang/gcc headers 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c075db78a98de8e3a255597d045bcd24ba27be7 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:45:42 +0000 Message-Id: <699e0df6.23cd1.cb2856a@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=0c075db78a98de8e3a255597d045bcd24ba27be7 commit 0c075db78a98de8e3a255597d045bcd24ba27be7 Author: Ahmad Khalifa AuthorDate: 2026-02-24 20:11:12 +0000 Commit: Ahmad Khalifa CommitDate: 2026-02-24 20:42:21 +0000 tools/build/stddef.h: fix stock clang/gcc headers Both clang and gcc's stddef.h are designed to be included multiple times with different combinations of __need_* macros defined (e.g __need_size_t). Remove the #pragma once to accommodate this, ptraddr_t is guarded by _PTRADDR_T_DECLARED anyways. Also use __SIZE_TYPE__ instead of size_t since it's not guaranteed to be defined. Reviewed by: brooks, imp, kib Differential Revision: https://reviews.freebsd.org/D55453 --- tools/build/stddef.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/build/stddef.h b/tools/build/stddef.h index 77348dd57149..ca6d481a9d29 100644 --- a/tools/build/stddef.h +++ b/tools/build/stddef.h @@ -36,14 +36,24 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#pragma once + +/* + * The header guard is left out on purpose here. Both clang and gcc's + * stddef.h are designed to be included multiple times with different + * combinations of __need_* macros defined (e.g __need_size_t). + */ + #include_next #ifndef _PTRADDR_T_DECLARED #ifdef __PTRADDR_TYPE__ typedef __PTRADDR_TYPE__ ptraddr_t; #else -typedef size_t ptraddr_t; +/* + * If anything other than __need_size_t is defined (see above), we won't + * have size_t. Use __SIZE_TYPE__ instead. + */ +typedef __SIZE_TYPE__ ptraddr_t; #endif #define _PTRADDR_T_DECLARED #endif From nobody Tue Feb 24 20:45:43 2026 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 4fL8r811rLz6StbC for ; Tue, 24 Feb 2026 20:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL8r805bFz3tcb for ; Tue, 24 Feb 2026 20:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5axBAcGO/0uwOWFyK4flh5KkJw3Yfpk+BO0kQZ+UXao=; b=EbS5vfc2btsd1HCvKyVBmdp7OsuAIzBoygDKYI1zKyjeXLz6EXdRouxQIh/NHq+lEqE8jS 6eCb6dldJD5weoKBMhkchyu1qZKBeCi9CqeQt5uqX8Pm2RrXJWV5Ize1G6WP20Ew3oOdmh /I/FSC3h/df/QasgbZde7zB3TqiGppt03Ei2Dl7frMiATqmBpq91+FuUqkV4yo/qmx7o2H /rwjsPUYJorVNxkDgBKHPgwX0BptD+GzrMekz/uKcDqrfzwbLdWS39rSrGvUNVodTtxFlw QnHvahagtZ8tNhahBaS0HidbQHFOLGL1WJtpddcCLbhGDdlbe2Jnk/1VoqY1vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771965944; a=rsa-sha256; cv=none; b=yKfBDGjYyZLIse1ET540Z/eK+up1Om05rR4wGdNY8Bvgpe3rmkKzYGjlQODyJdNekMfk3i LLVVC5XawPvnSgHJob9Fuk5T+nXOHUXXlC4azPnrIQkNKo3VPUoSAFRDuBeaycAbrwICft W+jTZa1LtnFaRpuvy6H5iMXwSX7PdWzDHnt4PWHytXXbcSudqFVE+ZRO9jMsPl5RUS4bua IZXmI1zA8oKNrzCefDlVaUXopBa/dr5g4QIcb/UjemNnpbejV7vKlK05dfSS6QzxUVtK1Q SZNs6ZVkuA6wRkYpVcOWvzmEPEL4eik2T5qqkjArab74lb3/XWGT/ySIMb5CQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5axBAcGO/0uwOWFyK4flh5KkJw3Yfpk+BO0kQZ+UXao=; b=R3ynMpdARZsUNf1H+zqJ8ChHizR57ik8ZpZRScTgLqa90P2TwK0gNAtsLos/rduC5CVf7G uAxz96J7lacFVA9NSCgWXEyfV2kxxRWoqCZrJhmd0JKQK+vyLTF45+P3r7OzYu+SkCl49M GD/nIqk2ynFoYDgeMJdH7WTCGdqgiPg+f6NmNzbNQiPod9Zbg1buhRPOR59qgOphw0lzxG 9NS9TEnh8JO7Hy7VV0+Cr+a6pLvJeYBoIlQZtlX7+pL68Qj1KC5NdU7oaj4DjSMX+qdXg1 Fi1J+aRZ+ThP35KeIzNe49nw78yDFdKfTZJC466ESqzxc5Mdzhmz8EPagEcrdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8r76QfWzXYn for ; Tue, 24 Feb 2026 20:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24af8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:45:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: fac9ae3db4e6 - main - efibootmgr.8: capitalize examples section header 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fac9ae3db4e6a28dfd467369e262f636e10a3b01 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:45:43 +0000 Message-Id: <699e0df7.24af8.323a997b@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=fac9ae3db4e6a28dfd467369e262f636e10a3b01 commit fac9ae3db4e6a28dfd467369e262f636e10a3b01 Author: Ahmad Khalifa AuthorDate: 2026-02-24 20:11:26 +0000 Commit: Ahmad Khalifa CommitDate: 2026-02-24 20:42:21 +0000 efibootmgr.8: capitalize examples section header MFC after: 3 days --- usr.sbin/efibootmgr/efibootmgr.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/efibootmgr/efibootmgr.8 b/usr.sbin/efibootmgr/efibootmgr.8 index ca4e87a30ef8..e5054023e40c 100644 --- a/usr.sbin/efibootmgr/efibootmgr.8 +++ b/usr.sbin/efibootmgr/efibootmgr.8 @@ -202,7 +202,7 @@ Displays the UEFI device path of .It Fl v -verbose Display the device path of boot entries in the output. .El -.Sh Examples +.Sh EXAMPLES To display the current .Cm Boot related variables in the system: From nobody Tue Feb 24 20:45:44 2026 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 4fL8r91PlKz6StN6 for ; Tue, 24 Feb 2026 20:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL8r90TXzz3tfW for ; Tue, 24 Feb 2026 20:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJ8LF8Ve7w4B5wu6rr/xII/T5pTJPqJ91DJfW/T3sLo=; b=cZlFFxWfoYwfdR/D2spD6jEHEpkm7hTai4Y6YtX75DS5/hEuuc6kO+wdupH+fp/VBDG3aF CfVj7F6nModt/Eggw2jeZbqQLItZZE+TGFqCs6mt+VJzVoefv7ZEDksSkJyZ3f/cyWL9d5 qUjNUzYjg8WrP+flwIH/1j2pmMe3TRjraUGxjSyDaJv6t/JHaW1VO+wvF7YWfl9eSnEu0e HmsZ84E6kLhU/sT2/eL5iJl2R9Ak3mtqhzbvyX+X7qwtDDot2HgRiQ1a7vR2eWDzj/HsrX nyKKCaDJlfhZboMd9YnGEJaS+jxuaVbcYsEaTfixuOztXPR9hcgncjLs8oVC/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771965945; a=rsa-sha256; cv=none; b=fZDF3T6nJ80Kayky7PnfUIj/dYgcWvkwCKwKZbF4/RwN98QFMzvb+XMnUCTIVAqcxITRky cou2GM5gAZr+GWtqdbdr+hR39S+RrcLBNTarqWJ0KKxlp2IX9wes1MdhzlbPHjrmRwoAVH loX/r/TjU+xK/dXBD05itKftCYewJVeJm2RAXPZgWbCeyr+5pvW7jyEK957Pjd9P1QNG0n fcK64lT7OCAigbqF7dpYrWgv08oDviVMMKrv13bZQRCP4SWxuYJD52SRtePE1KHZ2OwkWj jwa+ig0we1nxNIxH792D62N6BD3vZixXhYu0EbefAzbm60vcjB1yoDRjj/ZLLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJ8LF8Ve7w4B5wu6rr/xII/T5pTJPqJ91DJfW/T3sLo=; b=Lhb3ZlcgaKWk0C7vVrOW7sthT9HGe4L1XV0pKTxRGanGu/5jTG2kO+uOPYBUjZPah7ODIo BNtZfCGjRAH3EuQYGA5UIHnYObaiRi+9nAHTQloG/dWX6dSU38ORKo4nVgkMkWJnVx3vRh Em2Qyn9zcI52FiyVuXFOY298tp0gSGXNY7YGawfRof0tRwtvKcc7l9gfrfdW65ubSYIKeY gcPJcO5lm8/ID6HBTB+gvyziCg9kFlF65EUTzQD5NJ7cj+yB1yjwryCSfYdDjzSOhbJOum gTeVrPZ6VrvJtb+p6GXb6E+WK4S1csixfW15/167LJ8LktMEeoDecmoz8tH9tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8r901Z8zWpv for ; Tue, 24 Feb 2026 20:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25d0b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:45:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 0fd91c489134 - main - bsdinstall: fix EFI boot entry creation 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fd91c489134643ac9e38c0f55ba7464fe892c5e Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:45:44 +0000 Message-Id: <699e0df8.25d0b.67e9348e@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=0fd91c489134643ac9e38c0f55ba7464fe892c5e commit 0fd91c489134643ac9e38c0f55ba7464fe892c5e Author: Ahmad Khalifa AuthorDate: 2026-02-24 20:11:32 +0000 Commit: Ahmad Khalifa CommitDate: 2026-02-24 20:42:21 +0000 bsdinstall: fix EFI boot entry creation update_uefi_bootentry assumes that the caller sets FREEBSD_BOOTNAME and mntpt, which isn't the case anymore. The result is that there is no "FreeBSD" boot entry created/updated after install. Most machines manage to boot from the removable media path (if the loader is installed there too), but some don't. Take the loader's path as an argument and rename the variable used in the ZFS mirror loop so mntpt can be reused below. Also mark nentries as a local variable so it doesn't leak out of the function. PR: 293385 Fixes: 494de51bc0074472d1b01604f085daea0844f240 MFC after: 2 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55469 --- usr.sbin/bsdinstall/scripts/bootconfig | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/bootconfig b/usr.sbin/bsdinstall/scripts/bootconfig index 9c188c1d8a91..d551d2448611 100755 --- a/usr.sbin/bsdinstall/scripts/bootconfig +++ b/usr.sbin/bsdinstall/scripts/bootconfig @@ -83,11 +83,13 @@ uefi_copy_loader() update_uefi_bootentry() { - nentries=$(efibootmgr | grep -c "${EFI_LABEL_NAME}$") + local nentries=$(efibootmgr | grep -c "${EFI_LABEL_NAME}$") + local loader_path=$1 + # No entries so directly create one and return if [ ${nentries} -eq 0 ]; then f_dprintf "Creating UEFI boot entry" - efibootmgr --create --activate --label "$EFI_LABEL_NAME" --loader "${mntpt}/${FREEBSD_BOOTNAME}" > /dev/null + efibootmgr --create --activate --label "$EFI_LABEL_NAME" --loader "${loader_path}" > /dev/null return fi @@ -97,13 +99,13 @@ update_uefi_bootentry() for entry in $(efibootmgr | awk "\$NF == \"$EFI_LABEL_NAME\" { sub(/.*Boot/,\"\", \$1); sub(/\*/,\"\", \$1); print \$1 }"); do efibootmgr -B -b ${entry} done - efibootmgr --create --activate --label "$EFI_LABEL_NAME" --loader "${mntpt}/${FREEBSD_BOOTNAME}" > /dev/null + efibootmgr --create --activate --label "$EFI_LABEL_NAME" --loader "${loader_path}" > /dev/null return fi FREEBSD_BOOTLABEL=$(dialog_uefi_entryname "${EFI_LABEL_NAME}") [ $? -eq $DIALOG_CANCEL ] && exit 1 - efibootmgr --create --activate --label "$FREEBSD_BOOTLABEL" --loader "${mntpt}/${FREEBSD_BOOTNAME}" > /dev/null + efibootmgr --create --activate --label "$FREEBSD_BOOTLABEL" --loader "${loader_path}" > /dev/null } f_dialog_title "Boot Configuration" @@ -151,21 +153,22 @@ if [ -n "$(awk '{if ($2=="/boot/efi") printf("%s\n",$1);}' $PATH_FSTAB)" ]; then # over gmirror, so we only do this for ZFS. esps=${TMPDIR:-"/tmp"}/bsdinstall-esps if [ -f "$esps" ]; then - mntpt=$(mktemp -d -t bsdinstall-esp) + tmpmnt=$(mktemp -d -t bsdinstall-esp) for dev in $(cat $esps); do f_dprintf "Installing ${file} onto redundant ESP ${dev}" - mount -t msdos "$dev" "$mntpt" + mount -t msdos "$dev" "$tmpmnt" uefi_copy_loader "$BSDINSTALL_CHROOT/boot/${file}" \ - "${mntpt}/efi/freebsd" "${mntpt}/efi/boot" \ + "${tmpmnt}/efi/freebsd" "${tmpmnt}/efi/boot" \ boot${ARCHBOOTNAME}.efi - umount "$mntpt" + umount "$tmpmnt" done - rmdir "${mntpt}" + rmdir "${tmpmnt}" fi - # Try to set the UEFI NV BootXXXX variables to record the boot location + # Try to set the UEFI NV BootXXXX variables to record the boot location. + # Note that the ESP is mounted at ${mntpt}/efi. if [ "$BSDINSTALL_CONFIGCURRENT" ] && [ "$ARCHBOOTNAME" != ia32 ]; then - update_uefi_bootentry + update_uefi_bootentry "${mntpt}/efi/freebsd/${file}" fi f_dprintf "Finished configuring ESP" From nobody Tue Feb 24 22:09:10 2026 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 4fLBhQ4W8gz6T4wZ for ; Tue, 24 Feb 2026 22:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLBhQ22NRz45JN for ; Tue, 24 Feb 2026 22:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771970950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CbcSuZ4NINzugGM4jkI6Cm32z4EYGw+01MI8PKnTGpE=; b=KeW0CDoPuKGlF5rbn2XTCpEKcKjnm5qZAmsBqW2SS6ExlI/VmLqKeFxON5xSkgaV634JHj c4LeqYMfyqmr7KqS4Ax9YFrsQF/78uW1uqoI5z1nL8Q/zQ/fpKAThKldhV/u3bnWJ5RzgV VFgN9Jm3n+juT6Mjri4G0HrQn9bRtG4oFrsjMnGV6WaLBDax3QcvyFOYhVmnLdiO70hXbX jaLkq4dkz1ycoF5/If1N+kkSBM5B+86mHpw0d4zQ1Ucx4zwpLcIdT8e+MuOsrsYDndHabQ VFm6N38l/dqTZIVebHNgt3yrlPtv8obI+agOddlTU2nnIQ5EyopNdhuX/vf+rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771970950; a=rsa-sha256; cv=none; b=ddptrQk9f31WHKQTUF7sNOqYG1AE/xwouNIWuz0MqjyXMzCtqXRzFupOQ5y+oZ/lqWOq6q 6wDBlhOrP5QarwyxRAlxcKUPxsv+pPDq8l2OvqcDe03fTULJuxfPJ5RDKpCOMP0H3+t/wj utFHMiwtNQ/7LFyKtvoVlZQcuN6gClOjXDBbu/6ObyzI4pPL/3uzgTVAXZxSiTLixWztxK /FmqXLOmi7W9BvdxCKBAlXWOzpfuiEnxrmj1xNHrcbmLy2rakJbUORO3XC1PdSA8Mpejo4 GdeqhnsCK8I/oesUMcRpTay+YU7/5APJx0wcyGwmq6pqAo7xSkNPRktL2HJFQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771970950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CbcSuZ4NINzugGM4jkI6Cm32z4EYGw+01MI8PKnTGpE=; b=elL6fNyGSl1GYHbk+3asJJZVA3oCGHjqnh3CocyEI2xteXUs99Iu1/AhNaY2YbBsfH9DfM bAkMmlvuE3UmZGz+9ue4XLiN586Auhb3EOkJnxFMY17ElBuviawSpdB/9ff5FAEXzmBI1+ Xp7PUsj8LsEKnc9IqhF9XE2lNgidlLZMqV+GYtyRfNEqRg9QrVJCzRyHm+fMJ0Fhez9jqk T//kBbid7WMbi69Z5mLc5DQ4t9WiZm8xpQPx2+/VEYmxwml0UvZ8pCVq7jVQuWWGoG0uBh Sp6XFxxGKsnnGWJnY+zV+uF7Z/JPZ0a9w1NR6IiplPwwUBDKZixmO28IziNRug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLBhQ1LvPzbTG for ; Tue, 24 Feb 2026 22:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3483e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 22:09:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: fc9369abef6b - main - LinuxKPI: 802.11: do not leak BA sessions when tearing down state 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: fc9369abef6b6993e79b08de832e1d49f81a17b9 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 22:09:10 +0000 Message-Id: <699e2186.3483e.4e53180e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fc9369abef6b6993e79b08de832e1d49f81a17b9 commit fc9369abef6b6993e79b08de832e1d49f81a17b9 Author: Bjoern A. Zeeb AuthorDate: 2026-02-24 12:55:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-24 22:06:18 +0000 LinuxKPI: 802.11: do not leak BA sessions when tearing down state In certain cases we may tear down state of a node with 'ongoing' BA sessions. This can trigger a firmware crash with iwlwifi as reported in [1] when trying to remove the sta from the firmware. 0x2010303A | ADVANCED_SYSASSERT .. 0x00000000 | umac data1 (sta id=0) .. 0x0088030C | last host cmd (STA_RM) [1] https://lists.freebsd.org/archives/freebsd-wireless/2025-November/003901.html I hit the same problem while running regression tests after reworking some LinuxKPI 802.11 sta state machine bits. Add the missing calls to lkpi_sta_run_to_assoc() and lkpi_sta_run_to_init() to make sure (through net80211) we call (*ampdu_action) with IEEE80211_AMPDU_RX_STOP to avoid the firmware crash. Note: this specific patch was not excessively tested. The upcoming change to the state machine including this fix has seen more testing but also only needed the change in one place. The reason for putting this in upfront is to document the case well. Reported by: Mohammad Amin (the.madamin20 gmail.com) [1] Sponsored by: The FreeBSSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 0b732cb691c6..e80cf9436b3a 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3256,6 +3256,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int #if 0 enum ieee80211_bss_changed bss_changed; #endif + struct ieee80211_rx_ampdu *rap; int error; lhw = vap->iv_ic->ic_softc; @@ -3311,6 +3312,16 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int goto outni; } + /* Stop any BA sessions if still active. */ + for (int rapn = 0; rapn < WME_NUM_TID; rapn++) { + rap = &ni->ni_rx_ampdu[rapn]; + + if ((rap->rxa_flags & IEEE80211_AGGR_RUNNING) == 0) + continue; + + vap->iv_ic->ic_ampdu_rx_stop(ni, rap); + } + IEEE80211_UNLOCK(vap->iv_ic); /* Ensure the packets get out. */ @@ -3412,6 +3423,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int struct ieee80211_sta *sta; struct ieee80211_prep_tx_info prep_tx_info; enum ieee80211_bss_changed bss_changed; + struct ieee80211_rx_ampdu *rap; int error; lhw = vap->iv_ic->ic_softc; @@ -3467,6 +3479,16 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int goto outni; } + /* Stop any BA sessions if still active. */ + for (int rapn = 0; rapn < WME_NUM_TID; rapn++) { + rap = &ni->ni_rx_ampdu[rapn]; + + if ((rap->rxa_flags & IEEE80211_AGGR_RUNNING) == 0) + continue; + + vap->iv_ic->ic_ampdu_rx_stop(ni, rap); + } + IEEE80211_UNLOCK(vap->iv_ic); /* Ensure the packets get out. */ From nobody Tue Feb 24 22:09:09 2026 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 4fLBhP3skqz6T4yS for ; Tue, 24 Feb 2026 22:09: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLBhP0zmlz45P1 for ; Tue, 24 Feb 2026 22:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771970949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qjSg0nUWnqHniJasF1oE2UqdJHsRJjdAFYnZMKLtJw0=; b=nKsbZ2qAQeRBcyTGeMg7vMh+uxAqXOkm8/zIqSKYbsnNV2V1UE8wKiRmtqNGG9+uWNI0cZ Wa07T6zP8yxOEimIBkxapIQIOZwR/6Jd7QvIVNnA9MjoR8db38xWWWaMJbzoHf2WtpasZP TlDKlp5dE94CpyYWwILx3z1XlCiul2WtRdc2ZlKBi0vyr5PtLV3xJ8WD7QNr5mkxO8sQ6u Cso7Mc8f3bD90LAyTvfd7ppBEmDs9ocku24ezcC/Q9ZJ5m/pPgGtRgi2qU7sBiY7EhS6Go DSKNpAIpOFkt5zKUpP8PIMI3bTyeokbjVGlESnXVYjgBWnOnR6ekBVE1HYRSaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771970949; a=rsa-sha256; cv=none; b=pfdd9llpz3X9Y8WeP5uttpEmIEnjiSzupAj0I4d09Nvdzc7oIdD277RRP51I92AvRLGwO+ r2Iww6qD9PfgGdAfL24Hh8FpofcUTGwhLTi7x2t3/lQx6y7AIPvVlnKgbHNJNfsNqP0SOr 43bSKSULGcfzxdW1arloAUN/KanjM4DHdnnjlYzmpS/LhXWAj3xolobwr+5lHG9H7DV49j oO08kq9InZzeejTP7TCV3GhUY4uWr2tWPJWP8DEaei+QMv1V/t0f2eTzRi+qddyz9lQBiL eh20cTsJLwg++6qR7gF+zAJ/TPi/0XoVwXEPwf5S7Px8rueYUyoy+JzcJ9yX/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771970949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qjSg0nUWnqHniJasF1oE2UqdJHsRJjdAFYnZMKLtJw0=; b=h+M+S0sbWVUfQzaP92Eo0418dE5jrKUqUriwbtacIc96EOxWtBU8hW4/WTvGQ5WzH+YVOt 4mCQr7ihOFTRR5TOXrYy2XdiY8eph1u/23Slwa5kq7zTbI5KSvbyiZ1Dd7+j0S5flwqV/O ZsTU1RYPYfnPre1hHSLUwAxhAQXz90TpQNjnLh5wMGLkgcjSGOf3ZzBlVaUMOVQtR5GdOa d307kmPckZu5vX/711+nOZemOYvVBbPi2kBNhwToUjFpObgMXmxj6ZNqv+P3QEpLj/V4R9 bWKwv//rvXmrUGpsltTT38lmP9sOnXIuox/R7s2uehQyQgkTTln6eOIDo1BkGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLBhP0XTRzbCG for ; Tue, 24 Feb 2026 22:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37782 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 22:09:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 5edf24aac1d0 - main - ofed: reduce usage of struct dma_attrs *dma_attrs 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: 5edf24aac1d0978d37d62594f42d87c9f118622b Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 22:09:09 +0000 Message-Id: <699e2185.37782.5dbfa03b@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5edf24aac1d0978d37d62594f42d87c9f118622b commit 5edf24aac1d0978d37d62594f42d87c9f118622b Author: Bjoern A. Zeeb AuthorDate: 2026-02-19 23:12:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-24 22:04:36 +0000 ofed: reduce usage of struct dma_attrs *dma_attrs ib_verbs.h still uses struct dma_attrs *dma_attrs everywhere. It is beyond my knowledge when that struct got deprecated upstream but it is still supported by our LinuxKPI. The problem is that the functions called with that argument (dma_map_single_attrs, dma_unmap_single_attrs, dma_map_sg_attrs, dma_unmap_sg_attrs) so far are #defines in LinuxKPI and drop the last argument (attrs) so it was never a problem. In preparation to pass the attrs to the actual implementation in LinuxKPI, which has gained support for them, we now pass dma_sttrs->flags which is the expected unsigned long bit field. If anyone has serious interest in updating our ofed implementation they could look into this some more and remove the usage of struct dma_attrs entirely. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55390 --- sys/ofed/include/rdma/ib_verbs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/ofed/include/rdma/ib_verbs.h b/sys/ofed/include/rdma/ib_verbs.h index 78aa0af4fa2b..0c40a6f18f7c 100644 --- a/sys/ofed/include/rdma/ib_verbs.h +++ b/sys/ofed/include/rdma/ib_verbs.h @@ -3539,7 +3539,7 @@ static inline u64 ib_dma_map_single_attrs(struct ib_device *dev, struct dma_attrs *dma_attrs) { return dma_map_single_attrs(dev->dma_device, cpu_addr, size, - direction, dma_attrs); + direction, dma_attrs->flags); } static inline void ib_dma_unmap_single_attrs(struct ib_device *dev, @@ -3548,7 +3548,7 @@ static inline void ib_dma_unmap_single_attrs(struct ib_device *dev, struct dma_attrs *dma_attrs) { return dma_unmap_single_attrs(dev->dma_device, addr, size, - direction, dma_attrs); + direction, dma_attrs->flags); } /** @@ -3630,7 +3630,7 @@ static inline int ib_dma_map_sg_attrs(struct ib_device *dev, dma_attrs); else return dma_map_sg_attrs(dev->dma_device, sg, nents, direction, - dma_attrs); + dma_attrs->flags); } static inline void ib_dma_unmap_sg_attrs(struct ib_device *dev, @@ -3643,7 +3643,7 @@ static inline void ib_dma_unmap_sg_attrs(struct ib_device *dev, dma_attrs); else dma_unmap_sg_attrs(dev->dma_device, sg, nents, direction, - dma_attrs); + dma_attrs->flags); } /** * ib_sg_dma_address - Return the DMA address from a scatter/gather entry From nobody Tue Feb 24 22:09:07 2026 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 4fLBhN3FkFz6T51p for ; Tue, 24 Feb 2026 22:09: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLBhN04l5z45cq for ; Tue, 24 Feb 2026 22:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771970948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8pgrhLxsYYNIqTZcgQy9C2Eqg2riMO+dxMBGSfIE8Fc=; b=TkC+Lna8Sb86n+RMPe+hLVJzjVwzHUyoUOp9KgCmnEPhfC9GlZwsV+yHW9sXXlvPIR1uYl P6+B8iKIfj0Yg4IbaC6cC7hpdzxRphX989jnuqid6uOx0AJ0CcK2Rj883o7vKzuEETKWdP TcU+WxwtwKQf7jHtsv/10hr1lzCyyYJvY74m7o2EQngDXMYuvwpUFlbZQp9YrWVKi3ScXq YDnlYMwY18rkHWdpsHu0Rsb9B4ts2ROI+HG+zDYtApTU/VQnyGay3xaxwKwrF4tLxWZTvX sD8HcgxMBHRHXhggVPBN0fSSsyURH4y4QJrGGGJyn126vZVKmNNzcM7QYeSGIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771970948; a=rsa-sha256; cv=none; b=Zqf5rVldqHTZUE3ZG651fgkcXMK/6o+3/l6lHu6mHOZVkzF9j95FdqHev0lbjwpnLjdJpb +x0nPTi5DHqPSIUfuynePBHHDJ0hnjvFaDMnO/aJq8pC7P5RqT+Ji2SVWRamFi/7zeaxku Y84mZe0Losw4ArMeqr1EbxbIf/5u0mpN3bj1qzaQqInHAxa+qotMPlCI3TqGB8AVn24JEp v8PS/vU//swNlG6RjU039nQrL+B+wJ6bN/kI58/GyttCTK+YteSUdgJ0y1o+gtK7C1gA8q eIQQJNS5MRQA4pxJ7FoaDJCb+vUsqVbfI8gTUiRoPBASbGqbILARscC/1GJyRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771970948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8pgrhLxsYYNIqTZcgQy9C2Eqg2riMO+dxMBGSfIE8Fc=; b=cx8sXSXs437GGuq4t2rRQB+u/ZEFJoLiSDlOR3c1VEUwb2XGBqkS4PPdPkghL3TsKk6rth COPh2xBg7UVN6/iZvErwYlyPJFbmRQP5rY6Z9aGIxwA6AQgs7IevPhksvVfRTD3fNwgmHb APX2pWXVT5iaSId66u2lyi5AIpWvJyCwnnqwXY/EP0LWqA6OsC1KOXR7YWOdzcMoo59HUj LFeEOQU4ZZfk/q6Swm3xp11Psbrf/uxfRSskFvgiNYPfAtQiTiLKiDh6ud709r0eTin1x6 NBLKmNdRYIgXPwTucC9U9148eURw3/hw0M1slf3wM/gTAAm1SSSO/mjaOOZAOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLBhM6mzXzbFV for ; Tue, 24 Feb 2026 22:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36913 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 22:09:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: a4e30909ec98 - main - qoriq: fix spelling in device_set_desc() 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: a4e30909ec983f7986954e6c509ea21422561d84 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 22:09:07 +0000 Message-Id: <699e2183.36913.62844028@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a4e30909ec983f7986954e6c509ea21422561d84 commit a4e30909ec983f7986954e6c509ea21422561d84 Author: Bjoern A. Zeeb AuthorDate: 2026-02-19 23:10:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-24 22:04:36 +0000 qoriq: fix spelling in device_set_desc() The product series is called NXP QorIQ Layerscape. Remove the extra 'e. MFC after: 3 days Reviewed by: mmel, emaste Differential Revision: https://reviews.freebsd.org/D55388 --- sys/arm64/qoriq/qoriq_dw_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pci.c index b6eecba48c39..7d51db2a9505 100644 --- a/sys/arm64/qoriq/qoriq_dw_pci.c +++ b/sys/arm64/qoriq/qoriq_dw_pci.c @@ -176,7 +176,7 @@ qorif_dw_pci_probe(device_t dev) if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) return (ENXIO); - device_set_desc(dev, "NPX Layaerscape PCI-E Controller"); + device_set_desc(dev, "NPX Layerscape PCI-E Controller"); return (BUS_PROBE_DEFAULT); } From nobody Tue Feb 24 23:04:53 2026 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 4fLCx36P9jz6TCBN for ; Tue, 24 Feb 2026 23:05:11 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) (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 4fLCx34SQGz3DlN for ; Tue, 24 Feb 2026 23:05:06 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x836.google.com with SMTP id d75a77b69052e-506bad34f51so52220211cf.2 for ; Tue, 24 Feb 2026 15:05:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771974305; cv=none; d=google.com; s=arc-20240605; b=QiJcAH0/Bdqap8TD18tJLSjzmlg/OAUaQ4Nf/bmOcFbZ0PuKYpr8lbpz9uk/AMaMB2 sDu4vGNpTTcBz5ceiZ/69tbbU/wQVGL12iWC9MdhN60Q/JqEB15tvUa5Es8/c/TzhS1i u/JvuY+dU45NB0O5/Xi8bEQbs4ummFfg1spnniN8OSDGCaI0LMT7u7ykLNYMHBJq/6US X0WeNK62mXmUw5WwDeMDZBKuYTR53SjSMKdMFQY+bSVj27K9ty7/km9/vnW2b7RxTETj Wiw5lOgW0tPBEZvu89OrCRwiiFPcY30NlN242W6FVqkQw9TcW9tp//g2WOTQhdOIRdmG B2vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=bnRgZSfn+Zzb3vzgjXF1+7EFnxZmLDChc9l3UsEn580=; fh=pj9K2kC97c714RKTzmwnFo1HTGe7ar/QUvnwJh2FMlg=; b=P3Q1dgZIhAXIetK4sdHY58USqMcWl9iW5pXnnuMaOZV68ykTVmiyhOzkfCDIz4fULx ECL94GGCGsPDYuhvgGZCIbEyDsT1Fmn90+7zhevpOKjrEETw5DYHjdo7XsxpsTl7bjfP cIYIIUD/2OOXRaX2kq14xVHQ/xjeUjldNemvDG/m0Q495D4MUygnbav72jGrZNv7YWzK HmnlB8QHMJdcX31zjHIlpSs5ESqkTOg3rbqoQxtqPHPNgwv8c7vCtpfCqfV0EFemt3f1 hlPgn8nkJ0T7qz8wmbRY/TbSb4LX2CHUDz7h0j7vsbOHT4HlqLNXc5sGtYYN9C515GB1 lsIw==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1771974305; x=1772579105; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=bnRgZSfn+Zzb3vzgjXF1+7EFnxZmLDChc9l3UsEn580=; b=CZ7+5d+yMLNmVLj4IsWBpHI56fW7arGqlly+zkxr0AHEErjZo3HKdnOmOvf5Gd38lK Mx31lZ8+AzLZyxpCgEYzD5u9z0NwsI0IyU4dy8dMER5I8UJ/ujTKNg6Uo1P1OxoeqtDX EtEY6ewRQyahEi0xVl8uL9cqyRg3EcYCJZ0yI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771974305; x=1772579105; h=content-transfer-encoding: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=bnRgZSfn+Zzb3vzgjXF1+7EFnxZmLDChc9l3UsEn580=; b=LqMWc0ZwJyMXRPMhAMRo3Ce7w1gwPTqBcajX4uLCMTezZSIAzn8IYjIUYSeMdMgIYV 9hMcqYD1KAIVljXvw6TTroUo2MMphr561gC3cIOHacvY+r0fvieo4on9T1/eUTxUj6AD WxSQ1Qju/zoOjyB4+K/hgmATWgj1uOzbzdotFL8pe3KEvA1U1KLexPzY0xJMwDkphSSh WPemhUSSQymxFjuyeayWdhB38/+270SVDP04qnFpDmP750D3KGoc+bBYf0iIqeWDl/4t M45jCxrxg8X9Uo1lgsuC1M6no99Ntsx0f44tH6EeWxBwJRMV8XKI4/bx9qdqjtNIKtf8 kAuA== X-Forwarded-Encrypted: i=1; AJvYcCWzR5WfiYsmvZOrIBm2j24wNuJJfcbF8klyvxAA0o2UMIArveS1z+831JdFHkKu2G1gX41o4U/O2Sp9FdTOFUE8TtRylQ==@freebsd.org X-Gm-Message-State: AOJu0YwHf1s27xNhSm1FgjJKF22X0IeYYoZmlB/JN4MPw8HN8DnSwPg8 Qdu7MKSi57XkPz/DZ1Yb+U1p4jWu31GSJk1kwoq/GEurQ0mCnnHVhS2q91lX/QrbiiGTFpkp33h 3az0JK85BBS4u5FmZbMjO8stxogL7mpzpnc5ZfEsk X-Gm-Gg: ATEYQzx0ORAAXFJ2/yuuU4OSBUXMhRK2iSzXPZQ19FF/oK2TMk6Z96SwBQe3KmjbfoY Ph1WVT1umn/+eBK3bg8WYI9ggpvPr0Jkec13GU6z1YhXCfaBohQt7+nwAJQ94PiBott8WXq1Z5c 7P/IVhcfsI7Qhpf5XdAry2PG/sOQMgBWVz5azEWwsYH9LYkPS/oT8JCkDb0tTrGgvfcJUf918Sk +KVXzHahDg/LpvkikkytQE93FyfK2LcnqeVm8ouy0pHLwRbhjs/DJzFLk4Xp/gkjOj1Yebyq5KF cy6y/w3/9KOcMVyQIuxCgWH0mc0U1KRHJCfx3pCjjoF5buDjd/WIOUl4LaopNOgsrFpbEw== X-Received: by 2002:ac8:7f13:0:b0:501:467d:17e8 with SMTP id d75a77b69052e-5070bcb310dmr191823541cf.61.1771974304836; Tue, 24 Feb 2026 15:05:04 -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: <699e2183.36913.62844028@gitrepo.freebsd.org> In-Reply-To: <699e2183.36913.62844028@gitrepo.freebsd.org> From: Kevin Bowling Date: Tue, 24 Feb 2026 16:04:53 -0700 X-Gm-Features: AaiRm53mC5unaoyQjdveCbbCm69iUZSeg-lu0G4_ntwqxNS1Ka_aMVr6kYfZg4Q Message-ID: Subject: Re: git: a4e30909ec98 - main - qoriq: fix spelling in device_set_desc() To: "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fLCx34SQGz3DlN X-Spamd-Bar: ---- On Tue, Feb 24, 2026 at 3:09=E2=80=AFPM Bjoern A. Zeeb wro= te: > > The branch main has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Da4e30909ec983f7986954e6c50= 9ea21422561d84 > > commit a4e30909ec983f7986954e6c509ea21422561d84 > Author: Bjoern A. Zeeb > AuthorDate: 2026-02-19 23:10:34 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2026-02-24 22:04:36 +0000 > > qoriq: fix spelling in device_set_desc() > > The product series is called NXP QorIQ Layerscape. Remove the extra = 'e. > > MFC after: 3 days > Reviewed by: mmel, emaste > Differential Revision: https://reviews.freebsd.org/D55388 > --- > sys/arm64/qoriq/qoriq_dw_pci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pc= i.c > index b6eecba48c39..7d51db2a9505 100644 > --- a/sys/arm64/qoriq/qoriq_dw_pci.c > +++ b/sys/arm64/qoriq/qoriq_dw_pci.c > @@ -176,7 +176,7 @@ qorif_dw_pci_probe(device_t dev) > if (ofw_bus_search_compatible(dev, compat_data)->ocd_data =3D=3D = 0) > return (ENXIO); > > - device_set_desc(dev, "NPX Layaerscape PCI-E Controller"); > + device_set_desc(dev, "NPX Layerscape PCI-E Controller"); This should probably be NXP not NPX? > return (BUS_PROBE_DEFAULT); > } > > From nobody Tue Feb 24 23:09:15 2026 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 4fLD1q04zGz6TCr7; Tue, 24 Feb 2026 23:09:19 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLD1p6hslz3F62; Tue, 24 Feb 2026 23:09:18 +0000 (UTC) (envelope-from bz@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771974558; 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=eAhL1c3WT0sEgCF5n8lCL3XSmpoZP4ysC3DwCjXV8xQ=; b=Z1Wb8lTFlzcarvEBYTYedAB8Rw9yeN2vdBJPNczZFt6MCxmmpjZxztbJJ/nSN1aIp1beHJ 3ouc+CJfdFvCSmpYWkxwqQeOUjQI8AkXSkvXm6FFDjMrp7s3dGK4K1UEVO7mg+fGNq1ZL3 JKhzy5VTyWNS80Wj3yW++uDDw5ZUsEIvNGTN5SA61BJBCE62ExiTjwyUtMq3R819krtd9s AJKfhtRVmvbV+wdgHxQIdbTTh85d6CIlzxG/rATPKf0eAF81h9xJAB6FNlCQJbDnPWCDFg Bdw+49PUdm8X9VpqT6/XyB8qOs3ByiwiJUY7WIFTdjYzH5kXsVvm7Ep/iOOh3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771974558; a=rsa-sha256; cv=none; b=YBN3N6+QJ+OeSfw8Ixij7fXxs6GGjAmigd+H71Ed4H46QGp8ol0MYCAM9tYGvkmIeI2viC 51dcFrL/ABfOmXW6Ys33M4F6Esnd5nkRekuZgfuN3NCBtSYb201df8WpJayF1+tqudKrYB kjv8JUN+GyyG/L8XDvVgY4ckEjQdHZneHk+kR8RQIwBIiA8oxOUmndEGzz0LRcQE5x40L/ jJqvklz1sL2SDW5S0owXO8+QpJ/0DlUo/rVaam9160lEjYg3WUkz3jEUEHPnq2Q5UZywqn VvJu40NUl0hLS84ozsfKPb3533hwgVDdaVovsMY8BuyGg9DilMk/mS+zCXgBSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771974558; 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=eAhL1c3WT0sEgCF5n8lCL3XSmpoZP4ysC3DwCjXV8xQ=; b=huRvUEqjnR5Cme6r6qHp/aGZBNPBu0ZjLZgqLzH+3uzZSPiXQppcwaMKmUebfcS9qf3LkZ WRsgm+pDD2Cu48cJJ7O8ZvxH+2JvqE5bjTCYRGt8Zs7kqUMlt7rLxdPoH+0t1gz4IYV4SZ 0P5tH5DlZu+zIieI9RKEQeb3IyiNO5edmPrSIgNNwnuu0+6d+hPChZTOU7O3d1UT3QCBP1 p/GzElBHrwciYkbuYyeij+CJpqE7SDmP7TQ6Po5pIE82/++ON5gcCdTzd7P2Lc+/QZ7dlU dUS/UOPg/S3nOI3edrMVmltSvXFkEp2cvFxncFoaE7xfStwiExBDUXAFm+3VJg== Received: from mx-01.divo.sbone.de (legacy1.sbone.de [80.151.10.34]) (using TLSv1.3 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 "E7" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fLD1p57FQz10Yy; Tue, 24 Feb 2026 23:09:18 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.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 DCE86A64808; Tue, 24 Feb 2026 23:08:57 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id AF0572D029E7; Tue, 24 Feb 2026 23:09:16 +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 rQJy1ap1BBEs; Tue, 24 Feb 2026 23:09:15 +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 BEFAD2D029D8; Tue, 24 Feb 2026 23:09:15 +0000 (UTC) Date: Tue, 24 Feb 2026 23:09:15 +0000 (UTC) From: "Bjoern A. Zeeb" To: Kevin Bowling cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: a4e30909ec98 - main - qoriq: fix spelling in device_set_desc() In-Reply-To: Message-ID: References: <699e2183.36913.62844028@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: multipart/mixed; boundary="0-51106479-1771974555=:11296" 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-51106479-1771974555=:11296 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Tue, 24 Feb 2026, Kevin Bowling wrote: > On Tue, Feb 24, 2026 at 3:09 PM Bjoern A. Zeeb wrote: >> >> The branch main has been updated by bz: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=a4e30909ec983f7986954e6c509ea21422561d84 >> >> commit a4e30909ec983f7986954e6c509ea21422561d84 >> Author: Bjoern A. Zeeb >> AuthorDate: 2026-02-19 23:10:34 +0000 >> Commit: Bjoern A. Zeeb >> CommitDate: 2026-02-24 22:04:36 +0000 >> >> qoriq: fix spelling in device_set_desc() >> >> The product series is called NXP QorIQ Layerscape. Remove the extra 'e. >> >> MFC after: 3 days >> Reviewed by: mmel, emaste >> Differential Revision: https://reviews.freebsd.org/D55388 >> --- >> sys/arm64/qoriq/qoriq_dw_pci.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pci.c >> index b6eecba48c39..7d51db2a9505 100644 >> --- a/sys/arm64/qoriq/qoriq_dw_pci.c >> +++ b/sys/arm64/qoriq/qoriq_dw_pci.c >> @@ -176,7 +176,7 @@ qorif_dw_pci_probe(device_t dev) >> if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) >> return (ENXIO); >> >> - device_set_desc(dev, "NPX Layaerscape PCI-E Controller"); >> + device_set_desc(dev, "NPX Layerscape PCI-E Controller"); > > This should probably be NXP not NPX? WOW. Our brain is a mystical thing .. I'll fix that one right away as well.. >> return (BUS_PROBE_DEFAULT); >> } >> >> > -- Bjoern A. Zeeb r15:7 --0-51106479-1771974555=:11296-- From nobody Tue Feb 24 23:17:19 2026 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 4fLDC417rBz6TDVM for ; Tue, 24 Feb 2026 23:17:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLDC40fpcz3GD0 for ; Tue, 24 Feb 2026 23:17:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771975040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e74KfVMZnO4rNu4bLdGu0i2Qw8vL4TK3MLrLsNSlVfY=; b=rOST3CHeSACMOAhlzcSiTHM3PcO3Hq9FPe00mLHx3+T5Tfy6zxFLnjGQll+drkN9Pf0aJH cUAr+rZKB/5FdmwJK53rpwkm+lzpcS2gUtsN0ODP9zQqe8FUi9Su7eYOn69Pz7fZNMTvo5 rghWmuPOHoqkzVLciKTv7Ss7H6EjpKzDKu4pmekHk5ob7mIfmsrcraQiMYpu7TPk3P0Hjc 6eyjqm0B6OwMMj+Y9fiam4kZYaPjNyAPtj3+cSRZHbVH9czZTZ7PpuhqRNaTPLIadtKLyP ubh1pdE/ooOxyXvHltYgPeMBkPpccXfitaYsQ2wppQ32U3TRZNqQiFUX3lzzsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771975040; a=rsa-sha256; cv=none; b=U9lgkJ8RWSgoxxj7vLPz30BqfqqmyMmqWwlwJvElKrC7JwJJevaWwziOm5Qfin7N1GK3x6 Xedl8Aaa4aUH6A0rcYcaI+bmDUb3EZfGZJohRu+xZAT82xKo5ffbdg2gLwQ35iHX8y8Ie1 sO0XsdYVSlaw3oc67uWMY673YwQ5IhAw7rrzrsu+3bLryI9pNBsvw5kB/Es1mOrGxq+LgY yFerUM8gg5VupLywcRRrfl8wCPXr5gyLAakCGd5mvPRl7IrrCHpayF++QAaJMNo+8PbZ5o j1XtNBazGW7BlgIH1isj+IM9nAG6UqW2+iTWUNRa8CocOuV0cys3JYMcY/lkiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771975040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e74KfVMZnO4rNu4bLdGu0i2Qw8vL4TK3MLrLsNSlVfY=; b=x/ev/PuCr1cUl+KaEsYF62oabskoLAPrbYgDevr5yhhTofdv1Wnxb741lgpj48BWWv7RJZ uS0bUMdFGlfObQL0JbQa9/pcZdbsy43lSwognRG2nLHrjpwUtagy8ehWQhAxUP2STRYeeB Cn+7a3f88WzbOxKG/JPU8PUZfixA23Y0qGtuEDJ6D40J7kcUtAJFXHOTH8a+4PsSjI2Ku6 QDoPRQOU0uLyjV7hHMQohhl5P++fBc5Bu3bdPhsEkh2hI85AxNTJVyQ9snE2aGCAuPR+mQ f2EeTr7D+XyzO2Y9+VLPdlseaLCXYK5/28PXl0ThpMlGA98zqiockuPLLrwe9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLDC373GMzcys for ; Tue, 24 Feb 2026 23:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d426 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 23:17:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c3ed2f3e4144 - main - qoriq / nxp: Fix spelling take II 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: c3ed2f3e414497ab3cf6ade17e52a87f07a547e6 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 23:17:19 +0000 Message-Id: <699e317f.3d426.6ebe757@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c3ed2f3e414497ab3cf6ade17e52a87f07a547e6 commit c3ed2f3e414497ab3cf6ade17e52a87f07a547e6 Author: Bjoern A. Zeeb AuthorDate: 2026-02-24 23:12:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-24 23:12:46 +0000 qoriq / nxp: Fix spelling take II Fix spelling of NXP, which is not NPX, in two places. Improves: a4e30909ec98 Reported by: Kevin Bowling (kevin.bowling kev009.com), qoriq_dw_pci.c MFC after: 3 days --- sys/arm64/conf/std.nxp | 2 +- sys/arm64/qoriq/qoriq_dw_pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/conf/std.nxp b/sys/arm64/conf/std.nxp index b4552fadaff4..367d058bf666 100644 --- a/sys/arm64/conf/std.nxp +++ b/sys/arm64/conf/std.nxp @@ -6,7 +6,7 @@ options SOC_NXP_LS # I2C -device pca954x # NPX I2C bus multiplexer / switches +device pca954x # NXP I2C bus multiplexer / switches device pcf8563 # NXP Real-time clock/calendar device tca64xx # NXP I2C gpio expander device pcf85063 # NXP Real-time clock diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pci.c index 7d51db2a9505..f4ca024c941f 100644 --- a/sys/arm64/qoriq/qoriq_dw_pci.c +++ b/sys/arm64/qoriq/qoriq_dw_pci.c @@ -176,7 +176,7 @@ qorif_dw_pci_probe(device_t dev) if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) return (ENXIO); - device_set_desc(dev, "NPX Layerscape PCI-E Controller"); + device_set_desc(dev, "NXP QorIQ Layerscape PCI-E Controller"); return (BUS_PROBE_DEFAULT); } From nobody Wed Feb 25 01:24:05 2026 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 4fLH1L1gxJz6TVJK; Wed, 25 Feb 2026 01:24:06 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLH1L03Qsz3Vm4; Wed, 25 Feb 2026 01:24:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771982646; h=from:from:reply-to:subject: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=jP7ztwe26VZ2jvmvFaOP9fAmrWLOpBeq24VI27hIbsk=; b=i933i4WiCspUtXsPe7nSAb0fQR6Vqp/+U8B6NHvkRWUSz3KQSCNY4QPRaSitaq5s7eofMk OvoHw+aHvI1Zt2JhTXhiwF9USXfSRWhEPK0Ku0sbB5VX8YMBBtlbeDvbA7lnZmT2qtVfjf fXVsebgMpKnTVl6sO8Mzs7yNJQsLDjFfdo2PINjf4jv5Dzpo/0ygH8aW1e8fEU2HNtirVh CvkeLSVe2fpSmPAytjfcawRBhXKBizqP1a/Xaf95QzmNLO9qfUz1WxWX0PlhQ0CpiCZaVb 5TvzPtXNOVieKDnltv9Rx/N4sBo67wo6k7L/F+NMws7N9VBCGFEJb8oqo756EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771982646; a=rsa-sha256; cv=none; b=mWB/Hv31kATJP1vZas3aS6o0wChCn3oVIo8hk4u51DiaY6AwUPoFv+r7aJKm6sGBQ7tP0M kJZ2A4l0G0RRENmldZjAJjG/FmbT/cXiobtugLQ6Gxb9M5il5n7Y5kdRew408HDaStpNTh rnJ9U4dUtd89L4Qcs5XNaCsVWxxu91XzPXL3ZwkiiXNPJ+c2CBpY4WXGye7iK3RgN4J9AG L3h5fHihG38GaJWHv9GkHXK1If6oM/k3M8z7P8qnMq4fdU7N0h2K5NI3r+xt+WrNVMr2op DVbpQwsGYYdDJn9/QsaK405tdGuuq4P9lhGwjTPQTQbh3edxPiVXkt9KOgNYAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771982646; h=from:from:reply-to:subject: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=jP7ztwe26VZ2jvmvFaOP9fAmrWLOpBeq24VI27hIbsk=; b=aQanWda1iQIXXafqTNYa8ZE3X7WZSYbyVfbTFWe7WC7j3XMouN3VJ6jFlCWlVIVgPxR4/j KmyG9vuNuJuAIdfmM5qol3cxTDUy08cv7VO5elSUQoguuHBsvEpOIq+gm8sNOCkBXd714P zjhXkIrRe6MEyYXzoXG9SlHVcekJyRzbQepOV8u8TsiZSeOagr48lzie8HDftUnQ4q7w4l X6uClyuHky80TutFlmM3zwYIkawcwup3bbOYzcXGmVvwWkGzAwJODW4vIHVZcGewlg1sa7 EU8800hvHp2HlZAesPfF92kWAQE8W0jyn3mWIFvxMLOVy6HpudIdfXhubMGcIw== Received: from [IPV6:2601:5c0:4202:5670:b946:cabf:47b1:71cf] (unknown [IPv6:2601:5c0:4202:5670:b946:cabf:47b1:71cf]) (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 4fLH1K5Fn1z148w; Wed, 25 Feb 2026 01:24:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Tue, 24 Feb 2026 20:24:05 -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: 5edf24aac1d0 - main - ofed: reduce usage of struct dma_attrs *dma_attrs Content-Language: en-US To: "Bjoern A. Zeeb" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <699e2185.37782.5dbfa03b@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <699e2185.37782.5dbfa03b@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/24/26 17:09, Bjoern A. Zeeb wrote: > The branch main has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=5edf24aac1d0978d37d62594f42d87c9f118622b > > commit 5edf24aac1d0978d37d62594f42d87c9f118622b > Author: Bjoern A. Zeeb > AuthorDate: 2026-02-19 23:12:29 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2026-02-24 22:04:36 +0000 > > ofed: reduce usage of struct dma_attrs *dma_attrs > > ib_verbs.h still uses struct dma_attrs *dma_attrs everywhere. > It is beyond my knowledge when that struct got deprecated upstream but > it is still supported by our LinuxKPI. The problem is that the > functions called with that argument (dma_map_single_attrs, > dma_unmap_single_attrs, dma_map_sg_attrs, dma_unmap_sg_attrs) so far > are #defines in LinuxKPI and drop the last argument (attrs) so it was > never a problem. > > In preparation to pass the attrs to the actual implementation in LinuxKPI, > which has gained support for them, we now pass dma_sttrs->flags which > is the expected unsigned long bit field. > > If anyone has serious interest in updating our ofed implementation they > could look into this some more and remove the usage of struct dma_attrs > entirely. I already have. It's buried in this branch that I still need to get wider testing (and I'm not sure yet I've backported all the things I need): https://github.com/freebsd/freebsd-src/compare/main...bsdjhb:freebsd:ofed_backports Notably, early in the branch are these two commits: https://github.com/freebsd/freebsd-src/commit/a4583c049091d6468593fb04c1fc23c18195666f (cherry-pick of an old Linux commit) and then: https://github.com/freebsd/freebsd-src/commit/788fb6bf0e6f3aa33aaf7dba362c44f1092a3559 -- John Baldwin From nobody Wed Feb 25 01:34:12 2026 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 4fLHF10cRBz6TWNY for ; Wed, 25 Feb 2026 01:34:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLHF05f3Rz3WHr for ; Wed, 25 Feb 2026 01:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771983252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=28UFiieHDv4VASc5H502dLitRuJjP23BdI2luf0oAUY=; b=b8LA31tlTFFC6PMkVKRYIU5wIz78mbgM+qY+ESdHpT62/+/wCy1aqe3w7zhVvdm4cZzVUL JgoBsnxBmJVGsSVUfepyEK92Tz77hvXgoIUqTCLsvEsnoD2lsYIg5ILd4dT5tpnG9BA4BR qVT/tuAZV7bTnL0O9tqteX0m9idFDlJTfv/kwE4ZMQ5hZ2MKJFfhqpGLBTkpH1kdjx8O3f tjT5B3CMXHRlcLgurge/N/5dtiO4u0sCBzr2DUfv58T1d18rplQ0mpMaVPeFNOKcIkUupd 8Y45BKyNxkGLWbO1JmgtxsS6ucAfVlQ/nSJsP3hozQvZMP0QRRYSv9ZE+lo6Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771983252; a=rsa-sha256; cv=none; b=o1kKefPc92ZFbqTowCUoMG4jXMjsc+7Iq/6/gpn5cLcs6a7ESTf4g9QSey9/OM5epSvWWh 2VkvZytP0qAAPLt6b3GC23PhxKrPsEoGSRepjODE9922VR6Vt3qt9TolLk3oAG7KBk5SOq SnCoDNXZ5FJS/hl3q3kkBFxdPUBXctraGlnK8pIpB8lfkNrQ6DVeA/SxMAjYHYW2TJ/31o v6NtaAPC5T7p5mP3D5mrBPedp70rjrczIHrg7Jr/ZSDPQoBc4hKrtc4TITao1Brd/8LHaF Ld2C69c61DehaxINNRc1Be+p41r4knD7Ii/SLLCIDo6I2fzjXJnBVdaAK3VElA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771983252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=28UFiieHDv4VASc5H502dLitRuJjP23BdI2luf0oAUY=; b=j5KIpy/71OxpTNuvdtlrTPdHClt1KzXP5HHDZZx4f17UT0aS0bxw5o0ZBzWF2n0l/tMxzr cHmeZ9i99pYxZzDN9l1MdSMdBNknrJEWNhgMAWU2NaLrf/0apshyEL4pNzEsaywCex0UZs x4RlDRtsbIW5bPmsk71nW3k6Ajh+xje9lE+TNPq9/nxureG63pA9p6ds6tU7VrL1P98yrB YqfW+buQF+fNj5tB5OXGsAf9JzrcIo3/r+5XzV7/QB765ckFlqY/RoJnmvJvu1seNOegSu 5dhkE9Im1c+cvui1G8rSj5HONk8x3DUg+ZwxyCCQ7h/3ANMPwFb6rPq05LK37g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLHF05DszzhhK for ; Wed, 25 Feb 2026 01:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19ff5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 01:34:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ef1218add1d3 - main - kern/sched_shims.c: back to ifunc 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: ef1218add1d3d2baca9d3b8bcfb57e05ef6fc503 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 01:34:12 +0000 Message-Id: <699e5194.19ff5.64ba5c6f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ef1218add1d3d2baca9d3b8bcfb57e05ef6fc503 commit ef1218add1d3d2baca9d3b8bcfb57e05ef6fc503 Author: Konstantin Belousov AuthorDate: 2026-02-24 15:36:26 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-25 01:33:52 +0000 kern/sched_shims.c: back to ifunc Reported by: kevans Reviewed by: kevans, mhorne Fixes: 0d3652f67d246348e2c017205c6782caf4484449 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differrential revision: https://reviews.freebsd.org/D55490 --- sys/kern/sched_shim.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/sched_shim.c b/sys/kern/sched_shim.c index 2b1dcecda433..6f0473084704 100644 --- a/sys/kern/sched_shim.c +++ b/sys/kern/sched_shim.c @@ -23,10 +23,9 @@ const struct sched_instance *active_sched; #define __DEFINE_SHIM(__m, __r, __n, __p, __a) \ - __r \ - __n __p \ + DEFINE_IFUNC(, __r, __n, __p) \ { \ - return (active_sched->__m __a); \ + return (active_sched->__m); \ } #define DEFINE_SHIM0(__m, __r, __n) \ __DEFINE_SHIM(__m, __r, __n, (void), ()) From nobody Wed Feb 25 02:09:54 2026 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 4fLJ2F4zdTz6TZfh; Wed, 25 Feb 2026 02:09:57 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLJ2F44JJz3bYr; Wed, 25 Feb 2026 02:09:57 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771985397; 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=Hzi8lzn2GEysrMxzaKbzpKWkC9OKJ55tZ7QB3T/9qoo=; b=rrnI5SlWAsYqJzPUYo2S/QWzwRgLJ+DqSZorELpJ2G7wCZjnGMDPTX36h4305hFE71wtuI 1QMEQdaannnuavP5I7mKmPxRRY4Ma7QUtClbMb3l8ONk4CYIO6Misviyg8n0Oo4qy/VDZA core4b7tcqJuWM9oBAnz92hKOMfJUrIh1Rq9RFz0Rb4YSkJKuScdOZOBiIZyUWK/MtBAN6 7HTYxtRC+USR8+dR6I8axLx3eWIPEHMPUXL1CiqgWdfuTSUPAagxCMc305BHgjUIs6x/TH CucBMIY8ZnyiY5Dk4QyFT4x7iq1Jw/khfaqImzCRBn6joshJXIMPs1u8T/xNMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771985397; a=rsa-sha256; cv=none; b=ArldPEG2YB2+cdX/SnaD/zbel8FqkIz49b4U5jyEi0p+MOb/mZX1P/8xexYR/7ek2bkRX+ HnSHvCe0fY/+HRChSyhk+wD6M9pHynO/UhoXLrOBFEWTWAfqbnFw9lNimbNCgIFNs8UmH+ ON21jshrhmh1g7sgUalvK/PqZZLD3Eps8Jze9jeOKkw3GkrrJjwCVoDVWNOsRL23v514E8 tWVXA5m6cMfMYavWzWv8kZwOmjJ/q7F5CnBDKI7GXPavaCVelA3T6Bs5SQ/Zw7J+G2KqdU rM0TRMjBv/LvLRiFcC7tTpCW9EXHk7SCThj+F9WQSSFjL03PbcqgNzkIozTlOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771985397; 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=Hzi8lzn2GEysrMxzaKbzpKWkC9OKJ55tZ7QB3T/9qoo=; b=MBe+xXNqkiXnx4VKHYibs+ee8QcXd6oqs/LXKBrg79dj2FZD5TI01+UJ4MI042GT73N+xa V4y4gHXKoz/QPVJXcqQshyTVrdZG1deKWckM3fedY8Gm98K2UjdNugJINMc/CT9PU147xx iFMEgsYPHk2EDSEMASgOAorcAzCXO+jIBnijaIf/WCfRErutHx88IJ/uQ5tBkpIfCeNTMC RdAP/p9//Mp76AIY/e4bM272f4aUmGa7h8XvRY0HZyCyTK9NcG9uIyCLxR1F/6HnoQuJJs 7qRVckmr2TxLVc0qAObn7XxAgApXas73e1+K5Jgcx8bXREYd5MQixk/Iz0x+oQ== Received: from mx-01.divo.sbone.de (legacy1.sbone.de [80.151.10.34]) (using TLSv1.3 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 "E7" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fLJ2F2QTMz143C; Wed, 25 Feb 2026 02:09:57 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.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 E8FE3A64808; Wed, 25 Feb 2026 02:09:36 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id A8B4F2D029D8; Wed, 25 Feb 2026 02:09:55 +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 9VZQORp6rFJE; Wed, 25 Feb 2026 02:09:54 +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 377B62D029E8; Wed, 25 Feb 2026 02:09:54 +0000 (UTC) Date: Wed, 25 Feb 2026 02:09:54 +0000 (UTC) From: "Bjoern A. Zeeb" To: John Baldwin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 5edf24aac1d0 - main - ofed: reduce usage of struct dma_attrs *dma_attrs In-Reply-To: Message-ID: References: <699e2185.37782.5dbfa03b@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 On Tue, 24 Feb 2026, John Baldwin wrote: > On 2/24/26 17:09, Bjoern A. Zeeb wrote: >> The branch main has been updated by bz: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=5edf24aac1d0978d37d62594f42d87c9f118622b >> >> commit 5edf24aac1d0978d37d62594f42d87c9f118622b >> Author: Bjoern A. Zeeb >> AuthorDate: 2026-02-19 23:12:29 +0000 >> Commit: Bjoern A. Zeeb >> CommitDate: 2026-02-24 22:04:36 +0000 >> >> ofed: reduce usage of struct dma_attrs *dma_attrs >> ib_verbs.h still uses struct dma_attrs *dma_attrs everywhere. >> It is beyond my knowledge when that struct got deprecated upstream but >> it is still supported by our LinuxKPI. The problem is that the >> functions called with that argument (dma_map_single_attrs, >> dma_unmap_single_attrs, dma_map_sg_attrs, dma_unmap_sg_attrs) so far >> are #defines in LinuxKPI and drop the last argument (attrs) so it was >> never a problem. >> In preparation to pass the attrs to the actual implementation in >> LinuxKPI, >> which has gained support for them, we now pass dma_sttrs->flags which >> is the expected unsigned long bit field. >> If anyone has serious interest in updating our ofed >> implementation they >> could look into this some more and remove the usage of struct >> dma_attrs >> entirely. > > I already have. It's buried in this branch that I still need to get wider > testing (and I'm not sure yet I've backported all the things I need): > > https://github.com/freebsd/freebsd-src/compare/main...bsdjhb:freebsd:ofed_backports > > Notably, early in the branch are these two commits: > > https://github.com/freebsd/freebsd-src/commit/a4583c049091d6468593fb04c1fc23c18195666f > (cherry-pick of an old Linux commit) Thank you! > and then: > > https://github.com/freebsd/freebsd-src/commit/788fb6bf0e6f3aa33aaf7dba362c44f1092a3559 Ah nice. You made me check when this happend upstream and I found 00085f1efa387 . Seems this was v4.8 so that should not be a problem to ditch dma-attrs.h then :) Thank you! I'll be happy to help review changes if needed, especially for all things concerning LinuxKPI (or in case you hit that netdevice). /bz -- Bjoern A. Zeeb r15:7 From nobody Wed Feb 25 02:21:28 2026 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 4fLJHX4MKNz6TbhN for ; Wed, 25 Feb 2026 02:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLJHX3WScz3d4q for ; Wed, 25 Feb 2026 02:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771986088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K4s/jlol5i+2AJopXoRsD0e5Sl6ma33HEbkhfHTUk9o=; b=dV+Kl+dApKEndCZY+90e39BEiQx5cqd/TIKn7HRS2p26UJE7G/cy/RajeEoWjB5qiAY5cu x9ecn1k1y8PFnhy7MVI+rUSsF1NazViZqKo6r6lvnJON9Gqt6WTbmDDMuDw5em6DZZC+Gh zsn8VZH6UhjHnGt8F/X+QsYcQupJPErWWDIntTlp83XJw9qbByF2bMXwEeqgqTQBn4BDBf H1Tp5Dtfs3uT3ANvDGQ5x1LrMh+iiysWiPSScN2zBP5Hv018MlSAwsAC0StBSlcfogcy4H l4QA35vZM2ZVQXCUKNvjZKnZBtAtZC7+fcfUI1KaYSMvnX3WonksdmMiPMI4fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771986088; a=rsa-sha256; cv=none; b=ullY/4AhVCapgAnGaXcs8hQFGoGqoYkDY2WeLLpoyU9Od3Ouj/c68AJ/tqNecx/sLsaSlN 8s0ebvz/Ywp8Relkozm2ePHC+ApfusG3j3kmWVs9Ns3g0Y354oCDYkm/TvYxBGPYzJL1NB URcalC8bjQUHvEnModqqauYyQ08mQnHokbl7QSsTgO7oCetg0Wccvhwbv7oewkc17fQE7+ Y1kBesrh0rfGhwkuXCecQsvrnU8LjP0No4z3zWhOp4bpB3osiNi/8L/EqjpXPWmT2POM6P Ey8i3uIfPWK7mP8xoYsgciOCfqYidX25h+35187k64vwj8IdBF95ahmuyi2C5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771986088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K4s/jlol5i+2AJopXoRsD0e5Sl6ma33HEbkhfHTUk9o=; b=wnGUa17Ck/pIA/LBsXSRLZN7tnaQc5vNj2wytZyzI+BddRb75Lk7aSLU4txMcTi4CFOGL8 Lx8zJPwhqOhq6aDdI+mp4pTZZpGlO36aBX7Gu9XcNV8FLY1XXO4USDkb3NxYD1AZAw33F2 P4U4VFh0AvhPZ5l4h319wuE/Udueaa2WJRDiNHqkQT/P87lELSRgKQAeUW9Ci78XWygYa6 4Ih0MzcXLbfu0QN6k0YendlAH90kuzZvkP38Uk03SG0aZ6WmzbQiySlThSxBT36jVUEIjS rQkTMr51LjrjG6kG3IfFYdw3ChbPKPGJJ/KxTZu1f8N+EtGVWZo11GFA927YDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLJHX34VHzjmm for ; Wed, 25 Feb 2026 02:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21c2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 02:21:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6513c2845f89 - main - sys: Declare 'end' as an extern char[] 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: 6513c2845f8912c30749cf64704d3dfeeeb9a47a Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 02:21:28 +0000 Message-Id: <699e5ca8.21c2d.1aa79159@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6513c2845f8912c30749cf64704d3dfeeeb9a47a commit 6513c2845f8912c30749cf64704d3dfeeeb9a47a Author: John Baldwin AuthorDate: 2026-02-25 02:20:59 +0000 Commit: John Baldwin CommitDate: 2026-02-25 02:20:59 +0000 sys: Declare 'end' as an extern char[] While here, remove an unused declaration. Reviewed by: jrtc27 Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D53898 --- sys/arm/arm/machdep.c | 2 -- sys/arm/arm/machdep_boot.c | 2 +- sys/arm64/arm64/machdep_boot.c | 2 +- sys/riscv/riscv/machdep.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index 60d63cebca3d..1cd016f62e1b 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -120,8 +120,6 @@ vm_offset_t vector_page; /* The address at which the kernel was loaded. Set early in initarm(). */ vm_paddr_t arm_physmem_kernaddr; -extern int *end; - #ifdef FDT vm_paddr_t pmap_pa; vm_offset_t systempage; diff --git a/sys/arm/arm/machdep_boot.c b/sys/arm/arm/machdep_boot.c index 9bb1f0ccae91..6ad3f9d744b3 100644 --- a/sys/arm/arm/machdep_boot.c +++ b/sys/arm/arm/machdep_boot.c @@ -69,7 +69,7 @@ static char static_kenv[4096]; #endif -extern int *end; +extern char end[]; static uint32_t board_revision; /* hex representation of uint64_t */ diff --git a/sys/arm64/arm64/machdep_boot.c b/sys/arm64/arm64/machdep_boot.c index 0ccfd1b67a39..742622879f56 100644 --- a/sys/arm64/arm64/machdep_boot.c +++ b/sys/arm64/arm64/machdep_boot.c @@ -53,7 +53,7 @@ #include #endif -extern int *end; +extern char end[]; static char *loader_envp; #ifdef FDT diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 0214426eea18..3f454bdb1c8f 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -118,7 +118,7 @@ uint32_t boot_hart = BOOT_HART_INVALID; /* The hart we booted on. */ cpuset_t all_harts; -extern int *end; +extern char end[]; static char static_kenv[PAGE_SIZE]; From nobody Wed Feb 25 02:21:27 2026 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 4fLJHc6xMPz6Tbn1 for ; Wed, 25 Feb 2026 02:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLJHc4VZbz3dYS for ; Wed, 25 Feb 2026 02:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771986092; 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=RMnO6zoN6sCMrAAFgnh5gZT4K4FG94QON/ngxCj5BKM=; b=gdx3yac0z6P+mJ3c416vcsrkoq0rXdpRZWKkgsHpoN8QzKrto+/0V0EML643M0jxbbxcAo tC9UzPbZ1tBBn4ji6EOkIw8jff1Qqvf7g601yYAEit6iYnEZnge8JSmRPgE3NuOZTE2Y+m ltOXuXBLsB4Q7fxO0WqDM1M+RFmXzzHUcfe+fKwFHkO1fX5pmTKD/zi5SERzW9FfGY2eHq 5+p6HN0jHRjuLvHCpgiT9LpGNS8+PM4jlrslEPn0od2ySQfxDRfPYjJirqYR9B3UL2Lhag shmx2PjsG6cDGAnNpxR1/T+jojVZ3oXxwXd+w50zrUuwTy8CtWYSNyMLFrz7vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771986092; a=rsa-sha256; cv=none; b=TR7snPi7b0+vJqBfYg+b6TCYifD1JooQmyDjudWludnsfza8sz8lBHQqiH6uEOQ/iwQBOv 5ez1ZeC9LAkqLXSfRtfnQcCfXjdS6Ztu6p2dQf7LNBQ3yBwlvYDE3w9P0gN3qFf3lONUyX oc2wsui3NtufRSfc6apK4TACFVv4ueMYySIV/bItFvCV6wZbI7jfl1cbwNeZ6g6TeIQ7pq l184drEg4dcMmXTlm/w7ixP41oiwFeZ9C+QGRkxA/zjLChkuBqZvvDvaA7zH3xTPSFIyZa MzK0oA4kS56gacsDw0sF2eE0P2ciPgb6D9keDAZxIcT6gOZM0Hax4zc9M9c7Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771986092; 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=RMnO6zoN6sCMrAAFgnh5gZT4K4FG94QON/ngxCj5BKM=; b=X3q0hOla2elIrAips8GXC6zM4PRwDgxoyoN0nCS5jJT41zU+Uil1Z1xI8pg7DvHsL9dQLB q/Xy0PaaxQXxe+8znBHoE2tpwdkIR7wskolSWqqWqxwJDr6bzoHGGRpQ3rLXnu5VO19FLE sCNYUtwncdmJRGel1pjyht141VB4GbCHmoFu4hIXDcC+WevfKVpK4V548LPFPwLKJkZ2BS GaLij6hMSQiFE7GWlmOGj1iKwFfQrIhSX9i87A4YRmhj7WBcCYHGAN+1ajmbhsl0KF4yTC C7dB+bGeZLXeM5W9Bx/Y/lwqCJus+VDzC2Pde242Q8gZ5wWQgfyxzzuSfrDrKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLJHc3lhSzjqM for ; Wed, 25 Feb 2026 02:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2034b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 02:21:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Marcin Cieslak From: John Baldwin Subject: git: fba56be09f1c - main - Do not fail 'devctl clear driver' if another driver is not found 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: fba56be09f1c344cc5805b898fbfef6066950942 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 02:21:27 +0000 Message-Id: <699e5ca7.2034b.4e9ac9e0@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fba56be09f1c344cc5805b898fbfef6066950942 commit fba56be09f1c344cc5805b898fbfef6066950942 Author: Marcin Cieslak AuthorDate: 2026-02-25 01:58:59 +0000 Commit: John Baldwin CommitDate: 2026-02-25 01:58:59 +0000 Do not fail 'devctl clear driver' if another driver is not found Detaching the bhyve(4) ppt driver from an unsupported PCI device should not raise a "Device not configured" error. We do not expect that a new driver must take over the device in this case. Reviewed by: imp, jhb Differential Revision: https://reviews.freebsd.org/D52050 --- lib/libdevctl/devctl.3 | 3 ++- sys/kern/subr_bus.c | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/libdevctl/devctl.3 b/lib/libdevctl/devctl.3 index c8a4704825c2..94fe350e524b 100644 --- a/lib/libdevctl/devctl.3 +++ b/lib/libdevctl/devctl.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 4, 2019 +.Dd February 24, 2026 .Dt DEVCTL 3 .Os .Sh NAME @@ -193,6 +193,7 @@ is true, the device will be detached from its current device driver. After the device's name is reset, it is reprobed and attached to a suitable device driver if one is found. +If no suitable device driver is found, no error is reported. .Pp The .Fn devctl_rescan diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index c9d64e3674c6..b5c1c5b61f60 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -5961,7 +5961,19 @@ devctl2_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, dev->flags &= ~DF_FIXEDCLASS; dev->flags |= DF_WILDCARD; devclass_delete_device(dev->devclass, dev); - error = device_probe_and_attach(dev); + + /* + * Don't use device_probe_and_attach so that failing + * to find a new driver isn't reported as an error. + */ + error = device_probe(dev); + if (error == ENXIO) { + error = 0; + break; + } + if (error == 0) { + error = device_attach(dev); + } break; case DEV_RESCAN: if (!device_is_attached(dev)) { From nobody Wed Feb 25 02:24:05 2026 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 4fLJLZ12xfz6TcWC for ; Wed, 25 Feb 2026 02:24: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLJLZ0QWhz3fNt for ; Wed, 25 Feb 2026 02:24:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771986246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sXIsiDLs9MZebfc0p4toXHHkUtBk9Od6rhpjmhGn9Ig=; b=mjinFCMEw9ev2HXwcZA9FvLN2BJlsYjaQLXOCCkJZP8VmDW7ko1rgfAe8LQ3/XwyGTbhGb 04nfJtE8cKBOASLTbuQll7bbUjKzF0QflvJBZuJdjrUDIXX1Idz8dp73UuLGkkBBq6tBLk 5huMhxs9eghIcIV6knvDEH9SoS2r8fSQQWhJR7u2p8QDp+SlYSrd9nNqIIOlMp/UjOPl9B 3BBxKRku/MAXjPFiQD5Z92QlVVDR4lSFsVLaIqLukmtnPXMNAKbWGTZqfZTskFBlgvT2SN 9ZMTdjewMxDK7Rvgya/xhHC0SZMkSwcGGxQm1ndruVPxsmMqTm7jM5wHSH40Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771986246; a=rsa-sha256; cv=none; b=eqFm6MAjWztiYuXnIBQ3A9jUU4BwYUDQn+p4lL0Ihpreq52zRtd0O51vwBVkccDr38SWS6 9Z91kG3UlrR6Z0BfJpr9XgauY+dZDpzsaNgZzw56n1pkX+RjFI7wtFpRYdD7BcAyC+CX1Z +IW7VuSCD9TepA3CZq5eyURYJT/HGXGnB6n4DR66OaDC/iZS8fpVak0oDcrFm4tnP8Q3vU iWJNU776jnrmrRkdEMQWY0QY2zquqeduwzGe5exBtI4s8V3J8STYlfWH8NGBQcYyDRX2+F 70uMtc2FiJ9GXFjzQK/Ixv9a3g0MX2760BBZ9S9E9Wj5g6IKPEJNq7e+USKqHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771986246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sXIsiDLs9MZebfc0p4toXHHkUtBk9Od6rhpjmhGn9Ig=; b=VelTqQFaoex4RhNl17SjcJmDMFdgdX2FjX0c+rCwpn9dk14wfJl0TCK83K/yIbAFKUjywP zdPlwCktB1aHUdYA+NPtHlfpY1SvVI4Wd4fzdikDXKnrhL/PVqgKU9ANBLxgr0yiwcvV76 YJge9+j6KmmTcD9MUaWbX91r+FaMuzmoMvPRLl35RsGqfkIdP+pgXVAH5IeZ74Qzy4gL98 iEUircroVcF/t5jCCdGorICth3DQmMR2xygHbd99E9WusIqtpPJMIVN9Oj8u2MxSgf+4mA KxVO8JRT0k9rp9WMc8y2o0FzFUAvDKoJFNT1fjLzFg2xsz3PchegLjlcrTqFFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLJLY6wF9zk1q for ; Wed, 25 Feb 2026 02:24:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21a33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 02:24:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e43730e585fa - main - cxgbe tom: Use the same WRs as iSCSI to send PDUs for NVMe 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: e43730e585fab3385c5b774b83e95e16c984dacc Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 02:24:05 +0000 Message-Id: <699e5d45.21a33.29061bdf@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e43730e585fab3385c5b774b83e95e16c984dacc commit e43730e585fab3385c5b774b83e95e16c984dacc Author: John Baldwin AuthorDate: 2026-02-25 02:23:39 +0000 Commit: John Baldwin CommitDate: 2026-02-25 02:23:39 +0000 cxgbe tom: Use the same WRs as iSCSI to send PDUs for NVMe Reviewed by: np (earlier version) Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D55470 --- sys/dev/cxgbe/tom/t4_cpl_io.c | 112 +++++------------------------------------- 1 file changed, 13 insertions(+), 99 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index 5c39ae5fa8f3..7e1c497240c2 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -496,9 +496,6 @@ t4_close_conn(struct adapter *sc, struct toepcb *toep) #define MIN_ISO_TX_CREDITS (howmany(sizeof(struct cpl_tx_data_iso), 16)) #define MIN_TX_CREDITS(iso) \ (MIN_OFLD_TX_CREDITS + ((iso) ? MIN_ISO_TX_CREDITS : 0)) -#define MIN_OFLD_TX_V2_CREDITS (howmany(sizeof(struct fw_ofld_tx_data_v2_wr) + 1, 16)) -#define MIN_TX_V2_CREDITS(iso) \ - (MIN_OFLD_TX_V2_CREDITS + ((iso) ? MIN_ISO_TX_CREDITS : 0)) _Static_assert(MAX_OFLD_TX_CREDITS <= MAX_OFLD_TX_SDESC_CREDITS, "MAX_OFLD_TX_SDESC_CREDITS too small"); @@ -546,46 +543,6 @@ max_dsgl_nsegs(int tx_credits, int iso) return (nseg); } -/* Maximum amount of immediate data we could stuff in a WR */ -static inline int -max_imm_payload_v2(int tx_credits, int iso) -{ - const int iso_cpl_size = iso ? sizeof(struct cpl_tx_data_iso) : 0; - - KASSERT(tx_credits >= 0 && - tx_credits <= MAX_OFLD_TX_CREDITS, - ("%s: %d credits", __func__, tx_credits)); - - if (tx_credits < MIN_TX_V2_CREDITS(iso)) - return (0); - - return (tx_credits * 16 - sizeof(struct fw_ofld_tx_data_v2_wr) - - iso_cpl_size); -} - -/* Maximum number of SGL entries we could stuff in a WR */ -static inline int -max_dsgl_nsegs_v2(int tx_credits, int iso, int imm_payload) -{ - int nseg = 1; /* ulptx_sgl has room for 1, rest ulp_tx_sge_pair */ - int sge_pair_credits = tx_credits - MIN_TX_V2_CREDITS(iso); - - KASSERT(tx_credits >= 0 && - tx_credits <= MAX_OFLD_TX_CREDITS, - ("%s: %d credits", __func__, tx_credits)); - - if (tx_credits < MIN_TX_V2_CREDITS(iso) || - sge_pair_credits <= howmany(imm_payload, 16)) - return (0); - sge_pair_credits -= howmany(imm_payload, 16); - - nseg += 2 * (sge_pair_credits * 16 / 24); - if ((sge_pair_credits * 16) % 24 == 16) - nseg++; - - return (nseg); -} - static inline void write_tx_wr(void *dst, struct toepcb *toep, int fw_wr_opcode, unsigned int immdlen, unsigned int plen, uint8_t credits, int shove, @@ -613,35 +570,6 @@ write_tx_wr(void *dst, struct toepcb *toep, int fw_wr_opcode, } } -static inline void -write_tx_v2_wr(void *dst, struct toepcb *toep, int fw_wr_opcode, - unsigned int immdlen, unsigned int plen, uint8_t credits, int shove, - int ulp_submode) -{ - struct fw_ofld_tx_data_v2_wr *txwr = dst; - uint32_t flags; - - memset(txwr, 0, sizeof(*txwr)); - txwr->op_to_immdlen = htobe32(V_WR_OP(fw_wr_opcode) | - V_FW_WR_IMMDLEN(immdlen)); - txwr->flowid_len16 = htobe32(V_FW_WR_FLOWID(toep->tid) | - V_FW_WR_LEN16(credits)); - txwr->plen = htobe32(plen); - flags = V_TX_ULP_MODE(ULP_MODE_NVMET) | V_TX_ULP_SUBMODE(ulp_submode) | - V_TX_URG(0) | V_TX_SHOVE(shove); - - if (toep->params.tx_align > 0) { - if (plen < 2 * toep->params.emss) - flags |= F_FW_OFLD_TX_DATA_WR_LSODISABLE; - else - flags |= F_FW_OFLD_TX_DATA_WR_ALIGNPLD | - (toep->params.nagle == 0 ? 0 : - F_FW_OFLD_TX_DATA_WR_ALIGNPLDSHOVE); - } - - txwr->lsodisable_to_flags = htobe32(flags); -} - /* * Generate a DSGL from a starting mbuf. The total number of segments and the * maximum segments in any one mbuf are provided. @@ -1300,7 +1228,7 @@ write_nvme_mbuf_wr(struct toepcb *toep, struct mbuf *sndptr) { struct mbuf *m; const struct nvme_tcp_common_pdu_hdr *hdr; - struct fw_v2_nvmet_tx_data_wr *txwr; + struct fw_ofld_tx_data_wr *txwr; struct cpl_tx_data_iso *cpl_iso; void *p; struct wrqe *wr; @@ -1330,29 +1258,16 @@ write_nvme_mbuf_wr(struct toepcb *toep, struct mbuf *sndptr) return (wr); } - /* - * The first mbuf is the PDU header that is always sent as - * immediate data. - */ - imm_data = sndptr->m_len; - iso = mbuf_iscsi_iso(sndptr); - max_imm = max_imm_payload_v2(tx_credits, iso); - - /* - * Not enough credits for the PDU header. - */ - if (imm_data > max_imm) - return (NULL); - - max_nsegs = max_dsgl_nsegs_v2(tx_credits, iso, imm_data); + max_imm = max_imm_payload(tx_credits, iso); + max_nsegs = max_dsgl_nsegs(tx_credits, iso); iso_mss = mbuf_iscsi_iso_mss(sndptr); - plen = imm_data; + plen = 0; nsegs = 0; max_nsegs_1mbuf = 0; /* max # of SGL segments in any one mbuf */ nomap_mbuf_seen = false; - for (m = sndptr->m_next; m != NULL; m = m->m_next) { + for (m = sndptr; m != NULL; m = m->m_next) { int n; if (m->m_flags & M_EXTPG) @@ -1440,13 +1355,13 @@ write_nvme_mbuf_wr(struct toepcb *toep, struct mbuf *sndptr) if (iso) wr_len += sizeof(struct cpl_tx_data_iso); if (plen <= max_imm && !nomap_mbuf_seen) { - /* Immediate data tx for full PDU */ + /* Immediate data tx */ imm_data = plen; wr_len += plen; nsegs = 0; } else { /* DSGL tx for PDU data */ - wr_len += roundup2(imm_data, 16); + imm_data = 0; wr_len += sizeof(struct ulptx_sgl) + ((3 * (nsegs - 1)) / 2 + ((nsegs - 1) & 1)) * 8; } @@ -1460,7 +1375,7 @@ write_nvme_mbuf_wr(struct toepcb *toep, struct mbuf *sndptr) credits = howmany(wr->wr_len, 16); if (iso) { - write_tx_v2_wr(txwr, toep, FW_V2_NVMET_TX_DATA_WR, + write_tx_wr(txwr, toep, FW_ISCSI_TX_DATA_WR, imm_data + sizeof(struct cpl_tx_data_iso), adjusted_plen, credits, shove, ulp_submode | ULP_ISO); cpl_iso = (struct cpl_tx_data_iso *)(txwr + 1); @@ -1470,16 +1385,15 @@ write_nvme_mbuf_wr(struct toepcb *toep, struct mbuf *sndptr) hdr->pdo); p = cpl_iso + 1; } else { - write_tx_v2_wr(txwr, toep, FW_V2_NVMET_TX_DATA_WR, imm_data, + write_tx_wr(txwr, toep, FW_OFLD_TX_DATA_WR, imm_data, adjusted_plen, credits, shove, ulp_submode); p = txwr + 1; } - /* PDU header (and immediate data payload). */ - m_copydata(sndptr, 0, imm_data, p); - if (nsegs != 0) { - p = roundup2((char *)p + imm_data, 16); - write_tx_sgl(p, sndptr->m_next, NULL, nsegs, max_nsegs_1mbuf); + if (imm_data != 0) { + m_copydata(sndptr, 0, plen, p); + } else { + write_tx_sgl(p, sndptr, NULL, nsegs, max_nsegs_1mbuf); if (wr_len & 0xf) { uint64_t *pad = (uint64_t *)((uintptr_t)txwr + wr_len); *pad = 0; From nobody Wed Feb 25 04:25:08 2026 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 4fLM2D4xTlz6TrYD for ; Wed, 25 Feb 2026 04:25: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLM2D3LjCz3vVm for ; Wed, 25 Feb 2026 04:25:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771993508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vaO+CSBatbqOurAfEGJBraBX9WkM4X8VaF/s+pHon00=; b=RZbhee5vG/V/ME/9EJ/5Ovw7tnPt8uROjUdlN/kCThtNFCMqjXKrFS3KsBPQma7LVxlNLo PiUW6CG6BmdF0ur6yzZMSbH9SwkGPwh1XDv7MygpmoDXSz1BJoaeoJGH8j68nfYsyvWcux ibJ8xj4WmfGxFdAYxlhPoWoWbUMrqaYUd/6RZgdhHn6NTadsmDRa5n89PHZti/GWVBcOAD yCX+L/h8FSeMlUDJnwbag66pESYq1muKP0skMU5IV836qDQXzyNGXEhcfePBwK6VfFRVsa 8beilnnghe1h//02/TFmttmOyxOMH0L2iaXpAqmTUbFWR0W11P7eW3oY2lvH3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771993508; a=rsa-sha256; cv=none; b=KqOUeojgoSuXpJ8XdjUbEiaduKgjo0hZqHqcHl6C+Ke8f7RZDoq6jY1esO6hhytRIX3ir3 r1pjFW4zpnHu2pjIn5cHYL4fstNcAfM08Wk1BE6j7V7N2H7N7mD8C8CvL9I+Dk+0UZcJRw Pj9W7ORqg+1wYRHFGPedvz797fOiO8130iqtpcC60IqvINtnHjfoNVQw00aNFm1bA5lBGa FyPiYcHBDvUW6bInbFGORxu80S95UE59Ym7sudAgEpdnO/h8z+9h3M9BlUB7+vTKI+A6zZ dUSlzCXteszMsRMLGYaE1GgJZO6bQkoPY1RIc2IdMKzIG/gdHbFa2tqWsoGKSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771993508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vaO+CSBatbqOurAfEGJBraBX9WkM4X8VaF/s+pHon00=; b=It/eRAQBXELVj0yKk5AnU7iI+Mh9R76UP0lJU0xoSvKleGew1jMeLLUc/qvvRtVywPknKO UGK+lnPa7qEOF19Sg4xAglFZrwF8S4Y9mSLTGUiBIioDLovJu7/SuOKpHutsbvpxmuhxx9 6MNKFo2vU5evSS6voUlMcBOco5XPxWiuvb3w5K8rrEzY3qtHC0ADTktiXDoLlclC/aEcKS XIWcaht9Vb8+3+q1N276bb2U8Jpxr2YeyxigkAvSBNmhpJ6slsWe0d6ZCe5x58WflfDzxB 0/61SEK++jGayV7Eluea8BSjOqj2ePv7kiNxmAKR8LWcqakB6VLktoWCZ0IxnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLM2D2fLJzmr0 for ; Wed, 25 Feb 2026 04:25:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36f92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 04:25:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: acba7a62b92f - main - LinuxKPI: 802.11: improve crypto debug logging 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: acba7a62b92ff62ca4ae831e9c28fc6ed4f6455a Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 04:25:08 +0000 Message-Id: <699e79a4.36f92.77392ff3@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=acba7a62b92ff62ca4ae831e9c28fc6ed4f6455a commit acba7a62b92ff62ca4ae831e9c28fc6ed4f6455a Author: Bjoern A. Zeeb AuthorDate: 2026-02-25 00:05:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-25 04:24:50 +0000 LinuxKPI: 802.11: improve crypto debug logging Add a log entry to lkpi_ieee80211_iterate_keys() in order to be able to determine if there are still keys available when a driver calls into this (e.g., iwlwifi does before removing the sta to make sure the keys are gone). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 550bd417c529..9693e4eec268 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -7106,6 +7106,14 @@ lkpi_ieee80211_iterate_keys(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *, struct ieee80211_key_conf *, void *), void *arg) { +#ifdef LINUXKPI_DEBUG_80211 + if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) + net80211_vap_printf(LVIF_TO_VAP(VIF_TO_LVIF(vif)), + "%s:%d: lsta %6D added_to_drv %d kc[keyix %u] %p\n", + __func__, __LINE__, LSTA_TO_STA(lsta)->addr, ":", + lsta->added_to_drv, keyix, lsta->kc[keyix]); +#endif + if (!lsta->added_to_drv) return; From nobody Wed Feb 25 04:25:09 2026 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 4fLM2G5Mclz6TrjK for ; Wed, 25 Feb 2026 04:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLM2F75dJz3vW2 for ; Wed, 25 Feb 2026 04:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771993510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMZo1+qrG3qvqXpC1Tkh+iCm4uGpz4RY5ZZ4K/u9hMI=; b=XFzl6XwNaALKiI/iRyCFLzSy54XF6IW9V176ZIxAHzZI0CXDCu94wHUNeDJO591MSXaoX4 TH2nYU4QbkqwLLNysv0vYNt7GbJr+eTi7UGJor+fvOmB38v8dRJoPNgV6R3L/1gED/G188 mLPKScT/Z/4g6yQajIglkY3mfbGMarxGBYWnLlBicuppE1i0dAJL+f2fE3u8FXQ3HxGLop n4vVrQPHTy0eUkpfpoir38sjWN1evt20YeN13ZcNIHKVXnVNyRfrIDYjoYtUvRJZxv4Xmk ZI2PF2+GRv92VSBn+cIl/7rp6zH8SpP85XShxyZ7DnQKUAWsQzOBLSiE9aMsCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771993510; a=rsa-sha256; cv=none; b=IWCz+kWzv37tbB1neXgLrTX8dj/8k9+rr89ETG/kQZyFn3/cBIXmJyIwUk7f8PP7DifA8r KXef/L960joDFbOMvtY2c9BWvrm2GujzKnhsScRw9DiUB2mE2++wTHHfg5GOW1zO2ihYJh i2xLeNXtYuw+OWEniaOl0cwhzvcrXJoaLQqQLWKhJX6rmK5e5TpRmK83ivOrQMH7arRw0D SusiFi5HTQJoi1+IwdeigWREYUHRgwzVQ3ZC/4QSw7gV9lnWhNmVlBJ0dIcDVoo1miVtLY u6IYApjhZBMxIiilocxV8DHg3fc+1A8a1FOFAXf5ir228UsnCqtbiM9qbChk/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771993510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMZo1+qrG3qvqXpC1Tkh+iCm4uGpz4RY5ZZ4K/u9hMI=; b=fyFfbu0kaQfKQUVKbQXUDBeogs9RmZhR+mX6jDSt/C/9PHA2mpptJ8Jyc3w2YGoUy74nsF ZNqDTqk/TxvOexweclYXT20NevlOJish4b90ITgTR+EXhQWKy6EoPV0fGBUwFeFGNqogI7 87k7x9pVl7c8mMoZLFM0JRNPVr+RBqDNRUFI1aqAFt9diqaV+5qQi/bALpKQBZoyipWjUT Pk6L6IkX0+YmXS1YJSgtKh8AibwP6gXAyFtsmjpggNvfJy1U7Y4qVcDQFB0/Ha4b6EpDs+ FrttcOkzQF8igJuYcHMeJzSdxUAOM3C9/K/EqoaKBw3hnQX7mcUy66J0iPKdTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLM2F3HgwzmpG for ; Wed, 25 Feb 2026 04:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f58 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 04:25:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 48f55a49a1d1 - main - LinuxKPI: 802.11: fold the sta state machine again 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: 48f55a49a1d142c616edbc7ee6745dd6b83393e4 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 04:25:09 +0000 Message-Id: <699e79a5.35f58.7f62dd86@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=48f55a49a1d142c616edbc7ee6745dd6b83393e4 commit 48f55a49a1d142c616edbc7ee6745dd6b83393e4 Author: Bjoern A. Zeeb AuthorDate: 2026-02-25 00:13:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-25 04:24:50 +0000 LinuxKPI: 802.11: fold the sta state machine again In and around d9f59799fc3e7 we adjusted the initial sta state machine implementation and unfolded some functions, duplicating code. This version tries to undo some of that as it seems that we can get away with doing it more cleanly these days. There are 5 main functions for the path from INIT to RUN (UP1,2,3.1,3.2,4) and 4 main functions for the path from RUN to INIT (DOWN1,2,3,4). The reason there is one more on the patch up is that we can go directly from AUTH to RUN without going through ASSOC first. In addition there are further functions relying only on these 9 base state change functions in order to implement the remaining possible state transitions net80211 can do (without CSA and SLEEP). Another change is that we no longer take a sta always through INIT/SCAN first and then back up to AUTH, that is, we are no longer deleting the sta from the firmware unless net80211 would also take us down to that state and in a follow-up back up. This is a preparation for another fix to come in order to import a newer version of iwlwifi (v6.19). I have run a few days of mlme_assoc (see tools) and some other basic regression tests. The only thing I managed was to deadlock net80211 for other reasons (ieee80211_waitfor_parent()). But this will need excessive user testing as the various options which may have an effect on the subtle details are great as we learnt in the past years. Sponsored by: The FreeBSD Foundation MFC after: 5 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 834 +++++++++------------------ 1 file changed, 278 insertions(+), 556 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 9693e4eec268..48b87ae47751 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2121,7 +2121,7 @@ lkpi_disassoc(struct ieee80211_sta *sta, struct ieee80211_vif *vif, * The caller is responsible for removing the sta gong to * IEEE80211_STA_NOTEXIST and then executing the * bss_info_changed() update. - * See lkpi_sta_run_to_init() for more detailed comment. + * See DOWN4 for more detailed comment. */ lvif = VIF_TO_LVIF(vif); @@ -2248,13 +2248,17 @@ lkpi_remove_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif) static int lkpi_sta_state_do_nada(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { - return (0); } -/* lkpi_iv_newstate() handles the stop scan case generally. */ -#define lkpi_sta_scan_to_init(_v, _n, _a) lkpi_sta_state_do_nada(_v, _n, _a) +/* UP1 */ +static int +lkpi_sta_init_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) +{ + return (lkpi_sta_state_do_nada(vap, nstate, arg)); +} +/* UP2 */ static int lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { @@ -2579,136 +2583,7 @@ out_relocked: return (error); } -static int -lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) -{ - struct lkpi_hw *lhw; - struct ieee80211_hw *hw; - struct lkpi_vif *lvif; - struct ieee80211_vif *vif; - struct ieee80211_node *ni; - struct lkpi_sta *lsta; - struct ieee80211_sta *sta; - struct ieee80211_prep_tx_info prep_tx_info; - enum ieee80211_bss_changed bss_changed; - int error; - - lhw = vap->iv_ic->ic_softc; - hw = LHW_TO_HW(lhw); - lvif = VAP_TO_LVIF(vap); - vif = LVIF_TO_VIF(lvif); - - LKPI_80211_LVIF_LOCK(lvif); -#ifdef LINUXKPI_DEBUG_80211 - /* XXX-BZ KASSERT later; state going down so no action. */ - if (lvif->lvif_bss == NULL) - ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " - "lvif_bss->ni %p synched %d\n", __func__, __LINE__, - lvif, vap, vap->iv_bss, lvif->lvif_bss, - (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, - lvif->lvif_bss_synched); -#endif - - lsta = lvif->lvif_bss; - LKPI_80211_LVIF_UNLOCK(lvif); - KASSERT(lsta != NULL && lsta->ni != NULL, ("%s: lsta %p ni %p " - "lvif %p vap %p\n", __func__, - lsta, (lsta != NULL) ? lsta->ni : NULL, lvif, vap)); - ni = lsta->ni; /* Reference held for lvif_bss. */ - sta = LSTA_TO_STA(lsta); - - lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - - IEEE80211_UNLOCK(vap->iv_ic); - wiphy_lock(hw->wiphy); - - /* flush, drop. */ - lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); - - /* Wake tx queues to get packet(s) out. */ - lkpi_wake_tx_queues(hw, sta, false, true); - - /* flush, no drop */ - lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), false); - - /* End mgd_complete_tx. */ - if (lsta->in_mgd) { - memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.success = false; - lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); - lsta->in_mgd = false; - } - - /* sync_rx_queues */ - lkpi_80211_mo_sync_rx_queues(hw); - - /* sta_pre_rcu_remove */ - lkpi_80211_mo_sta_pre_rcu_remove(hw, vif, sta); - - /* Take the station down. */ - - /* Adjust sta and change state (from NONE) to NOTEXIST. */ - KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); - KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not " - "NONE: %#x, nstate %d arg %d\n", __func__, lsta, lsta->state, nstate, arg)); - error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NOTEXIST); - if (error != 0) { - IMPROVE("do we need to undo the chan ctx?"); - ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NOTEXIST) " - "failed: %d\n", __func__, __LINE__, error); - goto out; - } -#if 0 - lsta->added_to_drv = false; /* mo manages. */ -#endif - - bss_changed = 0; - vif->bss_conf.dtim_period = 0; /* go back to 0. */ - bss_changed |= BSS_CHANGED_BEACON_INFO; - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); - - lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - - LKPI_80211_LVIF_LOCK(lvif); - /* Remove ni reference for this cache of lsta. */ - lvif->lvif_bss = NULL; - lvif->lvif_bss_synched = false; - LKPI_80211_LVIF_UNLOCK(lvif); - lkpi_lsta_remove(lsta, lvif); - - /* conf_tx */ - - lkpi_remove_chanctx(hw, vif); - -out: - wiphy_unlock(hw->wiphy); - IEEE80211_LOCK(vap->iv_ic); - if (error == 0) { - /* - * We do this outside the wiphy lock as net80211::node_free() may call - * into crypto code to delete keys and we have a recursed on - * non-recursive sx panic. Also only do this if we get here w/o error. - * - * The very last release the reference on the ni for the ni/lsta on - * lvif->lvif_bss. Upon return from this both ni and lsta are invalid - * and potentially freed. - */ - ieee80211_free_node(ni); - } - return (error); -} - -static int -lkpi_sta_auth_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) -{ - int error; - - error = lkpi_sta_auth_to_scan(vap, nstate, arg); - if (error == 0) - error = lkpi_sta_scan_to_init(vap, nstate, arg); - return (error); -} - +/* UP3.1 */ static int lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { @@ -2768,18 +2643,21 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in lsta->in_mgd = false; } - /* Now start assoc. */ + /* Now start assoc. unless nstate=RUN (auth_to_run). */ /* Start mgd_prepare_tx. */ - if (!lsta->in_mgd) { + if (nstate == IEEE80211_S_ASSOC && !lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); prep_tx_info.duration = PREP_TX_INFO_DURATION; lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); lsta->in_mgd = true; } +#if 0 + /* We do not yet have a packet to go out. */ /* Wake tx queue to get packet out. */ lkpi_wake_tx_queues(hw, LSTA_TO_STA(lsta), false, true); +#endif /* * .. we end up in "assoc_to_run" @@ -2797,76 +2675,23 @@ out: return (error); } -/* auth_to_auth, assoc_to_assoc. */ +static int lkpi_sta_assoc_to_run(struct ieee80211vap *, enum ieee80211_state, int); + +/* UP3.2 */ static int -lkpi_sta_a_to_a(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) +lkpi_sta_auth_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { - struct lkpi_hw *lhw; - struct ieee80211_hw *hw; - struct lkpi_vif *lvif; - struct ieee80211_vif *vif; - struct lkpi_sta *lsta; - struct ieee80211_prep_tx_info prep_tx_info; int error; - lhw = vap->iv_ic->ic_softc; - hw = LHW_TO_HW(lhw); - lvif = VAP_TO_LVIF(vap); - vif = LVIF_TO_VIF(lvif); - - IEEE80211_UNLOCK(vap->iv_ic); - wiphy_lock(hw->wiphy); - - LKPI_80211_LVIF_LOCK(lvif); - /* XXX-BZ KASSERT later? */ - if (!lvif->lvif_bss_synched || lvif->lvif_bss == NULL) { -#ifdef LINUXKPI_DEBUG_80211 - ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " - "lvif_bss->ni %p synched %d\n", __func__, __LINE__, - lvif, vap, vap->iv_bss, lvif->lvif_bss, - (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, - lvif->lvif_bss_synched); -#endif - LKPI_80211_LVIF_UNLOCK(lvif); - error = ENOTRECOVERABLE; - goto out; - } - lsta = lvif->lvif_bss; - LKPI_80211_LVIF_UNLOCK(lvif); - - KASSERT(lsta != NULL, ("%s: lsta %p! lvif %p vap %p\n", __func__, - lsta, lvif, vap)); - - IMPROVE("event callback?"); - - /* End mgd_complete_tx. */ - if (lsta->in_mgd) { - memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.success = false; - lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); - lsta->in_mgd = false; - } - - /* Now start assoc. */ - - /* Start mgd_prepare_tx. */ - if (!lsta->in_mgd) { - memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.duration = PREP_TX_INFO_DURATION; - lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); - lsta->in_mgd = true; - } - - error = 0; -out: - wiphy_unlock(hw->wiphy); - IEEE80211_LOCK(vap->iv_ic); - + error = lkpi_sta_auth_to_assoc(vap, nstate, arg); + if (error == 0) + error = lkpi_sta_assoc_to_run(vap, nstate, arg); return (error); } +/* UP4 */ static int -_lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) +lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { struct lkpi_hw *lhw; struct ieee80211_hw *hw; @@ -2888,15 +2713,19 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i wiphy_lock(hw->wiphy); LKPI_80211_LVIF_LOCK(lvif); + /* XXX-BZ KASSERT later? */ + if (!lvif->lvif_bss_synched || lvif->lvif_bss == NULL) { #ifdef LINUXKPI_DEBUG_80211 - /* XXX-BZ KASSERT later; state going down so no action. */ - if (lvif->lvif_bss == NULL) ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " "lvif_bss->ni %p synched %d\n", __func__, __LINE__, lvif, vap, vap->iv_bss, lvif->lvif_bss, (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, lvif->lvif_bss_synched); #endif + LKPI_80211_LVIF_UNLOCK(lvif); + error = ENOTRECOVERABLE; + goto out; + } lsta = lvif->lvif_bss; LKPI_80211_LVIF_UNLOCK(lvif); KASSERT(lsta != NULL && lsta->ni != NULL, ("%s: lsta %p ni %p " @@ -2904,244 +2733,28 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i lsta, (lsta != NULL) ? lsta->ni : NULL, lvif, vap)); ni = lsta->ni; /* Reference held for lvif_bss. */ - sta = LSTA_TO_STA(lsta); - - lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - - /* flush, drop. */ - lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); - - IMPROVE("What are the proper conditions for DEAUTH_NEED_MGD_TX_PREP?"); - if (ieee80211_hw_check(hw, DEAUTH_NEED_MGD_TX_PREP) && - !lsta->in_mgd) { - memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.duration = PREP_TX_INFO_DURATION; - prep_tx_info.was_assoc = true; - lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); - lsta->in_mgd = true; - } - wiphy_unlock(hw->wiphy); - IEEE80211_LOCK(vap->iv_ic); + IMPROVE("ponder some of this moved to ic_newassoc, scan_assoc_success, " + "and to lesser extend ieee80211_notify_node_join"); - /* Call iv_newstate first so we get potential DEAUTH packet out. */ - error = lvif->iv_newstate(vap, nstate, arg); + /* Finish assoc. (even if this is auth_to_run!) */ + /* Update sta_state (AUTH to ASSOC) and set aid. */ + KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " + "AUTH: %#x\n", __func__, lsta, lsta->state)); + sta = LSTA_TO_STA(lsta); + sta->aid = IEEE80211_NODE_AID(ni); +#ifdef LKPI_80211_WME + if (vap->iv_flags & IEEE80211_F_WME) + sta->wme = true; +#endif + error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC); if (error != 0) { - ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) " - "failed: %d\n", __func__, __LINE__, vap, nstate, arg, error); - goto outni; + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) " + "failed: %d\n", __func__, __LINE__, error); + goto out; } - IEEE80211_UNLOCK(vap->iv_ic); - - /* Ensure the packets get out. */ - lkpi_80211_flush_tx(lhw, lsta); - - wiphy_lock(hw->wiphy); - - lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - - /* Wake tx queues to get packet(s) out. */ - lkpi_wake_tx_queues(hw, sta, false, true); - - /* flush, no drop */ - lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), false); - - /* End mgd_complete_tx. */ - if (lsta->in_mgd) { - memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.success = false; - prep_tx_info.was_assoc = true; - lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); - lsta->in_mgd = false; - } - - /* sync_rx_queues */ - lkpi_80211_mo_sync_rx_queues(hw); - - /* sta_pre_rcu_remove */ - lkpi_80211_mo_sta_pre_rcu_remove(hw, vif, sta); - - /* Take the station down. */ - - /* Update sta and change state (from AUTH) to NONE. */ - KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); - KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " - "AUTH: %#x\n", __func__, lsta, lsta->state)); - error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE); - if (error != 0) { - ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) " - "failed: %d\n", __func__, __LINE__, error); - goto out; - } - - /* See comment in lkpi_sta_run_to_init(). */ - bss_changed = 0; - bss_changed |= lkpi_disassoc(sta, vif, lhw); - -#ifdef LKPI_80211_HW_CRYPTO - /* - * In theory we remove keys here but there must not exist any for this - * state change until we clean them up again into small steps and no - * code duplication. - */ -#endif - - lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - - /* Adjust sta and change state (from NONE) to NOTEXIST. */ - KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); - KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not " - "NONE: %#x, nstate %d arg %d\n", __func__, lsta, lsta->state, nstate, arg)); - error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NOTEXIST); - if (error != 0) { - IMPROVE("do we need to undo the chan ctx?"); - ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NOTEXIST) " - "failed: %d\n", __func__, __LINE__, error); - goto out; - } - - lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* sta no longer save to use. */ - - IMPROVE("Any bss_info changes to announce?"); - vif->bss_conf.qos = 0; - bss_changed |= BSS_CHANGED_QOS; - vif->cfg.ssid_len = 0; - memset(vif->cfg.ssid, '\0', sizeof(vif->cfg.ssid)); - bss_changed |= BSS_CHANGED_BSSID; - vif->bss_conf.dtim_period = 0; /* go back to 0. */ - bss_changed |= BSS_CHANGED_BEACON_INFO; - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); - - LKPI_80211_LVIF_LOCK(lvif); - /* Remove ni reference for this cache of lsta. */ - lvif->lvif_bss = NULL; - lvif->lvif_bss_synched = false; - LKPI_80211_LVIF_UNLOCK(lvif); - lkpi_lsta_remove(lsta, lvif); - - /* conf_tx */ - - lkpi_remove_chanctx(hw, vif); - - error = EALREADY; -out: - wiphy_unlock(hw->wiphy); - IEEE80211_LOCK(vap->iv_ic); - if (error == EALREADY) { - /* - * We do this outside the wiphy lock as net80211::node_free() may call - * into crypto code to delete keys and we have a recursed on - * non-recursive sx panic. Also only do this if we get here w/o error. - * - * The very last release the reference on the ni for the ni/lsta on - * lvif->lvif_bss. Upon return from this both ni and lsta are invalid - * and potentially freed. - */ - ieee80211_free_node(ni); - } -outni: - return (error); -} - -static int -lkpi_sta_assoc_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) -{ - int error; - - error = _lkpi_sta_assoc_to_down(vap, nstate, arg); - if (error != 0 && error != EALREADY) - return (error); - - /* At this point iv_bss is long a new node! */ - - error |= lkpi_sta_scan_to_auth(vap, nstate, 0); - return (error); -} - -static int -lkpi_sta_assoc_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) -{ - int error; - - error = _lkpi_sta_assoc_to_down(vap, nstate, arg); - return (error); -} - -static int -lkpi_sta_assoc_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) -{ - int error; - - error = _lkpi_sta_assoc_to_down(vap, nstate, arg); - return (error); -} - -static int -lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) -{ - struct lkpi_hw *lhw; - struct ieee80211_hw *hw; - struct lkpi_vif *lvif; - struct ieee80211_vif *vif; - struct ieee80211_node *ni; - struct lkpi_sta *lsta; - struct ieee80211_sta *sta; - struct ieee80211_prep_tx_info prep_tx_info; - enum ieee80211_bss_changed bss_changed; - int error; - - lhw = vap->iv_ic->ic_softc; - hw = LHW_TO_HW(lhw); - lvif = VAP_TO_LVIF(vap); - vif = LVIF_TO_VIF(lvif); - - IEEE80211_UNLOCK(vap->iv_ic); - wiphy_lock(hw->wiphy); - - LKPI_80211_LVIF_LOCK(lvif); - /* XXX-BZ KASSERT later? */ - if (!lvif->lvif_bss_synched || lvif->lvif_bss == NULL) { -#ifdef LINUXKPI_DEBUG_80211 - ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " - "lvif_bss->ni %p synched %d\n", __func__, __LINE__, - lvif, vap, vap->iv_bss, lvif->lvif_bss, - (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, - lvif->lvif_bss_synched); -#endif - LKPI_80211_LVIF_UNLOCK(lvif); - error = ENOTRECOVERABLE; - goto out; - } - lsta = lvif->lvif_bss; - LKPI_80211_LVIF_UNLOCK(lvif); - KASSERT(lsta != NULL && lsta->ni != NULL, ("%s: lsta %p ni %p " - "lvif %p vap %p\n", __func__, - lsta, (lsta != NULL) ? lsta->ni : NULL, lvif, vap)); - - ni = lsta->ni; /* Reference held for lvif_bss. */ - - IMPROVE("ponder some of this moved to ic_newassoc, scan_assoc_success, " - "and to lesser extend ieee80211_notify_node_join"); - - /* Finish assoc. */ - /* Update sta_state (AUTH to ASSOC) and set aid. */ - KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " - "AUTH: %#x\n", __func__, lsta, lsta->state)); - sta = LSTA_TO_STA(lsta); - sta->aid = IEEE80211_NODE_AID(ni); -#ifdef LKPI_80211_WME - if (vap->iv_flags & IEEE80211_F_WME) - sta->wme = true; -#endif - error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC); - if (error != 0) { - ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) " - "failed: %d\n", __func__, __LINE__, error); - goto out; - } - - IMPROVE("wme / conf_tx [all]"); + IMPROVE("wme / conf_tx [all]"); /* Update bss info (bss_info_changed) (assoc, aid, ..). */ bss_changed = 0; @@ -3180,7 +2793,7 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int * - event_callback */ - /* End mgd_complete_tx. */ + /* End mgd_complete_tx. (we do not have to check ostate == IEEE80211_S_ASSOC). */ if (lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); prep_tx_info.success = true; @@ -3243,17 +2856,11 @@ out: return (error); } -static int -lkpi_sta_auth_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) -{ - int error; - - error = lkpi_sta_auth_to_assoc(vap, nstate, arg); - if (error == 0) - error = lkpi_sta_assoc_to_run(vap, nstate, arg); - return (error); -} - +/* + * DOWN1 + * "to assoc" means we are going back to State 2 from State 4[/3]. + * This means ni still is authenticated, so we keep sta, chanctx, .. + */ static int lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { @@ -3276,6 +2883,9 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); + IEEE80211_UNLOCK(vap->iv_ic); + wiphy_lock(hw->wiphy); + LKPI_80211_LVIF_LOCK(lvif); #ifdef LINUXKPI_DEBUG_80211 /* XXX-BZ KASSERT later; state going down so no action. */ @@ -3297,9 +2907,6 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - IEEE80211_UNLOCK(vap->iv_ic); - wiphy_lock(hw->wiphy); - /* flush, drop. */ lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); @@ -3316,7 +2923,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int wiphy_unlock(hw->wiphy); IEEE80211_LOCK(vap->iv_ic); - /* Call iv_newstate first so we get potential DISASSOC packet out. */ + /* Call iv_newstate first so we get potential (RE-)ASSOC/DEAUTH? packet out. */ error = lvif->iv_newstate(vap, nstate, arg); if (error != 0) { ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) " @@ -3363,7 +2970,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_80211_mo_sync_rx_queues(hw); /* sta_pre_rcu_remove */ - lkpi_80211_mo_sta_pre_rcu_remove(hw, vif, sta); + lkpi_80211_mo_sta_pre_rcu_remove(hw, vif, sta); #endif /* Take the station down. */ @@ -3412,6 +3019,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int #if 0 /* Update bss info (bss_info_changed) (assoc, aid, ..). */ + /* See comment in DOWN4. */ lkpi_disassoc(sta, vif, lhw); #endif @@ -3423,8 +3031,15 @@ outni: return (error); } +/* + * DOWN2 + * We are in state 2 and go back to state 1 and will try to auth again + * (to IEEE80211_S_AUTH in FreeBSD means "try to auth"). This should be + * like scan_to_auth but that we keep the "ni" and with that chanctx/bssid, + * which essentially makes this "a_to_a" in LinuxKPI. + */ static int -lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) +lkpi_sta_assoc_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { struct lkpi_hw *lhw; struct ieee80211_hw *hw; @@ -3432,10 +3047,6 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int struct ieee80211_vif *vif; struct ieee80211_node *ni; struct lkpi_sta *lsta; - struct ieee80211_sta *sta; - struct ieee80211_prep_tx_info prep_tx_info; - enum ieee80211_bss_changed bss_changed; - struct ieee80211_rx_ampdu *rap; int error; lhw = vap->iv_ic->ic_softc; @@ -3463,53 +3074,81 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta, (lsta != NULL) ? lsta->ni : NULL, lvif, vap)); ni = lsta->ni; /* Reference held for lvif_bss. */ - sta = LSTA_TO_STA(lsta); lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - /* flush, drop. */ - lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); - - IMPROVE("What are the proper conditions for DEAUTH_NEED_MGD_TX_PREP?"); - if (ieee80211_hw_check(hw, DEAUTH_NEED_MGD_TX_PREP) && - !lsta->in_mgd) { - memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.duration = PREP_TX_INFO_DURATION; - prep_tx_info.was_assoc = true; - lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); - lsta->in_mgd = true; + /* Take the station down. */ + /* Update sta_state (AUTH to NONE). */ + KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); + KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " + "AUTH: %#x\n", __func__, lsta, lsta->state)); + error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE); + if (error != 0) { + ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) " + "failed: %d\n", __func__, __LINE__, error); + goto out; } + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); + +out: wiphy_unlock(hw->wiphy); IEEE80211_LOCK(vap->iv_ic); + return (error); +} - /* Call iv_newstate first so we get potential DISASSOC packet out. */ - error = lvif->iv_newstate(vap, nstate, arg); - if (error != 0) { - ic_printf(vap->iv_ic, "%s:%d: iv_newstate(%p, %d, %d) " - "failed: %d\n", __func__, __LINE__, vap, nstate, arg, error); - goto outni; - } - - /* Stop any BA sessions if still active. */ - for (int rapn = 0; rapn < WME_NUM_TID; rapn++) { - rap = &ni->ni_rx_ampdu[rapn]; - - if ((rap->rxa_flags & IEEE80211_AGGR_RUNNING) == 0) - continue; +/* + * DOWN3 + * We are in state 1. Either auth timed out (arg != 0) or we have an internal + * state change forcing us to give up trying to authenticate. + * Cleanup and remove chanctx, sta, ... + */ +static int +lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) +{ + struct lkpi_hw *lhw; + struct ieee80211_hw *hw; + struct lkpi_vif *lvif; + struct ieee80211_vif *vif; + struct ieee80211_node *ni; + struct lkpi_sta *lsta; + struct ieee80211_sta *sta; + struct ieee80211_prep_tx_info prep_tx_info; + enum ieee80211_bss_changed bss_changed; + int error; - vap->iv_ic->ic_ampdu_rx_stop(ni, rap); - } + lhw = vap->iv_ic->ic_softc; + hw = LHW_TO_HW(lhw); + lvif = VAP_TO_LVIF(vap); + vif = LVIF_TO_VIF(lvif); IEEE80211_UNLOCK(vap->iv_ic); + wiphy_lock(hw->wiphy); - /* Ensure the packets get out. */ - lkpi_80211_flush_tx(lhw, lsta); + LKPI_80211_LVIF_LOCK(lvif); +#ifdef LINUXKPI_DEBUG_80211 + /* XXX-BZ KASSERT later; state going down so no action. */ + if (lvif->lvif_bss == NULL) + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " + "lvif_bss->ni %p synched %d\n", __func__, __LINE__, + lvif, vap, vap->iv_bss, lvif->lvif_bss, + (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, + lvif->lvif_bss_synched); +#endif - wiphy_lock(hw->wiphy); + lsta = lvif->lvif_bss; + LKPI_80211_LVIF_UNLOCK(lvif); + KASSERT(lsta != NULL && lsta->ni != NULL, ("%s: lsta %p ni %p " + "lvif %p vap %p\n", __func__, + lsta, (lsta != NULL) ? lsta->ni : NULL, lvif, vap)); + ni = lsta->ni; /* Reference held for lvif_bss. */ + sta = LSTA_TO_STA(lsta); lkpi_lsta_dump(lsta, ni, __func__, __LINE__); + /* flush, drop. */ + lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); + /* Wake tx queues to get packet(s) out. */ lkpi_wake_tx_queues(hw, sta, false, true); @@ -3520,7 +3159,6 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int if (lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); prep_tx_info.success = false; - prep_tx_info.was_assoc = true; lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); lsta->in_mgd = false; } @@ -3528,36 +3166,8 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* sync_rx_queues */ lkpi_80211_mo_sync_rx_queues(hw); - /* sta_pre_rcu_remove */ - lkpi_80211_mo_sta_pre_rcu_remove(hw, vif, sta); - - /* Take the station down. */ - - /* Adjust sta and change state (from AUTHORIZED) to ASSOC. */ - KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); - KASSERT(lsta->state == IEEE80211_STA_AUTHORIZED, ("%s: lsta %p state not " - "AUTHORIZED: %#x\n", __func__, lsta, lsta->state)); - error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC); - if (error != 0) { - ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) " - "failed: %d\n", __func__, __LINE__, error); - goto out; - } - - lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - #ifdef LKPI_80211_HW_CRYPTO if (lkpi_hwcrypto) { - /* - * In theory we only need to do this if we changed assoc. - * If we were not assoc, there should be no keys and we - * should not be here. - */ -#ifdef notyet - KASSERT((bss_changed & BSS_CHANGED_ASSOC) != 0, ("%s: " - "trying to remove keys but were not assoc: %#010jx, lvif %p\n", - __func__, (uintmax_t)bss_changed, lvif)); -#endif error = lkpi_sta_del_keys(hw, vif, lsta); if (error != 0) { ic_printf(vap->iv_ic, "%s:%d: lkpi_sta_del_keys " @@ -3572,29 +3182,12 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int } #endif - /* Update sta_state (ASSOC to AUTH). */ - KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); - KASSERT(lsta->state == IEEE80211_STA_ASSOC, ("%s: lsta %p state not " - "ASSOC: %#x\n", __func__, lsta, lsta->state)); - error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTH); - if (error != 0) { - ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(AUTH) " - "failed: %d\n", __func__, __LINE__, error); - goto out; - } + /* sta_pre_rcu_remove */ + lkpi_80211_mo_sta_pre_rcu_remove(hw, vif, sta); - lkpi_lsta_dump(lsta, ni, __func__, __LINE__); + synchronize_net(); - /* Update sta and change state (from AUTH) to NONE. */ - KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); - KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " - "AUTH: %#x\n", __func__, lsta, lsta->state)); - error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_NONE); - if (error != 0) { - ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(NONE) " - "failed: %d\n", __func__, __LINE__, error); - goto out; - } + /* Take the station down. */ bss_changed = 0; /* @@ -3641,16 +3234,15 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_remove(lsta, lvif); - lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* sta no longer save to use. */ + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); IMPROVE("Any bss_info changes to announce?"); - vif->bss_conf.qos = 0; + vif->bss_conf.qos = false; bss_changed |= BSS_CHANGED_QOS; vif->cfg.ssid_len = 0; memset(vif->cfg.ssid, '\0', sizeof(vif->cfg.ssid)); bss_changed |= BSS_CHANGED_BSSID; vif->bss_conf.use_short_preamble = false; - vif->bss_conf.qos = false; /* XXX BSS_CHANGED_???? */ vif->bss_conf.dtim_period = 0; /* go back to 0. */ bss_changed |= BSS_CHANGED_BEACON_INFO; @@ -3666,11 +3258,10 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_remove_chanctx(hw, vif); - error = EALREADY; out: wiphy_unlock(hw->wiphy); IEEE80211_LOCK(vap->iv_ic); - if (error == EALREADY) { + if (error == 0) { /* * We do this outside the wiphy lock as net80211::node_free() may call * into crypto code to delete keys and we have a recursed on @@ -3682,15 +3273,148 @@ out: */ ieee80211_free_node(ni); } -outni: + return (error); +} + +/* DOWN4 */ +static int +lkpi_sta_scan_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) +{ + /* lkpi_iv_newstate() handles the stop scan case in common code. */ + return (lkpi_sta_state_do_nada(vap, nstate, arg)); +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +static int +lkpi_sta_auth_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) +{ + int error; + + error = lkpi_sta_auth_to_scan(vap, nstate, arg); + if (error == 0) + error = lkpi_sta_scan_to_init(vap, nstate, arg); + return (error); +} + +/* auth_to_auth, assoc_to_assoc. */ +static int +lkpi_sta_a_to_a(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) +{ + struct lkpi_hw *lhw; + struct ieee80211_hw *hw; + struct lkpi_vif *lvif; + struct ieee80211_vif *vif; + struct lkpi_sta *lsta; + struct ieee80211_prep_tx_info prep_tx_info; + int error; + + lhw = vap->iv_ic->ic_softc; + hw = LHW_TO_HW(lhw); + lvif = VAP_TO_LVIF(vap); + vif = LVIF_TO_VIF(lvif); + *** 160 LINES SKIPPED *** From nobody Wed Feb 25 04:25:07 2026 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 4fLM2J3r6Kz6TrdW for ; Wed, 25 Feb 2026 04:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLM2J2kqFz3w1c for ; Wed, 25 Feb 2026 04:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771993512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EC29ckDPI04GHrlLySplJ9oiru0ypC7LNFvnTsnJu7w=; b=hhZoo4SkVCY+ACyBqY6D4gy4DIbXhAtTbOfXRXg0cCkKMpdP3C7KSjrYRZ5rVUROl7US9X hOdPvRwHPYJJ/NhBOAXaK7fWbdWF2QFUP6XegcAp4YseRgYhum/8Di0WTdPnKJGtxjTMbp UHvKfEJ8QPqqHvacNFQWvQ9eLq8b80m8eeMC9fk795X5YJa2VefQHXisWt5TWGKgByWKFe OSzLGQJi6v7fOxBs/3EqfijjTXJB4h9lzJK0fbtoSOHcIH0QYASmxXImDx33NiZWGAluJ+ fiRDJdyZSoQjoFF/CdyW0Qkw0HX94fw1gxYddgaTwMHgOvShvsa3WWXXkfBjZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771993512; a=rsa-sha256; cv=none; b=ZU1Ld/M0G/dY3JAraQ3EAtukpMag881r6owNi1klL9G/DcYWHufBpASng8gmZGVYIRVSGj BaWqflWFV5gFYWEKmA16UCV0RoS8mllv+rvH9OdPfj0UnwSBiljrg0lQ+LOJXxOzKGzhcN TXD6SLHjRQulLeAHMnWgrtTsp8+JFmFFnz0LP+RCZB51BlLiEsMEfe6qPkxvthEGuiYag7 CPRUeVKpaz0N4ltMB4HPsIYCrSZo+Y1jj3UZBRq5bwRYcNkoFZUQXmnXLmUKNamYfC2Art X4H0UcPXgrhSu8m/AJKwA+bbeY8wYJy5DvtUYBzWFA6+19Jc8fIeOXj1kdNUMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771993512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EC29ckDPI04GHrlLySplJ9oiru0ypC7LNFvnTsnJu7w=; b=K/Aw0Fh6oXI+O8q+x4G+AP/F4kBDt2OjMMAYTX/B5g6TRcg6fH6XlcoDkabCFeGkmUYiTd clP3Z+DY1SrQ5tk26Myf4vyhB5ggaMkE2XjUu00Kn0HDLPlBcNJV2HkaG1Z4lXIUzMN56+ l1z2+mkihJs8QAz2zzi+FXEOtuxpsB5l/vsGk7PsLToEfglAlMun8ploFXcO6/DFxYIBHf Y5q86v55UDsHwlIgUHoqrAonqdgKLZSQsJl8hdTTE72Sxo4uF+1uJN88eakGd5sRGIBZ/K DDN5yCsE6r+nHgxsRmQJk1/Hc2iYi9q5Vf2ZsVVw4KvBolkQuIfAa9ZVGxVUCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLM2J23rGzn2P for ; Wed, 25 Feb 2026 04:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36520 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 04:25:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 96a57fc4bf4e - main - LinuxKPI: 802.11: adjust assoc check before key deletion 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: 96a57fc4bf4edca9a579cc47f9058253c11f8313 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 04:25:07 +0000 Message-Id: <699e79a3.36520.36b4b94a@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=96a57fc4bf4edca9a579cc47f9058253c11f8313 commit 96a57fc4bf4edca9a579cc47f9058253c11f8313 Author: Bjoern A. Zeeb AuthorDate: 2026-02-24 23:51:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-25 04:24:50 +0000 LinuxKPI: 802.11: adjust assoc check before key deletion There is a discrepancy between the vif assoc state and the sta state (see comment in lkpi_sta_run_to_init()). Adjust the check in lkpi_iv_key_delete() and add it to lkpi_sta_del_keys() so that we can take way the keys after whatever comes first: the sta went away from AUTHORIZED (RUN) or if the vif is no longer marked assoc. This is needed as we may only take the sta down partially back to State 2 (cf. 802.11-2024, Figure 11-23) and key material is no longer valid before the vif gets cleaned up and the sta is removed entirely. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 30 +++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index e80cf9436b3a..550bd417c529 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1373,6 +1373,15 @@ lkpi_sta_del_keys(struct ieee80211_hw *hw, struct ieee80211_vif *vif, return (0); lockdep_assert_wiphy(hw->wiphy); + + if (vif->cfg.assoc && lsta->state == IEEE80211_STA_AUTHORIZED) { + if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) + ic_printf(lsta->ni->ni_ic, + "%d %lu %s: vif still assoc; not deleting keys\n", + curthread->td_tid, jiffies, __func__); + return (0); + } + ieee80211_ref_node(lsta->ni); error = 0; @@ -1452,6 +1461,15 @@ lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) */ lockdep_assert_wiphy(hw->wiphy); + ni = ieee80211_ref_node(vap->iv_bss); + lsta = ni->ni_drv_data; + if (lsta == NULL) { + ic_printf(ic, "%s: ni %p (%6D) with lsta NULL\n", + __func__, ni, ni->ni_bssid, ":"); + ieee80211_free_node(ni); + return (0); + } + /* * While we are assoc we may still send packets. We cannot delete the * keys as otherwise packets could go out unencrypted. Some firmware @@ -1462,30 +1480,24 @@ lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) * How to test: run 800Mbit/s UDP traffic and during that restart your * supplicant. You want to survive that. */ - if (vif->cfg.assoc) { + if (vif->cfg.assoc && lsta->state == IEEE80211_STA_AUTHORIZED) { if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) ic_printf(ic, "%d %lu %s: vif still assoc; not deleting keys\n", curthread->td_tid, jiffies, __func__); + ieee80211_free_node(ni); return (0); } if (IEEE80211_KEY_UNDEFINED(k)) { ic_printf(ic, "%s: vap %p key %p is undefined: %p %u\n", __func__, vap, k, k->wk_cipher, k->wk_keyix); + ieee80211_free_node(ni); return (0); } if (vap->iv_bss == NULL) { ic_printf(ic, "%s: iv_bss %p for vap %p is NULL\n", __func__, vap->iv_bss, vap); - return (0); - } - - ni = ieee80211_ref_node(vap->iv_bss); - lsta = ni->ni_drv_data; - if (lsta == NULL) { - ic_printf(ic, "%s: ni %p (%6D) with lsta NULL\n", - __func__, ni, ni->ni_bssid, ":"); ieee80211_free_node(ni); return (0); } From nobody Wed Feb 25 05:29:20 2026 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 4fLNSJ2VYQz6SVfX for ; Wed, 25 Feb 2026 05:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLNSJ1n3tz43G2 for ; Wed, 25 Feb 2026 05:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771997360; 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=CYxdrt3i0EJpZhZ92PZmWmJQ55vl0MQHXumDzUrxSK4=; b=wu/QgkrsgHC8tew2bctvMpL8c6p4PXvgEMSW0owiM5ieInCx9n3E6MbucUMbiI5xv/8B0W 1ayahIkxpqM7HRQCkZ4bvUsRLK1WiwIB2nKeLoinrJrBGEkQo7dKdm2lxyW7Pz+iz2Ggz4 tDOIn4959lchXH8Olg3ilfWhfx+AT9Q+lx5w41QRPkIXZ7QoOwa3WnG3IgC73qJseU+l4Z q2Rg4To/7foDZybadIrUqI20MwXy/t0rp0DXZ7HwXrCDUn6PUc1rPuW31WQh5EtTq/2Exw 3Qt/k2wTkgQsIsoXiRzP2LLRzclJmCOjS9jtd1DgxK1YrvTHo0kX4kb+O7Fwbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771997360; a=rsa-sha256; cv=none; b=vAPnOIiGxBufcZSaI/pbkbilN1pkz6+vvrgj7Xtb2Q/8EKb7JnUql4yvq7qifrcJvnhqnm 7qdEbDbwpxMGIhKCyckIdH6Va9rY2sE0M701lllGmLv5WcdysXp1CFcMtrkwf+J4pdBGi7 r9lsVM1ikO3t6Y83JkKVibL1k+jETjvL/2vyvnyscZJknXT2VJEIAYbvU2uZ8DFgoQWu0/ ULEOkjvW3Ru42BC9h3Go3xSvWyHruhlJMZhdiBOvoc3wHKgsIjhYYxkjN94Afh1HQfw/yH lQAcqmBaL4Ssy9tU3agzzo3sx8mNPzcSZ83SGdKVdNGzp3+IyqG3zcvAuVSdPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771997360; 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=CYxdrt3i0EJpZhZ92PZmWmJQ55vl0MQHXumDzUrxSK4=; b=XQd0xVHc0nenW3WdNJR/enfnolEBdtqUtXVQSoqOFr+oDUCqdtzP+v97odUFEBii26JTol vMlUUZHuASGNrDfoL1ddeREnXRCPHznUNgXolmr590lYKChCw6QtF6hqatNqZjs+shrHTi cxEaJqq1zkuHQF/woeVNk7NNG018dpD9HnTrpTPXgEGNIcbgqcI+Emehb97fQwM60q5KJi 24Bu/n8s8hjdb4Usp/BwH73XXSbm/k3Ej0bF2PTAfXBcXc0xps6kOHqbPvL09ikEx/PqdM W1NozGPRSEnyl6yGWZJZ0EG/ZHzcEW+3LPkOoy3y0O8bZQsye6JKwRpsQgAg+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLNSJ1JnzzpN1 for ; Wed, 25 Feb 2026 05:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c9df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 05:29:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Stephen J. Kiernan From: Ka Ho Ng Subject: git: de773bcc2ffb - main - Use NO_SHARED instead of explicitly using -static flag 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: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de773bcc2ffb8472f68283985bf4b7b698c57914 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 05:29:20 +0000 Message-Id: <699e88b0.3c9df.43dfb219@gitrepo.freebsd.org> The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=de773bcc2ffb8472f68283985bf4b7b698c57914 commit de773bcc2ffb8472f68283985bf4b7b698c57914 Author: Stephen J. Kiernan AuthorDate: 2026-02-25 05:25:08 +0000 Commit: Ka Ho Ng CommitDate: 2026-02-25 05:29:04 +0000 Use NO_SHARED instead of explicitly using -static flag NO_SHARED is the proper way to declare linking a program without shared libraries. Obtained from: Hewlett Packard Enterprise MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44761 --- tools/tools/syscall_timing/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/tools/syscall_timing/Makefile b/tools/tools/syscall_timing/Makefile index e33148eee2e9..2c6a7d8dc371 100644 --- a/tools/tools/syscall_timing/Makefile +++ b/tools/tools/syscall_timing/Makefile @@ -2,7 +2,8 @@ # PROG= syscall_timing -CFLAGS+= -static -O +CFLAGS+= -O +NO_SHARED= MAN= #LIBADD= pthread From nobody Wed Feb 25 05:38:55 2026 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 4fLNgN1G1Fz6SWpB for ; Wed, 25 Feb 2026 05:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLNgM6L9Kz44R9 for ; Wed, 25 Feb 2026 05:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771997935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uWSRt71mf3+vkb2Gfgzwb8T4DieaOjwVGVD4P+ekPpk=; b=Y/ENSw5XRKE+XaeEkL3YpnOOD81a4ygJK/X7dx6bAnvOX0M2eq2o4t7mqmh4fuEOP7ulw8 9QDc3ENat+TBhFymqfwFPL4VppekwpojdTybggRvsXuUU8P4ihCRQxeSN+RogG1ZLBjclS MIZC3x5Z8TSJLIGVbcLmSMuBHnbg1v4H03iDjumL+Vdnr/coyVOGM8iEk1KdbMrImqGHds n23jVKAWNa8LyYtjbamJJFOdYQmVDCxJxkbDzTIdjHBD1KOYti7/vEC7zWjh/EX2gHY9iu oEtUkbbxOVGEEtPwxq9g2AFeLTJQj/YKXJWXfjKIZVWi7Mw92fch9CN3oBNksg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771997935; a=rsa-sha256; cv=none; b=iwN27iTBynbMqkw7lmRIypr2GshKzwYb+hRc1nwVOMlP9V5QPFUueBEahGZ/EQP1DHVRSm 60k9Wa7d+uJIhxg00jjMFUks5DqOYsuA4l4J+FSwZ4evrb/6ecpN5TWKboUf5KswbRDfpv Eoak36IWfAuR8NvyD7heba0ZzY1PJX+7ElANV2X4RL2ZSW/PZ6IIYTfMSUpnlQ5L6VXEgP mgyL1AaEfro+7nPLjbBe7vrjtTygZyusGx3l1LkJaRVWZZS+Qn+bvs1Fz19eLxLeogupMU qn7pBLsRukrIryiKVuO3p/Nz+GWQwPaIKBQbx8vKA6LNWzOo0cM0fHtVHqcBjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771997935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uWSRt71mf3+vkb2Gfgzwb8T4DieaOjwVGVD4P+ekPpk=; b=Jt3anhWqM09PCvWDnKSF+Mi3Rb7dtxww2X4/MGUYNbAgHUUx8hP7Bx0jQZtfyc2oL9eXHl IofJk6+a6WguRyS2x5qklhqw3B7f2GobzbM7oa4V6xDID8++G24Z6X/WegQPFKDnnSy80d iIquiXLyaz0e3Cj6i+/LuPolTIPi3VdTykS6fcLqaOuMiznob62rE38F3jHUqTP31YrmJN Tj92Fq2glo575gwZMGRNUtMPizzB6XRNb6wE/YRKqq8anwATsGGAU1D2TYUuKR9dFx8wVX bGrOeCiZI7HAIrI374WsCz/EritZAOjXbOEHrvOU3syfvTGmB3CDI6pmcN/Omw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLNgM5wrjzprM for ; Wed, 25 Feb 2026 05:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d121 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 05:38:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 0ac5cddebe1e - main - syscall_timing: add Makefile.depend 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: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ac5cddebe1e98d7d29493f0e6e829021be7fcef Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 05:38:55 +0000 Message-Id: <699e8aef.3d121.5b48eca1@gitrepo.freebsd.org> The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=0ac5cddebe1e98d7d29493f0e6e829021be7fcef commit 0ac5cddebe1e98d7d29493f0e6e829021be7fcef Author: Ka Ho Ng AuthorDate: 2026-02-25 05:33:34 +0000 Commit: Ka Ho Ng CommitDate: 2026-02-25 05:38:40 +0000 syscall_timing: add Makefile.depend This was part of review D44761. It was separated into another commit for better clarity. Obtained from: Hewlett Packard Enterprise MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44761 --- tools/tools/syscall_timing/Makefile.depend | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/tools/syscall_timing/Makefile.depend b/tools/tools/syscall_timing/Makefile.depend new file mode 100644 index 000000000000..c6d60673577c --- /dev/null +++ b/tools/tools/syscall_timing/Makefile.depend @@ -0,0 +1,13 @@ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif From nobody Wed Feb 25 05:59:44 2026 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 4fLP7P1vHNz6SZ0R for ; Wed, 25 Feb 2026 05:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLP7N6sX3z46pZ for ; Wed, 25 Feb 2026 05:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771999184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ioJvxiXfY9A4/RTOIPZRHy6Rt1k0Qbv8F64HXSmVTxU=; b=mVZgeKx/lemr4YJB2ODrq7YLy0j4VxvEeqroekD2iw65yhvXtjCyIIKAWHnOewLPin1CWZ nVcsrOtxEnNlp3h2KHy+l4T2RCi2DjM62RqT/jZoG1mbFsczqWuMDbB7hv9PAbnYeTDj6S yOeJIIpUIq4Xs+FCrF8SSQpCZ5+SKKsnPKv5PDehsixOIfSLdD5PltbpwS0Mv88DAplxVZ LATOS9BBh4Ie6ogARe3b8aKtn/pR3YYNBZgwfK+pjBmw0RQxzZeQK3fGUJECU0OONucwgX mO8aK+kAZUL2OWJwbYVo3MCowl5gbPd0q3RP1B0OG4pJGo3HOz0GJvIWpeRkpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771999184; a=rsa-sha256; cv=none; b=j8Ng48za19FIi5Xycvg6rPqfn/uvHd/pdy6gRqo7Ydwm1MSh2jKX4ZwIoFh8MSW9I7We2j bS/0QoeTK7M6ZkY1SRtNkuSVE3umfZBBP7YPqwqLe926vVpFRIN53OcD1JeGwBYeGDBpiQ cB6q2/m09EYwUMYslJPtkZ2G+zTr5bf43Y0p2QC8nACxe3tVoEVNYOMegH6DZVkenQWhQH HlD53+N2PiV6/VXwJWXqoDGJNBwdvAl9SAOLeqjiFYL6kMASHKv+1pO3SWYUWfNCuO4g3F 8zhx0qjlYArASpfT82dvdGFGYoiu1U38hxpiZwqxZmf7/I4oDsiNozvzO40WuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771999184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ioJvxiXfY9A4/RTOIPZRHy6Rt1k0Qbv8F64HXSmVTxU=; b=xY1DB9cvo2dUWm8luCfJ8EvqdbRyvQDq21+v8jEeDQmJB0k9kzimV7B7kJPqN/ZdlHlb7+ ulXxf/0FSJI8rD5kKrsfwU79F2H4Qzt5bcF3G51T9+w/+Qncz6A3HTpzSfNX/679qsOQCA 8NMfZtmXi/c3GkZWnu1M2lgZWjsrLR9O+S+ZlN/BGfhdOOr85ta/YQpxKoIORzDuBUkcvK RRB+6C/0KYuhVShFy8SvEp/AQEzlD0RaD3hclWNl8lcgfoNUIBV84kxh9Yr9xx+zj4+7EF zehzwrY50TpnrfF+yQ6aYsZO5x+wEstTXxUQy/u5i2qb4JM2WP1mXTRfsvUbDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLP7N6R7Gzpst for ; Wed, 25 Feb 2026 05:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fabd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 05:59:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 0fc6c3f731a2 - main - chore: replace {0, 0} with {DEV,KOBJ}METHOD_END 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fc6c3f731a2cca3120798806c330a3081c9424b Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 05:59:44 +0000 Message-Id: <699e8fd0.3fabd.7365965c@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=0fc6c3f731a2cca3120798806c330a3081c9424b commit 0fc6c3f731a2cca3120798806c330a3081c9424b Author: Enji Cooper AuthorDate: 2026-02-21 06:14:46 +0000 Commit: Enji Cooper CommitDate: 2026-02-25 05:59:34 +0000 chore: replace {0, 0} with {DEV,KOBJ}METHOD_END Both of the aforementioned macros have been present in FreeBSD for well over a decade: 2009 for `KOBJMETHOD_END`; 2011 for `DEVMETHOD_END`. Adapt all hardcoded references of `{0, 0}` with `DEVMETHOD_END` and `KOBJMETHOD_END` as appropriate. This helps ensure that future adaptations to drivers following patterns documented in driver(9) can be made more easily/without issue. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55414 --- sys/dev/aacraid/aacraid_cam.c | 2 +- sys/dev/aacraid/aacraid_pci.c | 2 +- sys/dev/acpi_support/acpi_asus.c | 2 +- sys/dev/acpica/acpi_video.c | 2 +- sys/dev/adb/adb_bus.c | 12 ++++++------ sys/dev/adb/adb_buttons.c | 2 +- sys/dev/adb/adb_kbd.c | 2 +- sys/dev/adb/adb_mouse.c | 2 +- sys/dev/agp/agp_ali.c | 2 +- sys/dev/agp/agp_amd.c | 2 +- sys/dev/agp/agp_amd64.c | 2 +- sys/dev/agp/agp_apple.c | 2 +- sys/dev/agp/agp_ati.c | 2 +- sys/dev/agp/agp_i810.c | 2 +- sys/dev/agp/agp_intel.c | 2 +- sys/dev/agp/agp_nvidia.c | 2 +- sys/dev/agp/agp_sis.c | 2 +- sys/dev/agp/agp_via.c | 2 +- sys/dev/aic7xxx/ahc_isa.c | 2 +- sys/dev/aic7xxx/ahc_pci.c | 2 +- sys/dev/aic7xxx/ahd_pci.c | 2 +- sys/dev/al_eth/al_eth.c | 2 +- sys/dev/alpm/alpm.c | 2 +- sys/dev/amdpm/amdpm.c | 2 +- sys/dev/amdsmb/amdsmb.c | 2 +- sys/dev/asmc/asmc.c | 2 +- sys/dev/atkbdc/atkbd_atkbdc.c | 2 +- sys/dev/atkbdc/atkbdc_isa.c | 2 +- sys/dev/atkbdc/psm.c | 4 ++-- sys/dev/axgbe/if_axgbe.c | 4 ++-- sys/dev/cfe/cfe_resource.c | 2 +- sys/dev/cfi/cfi_disk.c | 2 +- sys/dev/chromebook_platform/chromebook_platform.c | 2 +- sys/dev/ciss/ciss.c | 2 +- sys/dev/cxgb/cxgb_main.c | 2 +- sys/dev/cxgbe/cxgbei/icl_cxgbei.c | 2 +- sys/dev/cxgbe/t4_main.c | 4 ++-- sys/dev/dcons/dcons_crom.c | 2 +- sys/dev/dpaa/bman_fdt.c | 4 ++-- sys/dev/dpaa/fman_fdt.c | 2 +- sys/dev/dpaa/fman_mdio.c | 2 +- sys/dev/dpaa/if_dtsec_fdt.c | 2 +- sys/dev/dpaa/qman_fdt.c | 4 ++-- sys/dev/dpms/dpms.c | 2 +- sys/dev/dwc/if_dwc.c | 2 +- sys/dev/fb/fbd.c | 2 +- sys/dev/fdc/fdc.c | 2 +- sys/dev/fdc/fdc_isa.c | 2 +- sys/dev/firewire/if_fwe.c | 2 +- sys/dev/firewire/if_fwip.c | 2 +- sys/dev/firewire/sbp.c | 2 +- sys/dev/firewire/sbp_targ.c | 2 +- sys/dev/flash/cqspi.c | 2 +- sys/dev/flash/flexspi/flex_spi.c | 2 +- sys/dev/flash/mx25l.c | 2 +- sys/dev/flash/n25q.c | 2 +- sys/dev/flash/w25n.c | 2 +- sys/dev/ftwd/ftwd.c | 2 +- sys/dev/fxp/inphy.c | 2 +- sys/dev/glxiic/glxiic.c | 2 +- sys/dev/gpio/dwgpio/dwgpio.c | 2 +- sys/dev/hpt27xx/hpt27xx_osm_bsd.c | 2 +- sys/dev/hptiop/hptiop.c | 2 +- sys/dev/hptnr/hptnr_osm_bsd.c | 2 +- sys/dev/hyperv/input/hv_kbdc.c | 2 +- sys/dev/hyperv/utilities/hv_kvp.c | 2 +- sys/dev/hyperv/utilities/hv_snapshot.c | 2 +- sys/dev/ida/ida_disk.c | 2 +- sys/dev/iicbus/adc/ad7417.c | 2 +- sys/dev/iicbus/controller/twsi/a10_twsi.c | 2 +- sys/dev/iicbus/controller/twsi/twsi.c | 2 +- sys/dev/iicbus/if_ic.c | 2 +- sys/dev/iicbus/iic.c | 2 +- sys/dev/iicbus/iicbb.c | 2 +- sys/dev/iicbus/pwm/adt746x.c | 2 +- sys/dev/iicbus/sensor/ds1631.c | 2 +- sys/dev/iicbus/sensor/ds1775.c | 2 +- sys/dev/iicbus/sensor/max6690.c | 2 +- sys/dev/ipmi/ipmi_acpi.c | 2 +- sys/dev/ipmi/ipmi_isa.c | 2 +- sys/dev/ipmi/ipmi_pci.c | 4 ++-- sys/dev/ipmi/ipmi_smbus.c | 2 +- sys/dev/ips/ips_disk.c | 2 +- sys/dev/isci/isci.c | 2 +- sys/dev/iscsi/icl_soft.c | 2 +- sys/dev/iser/icl_iser.c | 2 +- sys/dev/isp/isp_pci.c | 2 +- sys/dev/itwd/itwd.c | 2 +- sys/dev/le/if_le_isa.c | 2 +- sys/dev/le/if_le_pci.c | 2 +- sys/dev/mfi/mfi_disk.c | 2 +- sys/dev/mfi/mfi_syspd.c | 2 +- sys/dev/mge/if_mge.c | 2 +- sys/dev/mlx/mlx_disk.c | 2 +- sys/dev/mpi3mr/mpi3mr_pci.c | 2 +- sys/dev/mpr/mpr_pci.c | 2 +- sys/dev/mvs/mvs.c | 2 +- sys/dev/mvs/mvs_pci.c | 2 +- sys/dev/mvs/mvs_soc.c | 2 +- sys/dev/ncthwm/ncthwm.c | 2 +- sys/dev/nfsmb/nfsmb.c | 4 ++-- sys/dev/nvd/nvd.c | 2 +- sys/dev/nvme/nvme_ahci.c | 2 +- sys/dev/nvme/nvme_pci.c | 2 +- sys/dev/nvme/nvme_sim.c | 2 +- sys/dev/ow/ow.c | 2 +- sys/dev/ow/ow_temp.c | 2 +- sys/dev/ow/owc_gpiobus.c | 2 +- sys/dev/pbio/pbio.c | 2 +- sys/dev/pcf/pcf_isa.c | 2 +- sys/dev/pci/fixup_pci.c | 2 +- sys/dev/pci/hostb_pci.c | 2 +- sys/dev/pci/ignore_pci.c | 2 +- sys/dev/pci/vga_pci.c | 2 +- sys/dev/pms/freebsd/driver/ini/src/agtiapi.c | 2 +- sys/dev/powermac_nvram/powermac_nvram.c | 2 +- sys/dev/ppbus/if_plip.c | 2 +- sys/dev/ppbus/lpt.c | 2 +- sys/dev/ppbus/pcfclock.c | 2 +- sys/dev/ppbus/ppbconf.c | 2 +- sys/dev/ppbus/ppi.c | 2 +- sys/dev/ppbus/pps.c | 2 +- sys/dev/ppc/ppc_acpi.c | 2 +- sys/dev/ppc/ppc_isa.c | 2 +- sys/dev/ppc/ppc_pci.c | 2 +- sys/dev/ppc/ppc_puc.c | 2 +- sys/dev/pst/pst-pci.c | 2 +- sys/dev/pst/pst-raid.c | 2 +- sys/dev/qlnx/qlnxe/qlnx_os.c | 4 ++-- sys/dev/qlxgb/qla_os.c | 2 +- sys/dev/qlxgbe/ql_os.c | 2 +- sys/dev/qlxge/qls_os.c | 2 +- sys/dev/sbni/if_sbni_isa.c | 2 +- sys/dev/sbni/if_sbni_pci.c | 2 +- sys/dev/siis/siis.c | 4 ++-- sys/dev/smartpqi/smartpqi_main.c | 2 +- sys/dev/smbios/smbios.c | 2 +- sys/dev/smbus/smb.c | 2 +- sys/dev/smc/if_smc.c | 2 +- sys/dev/smc/if_smc_acpi.c | 2 +- sys/dev/smc/if_smc_fdt.c | 2 +- sys/dev/sound/macio/davbus.c | 2 +- sys/dev/sound/macio/i2s.c | 4 ++-- sys/dev/sound/macio/onyx.c | 2 +- sys/dev/sound/macio/snapper.c | 2 +- sys/dev/sound/macio/tumbler.c | 2 +- sys/dev/sound/pci/als4000.c | 2 +- sys/dev/sound/pci/atiixp.c | 2 +- sys/dev/sound/pci/cmi.c | 2 +- sys/dev/sound/pci/cs4281.c | 2 +- sys/dev/sound/pci/csapcm.c | 2 +- sys/dev/sound/pci/envy24.c | 2 +- sys/dev/sound/pci/envy24ht.c | 2 +- sys/dev/sound/pci/es137x.c | 2 +- sys/dev/sound/pci/hdsp-pcm.c | 2 +- sys/dev/sound/pci/hdsp.c | 2 +- sys/dev/sound/pci/hdspe-pcm.c | 2 +- sys/dev/sound/pci/hdspe.c | 2 +- sys/dev/sound/pci/ich.c | 2 +- sys/dev/sound/pci/maestro3.c | 2 +- sys/dev/sound/pci/neomagic.c | 2 +- sys/dev/sound/pci/solo.c | 2 +- sys/dev/sound/pci/t4dwave.c | 2 +- sys/dev/sound/pci/vibes.c | 12 ++++++------ sys/dev/spibus/spigen.c | 2 +- sys/dev/tdfx/tdfx_pci.c | 2 +- sys/dev/ti/if_ti.c | 2 +- sys/dev/tpm/tpm_acpi.c | 2 +- sys/dev/tpm/tpm_isa.c | 2 +- sys/dev/uart/uart_bus_acpi.c | 2 +- sys/dev/uart/uart_bus_fdt.c | 2 +- sys/dev/uart/uart_bus_isa.c | 2 +- sys/dev/uart/uart_bus_puc.c | 2 +- sys/dev/uart/uart_bus_scc.c | 2 +- sys/dev/uart/uart_dev_imx.c | 2 +- sys/dev/uart/uart_dev_lowrisc.c | 2 +- sys/dev/uart/uart_dev_mu.c | 2 +- sys/dev/uart/uart_dev_mvebu.c | 2 +- sys/dev/uart/uart_dev_pl011.c | 2 +- sys/dev/uart/uart_dev_quicc.c | 2 +- sys/dev/uart/uart_dev_z8530.c | 2 +- sys/dev/ufshci/ufshci_pci.c | 3 ++- sys/dev/usb/controller/ehci_fsl.c | 2 +- sys/dev/usb/input/uep.c | 4 ++-- sys/dev/usb/net/uhso.c | 2 +- sys/dev/xilinx/if_xae.c | 2 +- 186 files changed, 208 insertions(+), 207 deletions(-) diff --git a/sys/dev/aacraid/aacraid_cam.c b/sys/dev/aacraid/aacraid_cam.c index 919bf1ad55ca..6cb515462f08 100644 --- a/sys/dev/aacraid/aacraid_cam.c +++ b/sys/dev/aacraid/aacraid_cam.c @@ -122,7 +122,7 @@ static device_method_t aacraid_pass_methods[] = { DEVMETHOD(device_probe, aac_cam_probe), DEVMETHOD(device_attach, aac_cam_attach), DEVMETHOD(device_detach, aac_cam_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t aacraid_pass_driver = { diff --git a/sys/dev/aacraid/aacraid_pci.c b/sys/dev/aacraid/aacraid_pci.c index cb4c6fb8eeba..37bcede44878 100644 --- a/sys/dev/aacraid/aacraid_pci.c +++ b/sys/dev/aacraid/aacraid_pci.c @@ -72,7 +72,7 @@ static device_method_t aacraid_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t aacraid_pci_driver = { diff --git a/sys/dev/acpi_support/acpi_asus.c b/sys/dev/acpi_support/acpi_asus.c index b9ba6650d2b7..975d7f93554a 100644 --- a/sys/dev/acpi_support/acpi_asus.c +++ b/sys/dev/acpi_support/acpi_asus.c @@ -517,7 +517,7 @@ static device_method_t acpi_asus_methods[] = { DEVMETHOD(device_probe, acpi_asus_probe), DEVMETHOD(device_attach, acpi_asus_attach), DEVMETHOD(device_detach, acpi_asus_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t acpi_asus_driver = { diff --git a/sys/dev/acpica/acpi_video.c b/sys/dev/acpica/acpi_video.c index 7a22c9dc0994..f949e14f58e6 100644 --- a/sys/dev/acpica/acpi_video.c +++ b/sys/dev/acpica/acpi_video.c @@ -176,7 +176,7 @@ static device_method_t acpi_video_methods[] = { DEVMETHOD(device_detach, acpi_video_detach), DEVMETHOD(device_resume, acpi_video_resume), DEVMETHOD(device_shutdown, acpi_video_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t acpi_video_driver = { diff --git a/sys/dev/adb/adb_bus.c b/sys/dev/adb/adb_bus.c index 7f4bd8676fcf..52d38caf7a24 100644 --- a/sys/dev/adb/adb_bus.c +++ b/sys/dev/adb/adb_bus.c @@ -57,15 +57,15 @@ static device_method_t adb_bus_methods[] = { DEVMETHOD(device_probe, adb_bus_probe), DEVMETHOD(device_attach, adb_bus_attach), DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), /* Bus Interface */ - DEVMETHOD(bus_probe_nomatch, adb_probe_nomatch), - DEVMETHOD(bus_print_child, adb_print_child), + DEVMETHOD(bus_probe_nomatch, adb_probe_nomatch), + DEVMETHOD(bus_print_child, adb_print_child), - { 0, 0 }, + DEVMETHOD_END }; driver_t adb_driver = { diff --git a/sys/dev/adb/adb_buttons.c b/sys/dev/adb/adb_buttons.c index e003183f9e9d..14d96cc5a05c 100644 --- a/sys/dev/adb/adb_buttons.c +++ b/sys/dev/adb/adb_buttons.c @@ -67,7 +67,7 @@ static device_method_t abtn_methods[] = { /* ADB interface */ DEVMETHOD(adb_receive_packet, abtn_receive_packet), - { 0, 0 } + DEVMETHOD_END }; static driver_t abtn_driver = { diff --git a/sys/dev/adb/adb_kbd.c b/sys/dev/adb/adb_kbd.c index f1b8d3589be9..ce81da855efc 100644 --- a/sys/dev/adb/adb_kbd.c +++ b/sys/dev/adb/adb_kbd.c @@ -99,7 +99,7 @@ static device_method_t adb_kbd_methods[] = { /* ADB interface */ DEVMETHOD(adb_receive_packet, adb_kbd_receive_packet), - { 0, 0 } + DEVMETHOD_END }; static driver_t adb_kbd_driver = { diff --git a/sys/dev/adb/adb_mouse.c b/sys/dev/adb/adb_mouse.c index e89612abddb2..92fc512efb45 100644 --- a/sys/dev/adb/adb_mouse.c +++ b/sys/dev/adb/adb_mouse.c @@ -104,7 +104,7 @@ static device_method_t adb_mouse_methods[] = { /* ADB interface */ DEVMETHOD(adb_receive_packet, adb_mouse_receive_packet), - { 0, 0 } + DEVMETHOD_END }; static driver_t adb_mouse_driver = { diff --git a/sys/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c index d0301f3a5c7e..b6dc2d34ddd4 100644 --- a/sys/dev/agp/agp_ali.c +++ b/sys/dev/agp/agp_ali.c @@ -253,7 +253,7 @@ static device_method_t agp_ali_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } + DEVMETHOD_END }; static driver_t agp_ali_driver = { diff --git a/sys/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c index e7f1deed188d..368ea7e4de7d 100644 --- a/sys/dev/agp/agp_amd.c +++ b/sys/dev/agp/agp_amd.c @@ -390,7 +390,7 @@ static device_method_t agp_amd_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } + DEVMETHOD_END }; static driver_t agp_amd_driver = { diff --git a/sys/dev/agp/agp_amd64.c b/sys/dev/agp/agp_amd64.c index ff36200bd299..287e6fb7218c 100644 --- a/sys/dev/agp/agp_amd64.c +++ b/sys/dev/agp/agp_amd64.c @@ -498,7 +498,7 @@ static device_method_t agp_amd64_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } + DEVMETHOD_END }; static driver_t agp_amd64_driver = { diff --git a/sys/dev/agp/agp_apple.c b/sys/dev/agp/agp_apple.c index 48938044a5d6..d2a94cd654f7 100644 --- a/sys/dev/agp/agp_apple.c +++ b/sys/dev/agp/agp_apple.c @@ -278,7 +278,7 @@ static device_method_t agp_apple_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } + DEVMETHOD_END }; static driver_t agp_apple_driver = { diff --git a/sys/dev/agp/agp_ati.c b/sys/dev/agp/agp_ati.c index a383acdb89dc..667be51f48e8 100644 --- a/sys/dev/agp/agp_ati.c +++ b/sys/dev/agp/agp_ati.c @@ -362,7 +362,7 @@ static device_method_t agp_ati_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } + DEVMETHOD_END }; static driver_t agp_ati_driver = { diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c index 371eac691916..fa98d6f56a3a 100644 --- a/sys/dev/agp/agp_i810.c +++ b/sys/dev/agp/agp_i810.c @@ -1913,7 +1913,7 @@ static device_method_t agp_i810_methods[] = { DEVMETHOD(agp_bind_memory, agp_i810_bind_memory), DEVMETHOD(agp_unbind_memory, agp_i810_unbind_memory), DEVMETHOD(agp_chipset_flush, agp_intel_gtt_chipset_flush), - { 0, 0 } + DEVMETHOD_END }; static driver_t agp_i810_driver = { diff --git a/sys/dev/agp/agp_intel.c b/sys/dev/agp/agp_intel.c index d8abd759dec6..0fec1f8a5201 100644 --- a/sys/dev/agp/agp_intel.c +++ b/sys/dev/agp/agp_intel.c @@ -419,7 +419,7 @@ static device_method_t agp_intel_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } + DEVMETHOD_END }; static driver_t agp_intel_driver = { diff --git a/sys/dev/agp/agp_nvidia.c b/sys/dev/agp/agp_nvidia.c index fa5b73023f59..8a24063f9d90 100644 --- a/sys/dev/agp/agp_nvidia.c +++ b/sys/dev/agp/agp_nvidia.c @@ -435,7 +435,7 @@ static device_method_t agp_nvidia_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } + DEVMETHOD_END }; static driver_t agp_nvidia_driver = { diff --git a/sys/dev/agp/agp_sis.c b/sys/dev/agp/agp_sis.c index 3df1ca19f478..daea60c5f30f 100644 --- a/sys/dev/agp/agp_sis.c +++ b/sys/dev/agp/agp_sis.c @@ -273,7 +273,7 @@ static device_method_t agp_sis_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } + DEVMETHOD_END }; static driver_t agp_sis_driver = { diff --git a/sys/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c index 3948f1a96697..9d0871ae9b21 100644 --- a/sys/dev/agp/agp_via.c +++ b/sys/dev/agp/agp_via.c @@ -408,7 +408,7 @@ static device_method_t agp_via_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } + DEVMETHOD_END }; static driver_t agp_via_driver = { diff --git a/sys/dev/aic7xxx/ahc_isa.c b/sys/dev/aic7xxx/ahc_isa.c index e096a9e5bb6d..37308b9dac6c 100644 --- a/sys/dev/aic7xxx/ahc_isa.c +++ b/sys/dev/aic7xxx/ahc_isa.c @@ -285,7 +285,7 @@ static device_method_t ahc_isa_device_methods[] = { DEVMETHOD(device_probe, ahc_isa_probe), DEVMETHOD(device_attach, ahc_isa_attach), DEVMETHOD(device_detach, ahc_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ahc_isa_driver = { diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c index 7f8fbe140237..4c3cbc6a2422 100644 --- a/sys/dev/aic7xxx/ahc_pci.c +++ b/sys/dev/aic7xxx/ahc_pci.c @@ -41,7 +41,7 @@ static device_method_t ahc_pci_device_methods[] = { DEVMETHOD(device_probe, ahc_pci_probe), DEVMETHOD(device_attach, ahc_pci_attach), DEVMETHOD(device_detach, ahc_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ahc_pci_driver = { diff --git a/sys/dev/aic7xxx/ahd_pci.c b/sys/dev/aic7xxx/ahd_pci.c index 6af7169b49ff..f53563e4ba40 100644 --- a/sys/dev/aic7xxx/ahd_pci.c +++ b/sys/dev/aic7xxx/ahd_pci.c @@ -41,7 +41,7 @@ static device_method_t ahd_pci_device_methods[] = { DEVMETHOD(device_probe, ahd_pci_probe), DEVMETHOD(device_attach, ahd_pci_attach), DEVMETHOD(device_detach, ahd_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ahd_pci_driver = { diff --git a/sys/dev/al_eth/al_eth.c b/sys/dev/al_eth/al_eth.c index f4fec7c6aa94..47d31c264f67 100644 --- a/sys/dev/al_eth/al_eth.c +++ b/sys/dev/al_eth/al_eth.c @@ -242,7 +242,7 @@ static device_method_t al_methods[] = { DEVMETHOD(miibus_writereg, al_miibus_writereg), DEVMETHOD(miibus_statchg, al_miibus_statchg), DEVMETHOD(miibus_linkchg, al_miibus_linkchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t al_driver = { diff --git a/sys/dev/alpm/alpm.c b/sys/dev/alpm/alpm.c index d7c3d3657d3b..2bf74c276a5f 100644 --- a/sys/dev/alpm/alpm.c +++ b/sys/dev/alpm/alpm.c @@ -642,7 +642,7 @@ static device_method_t alpm_methods[] = { DEVMETHOD(smbus_readw, alpm_readw), DEVMETHOD(smbus_bwrite, alpm_bwrite), DEVMETHOD(smbus_bread, alpm_bread), - { 0, 0 } + DEVMETHOD_END }; static driver_t alpm_driver = { diff --git a/sys/dev/amdpm/amdpm.c b/sys/dev/amdpm/amdpm.c index d744c0aa5d4b..f93cc5b2eaa7 100644 --- a/sys/dev/amdpm/amdpm.c +++ b/sys/dev/amdpm/amdpm.c @@ -648,7 +648,7 @@ static device_method_t amdpm_methods[] = { DEVMETHOD(smbus_readw, amdpm_readw), DEVMETHOD(smbus_bwrite, amdpm_bwrite), DEVMETHOD(smbus_bread, amdpm_bread), - { 0, 0 } + DEVMETHOD_END }; static driver_t amdpm_driver = { diff --git a/sys/dev/amdsmb/amdsmb.c b/sys/dev/amdsmb/amdsmb.c index 3d2e7a5e0c19..65992dc34b02 100644 --- a/sys/dev/amdsmb/amdsmb.c +++ b/sys/dev/amdsmb/amdsmb.c @@ -560,7 +560,7 @@ static device_method_t amdsmb_methods[] = { DEVMETHOD(smbus_readw, amdsmb_readw), DEVMETHOD(smbus_bwrite, amdsmb_bwrite), DEVMETHOD(smbus_bread, amdsmb_bread), - { 0, 0 } + DEVMETHOD_END }; static driver_t amdsmb_driver = { diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 084b57331dd9..dd7ad7d5e66d 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -534,7 +534,7 @@ static device_method_t asmc_methods[] = { DEVMETHOD(device_attach, asmc_attach), DEVMETHOD(device_detach, asmc_detach), DEVMETHOD(device_resume, asmc_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t asmc_driver = { diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c index d5ef9706d7b9..64545ce63ba9 100644 --- a/sys/dev/atkbdc/atkbd_atkbdc.c +++ b/sys/dev/atkbdc/atkbd_atkbdc.c @@ -61,7 +61,7 @@ static device_method_t atkbd_methods[] = { DEVMETHOD(device_probe, atkbdprobe), DEVMETHOD(device_attach, atkbdattach), DEVMETHOD(device_resume, atkbdresume), - { 0, 0 } + DEVMETHOD_END }; static driver_t atkbd_driver = { diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c index 062c5fc491e8..fe8bbf0c8d75 100644 --- a/sys/dev/atkbdc/atkbdc_isa.c +++ b/sys/dev/atkbdc/atkbdc_isa.c @@ -75,7 +75,7 @@ static device_method_t atkbdc_isa_methods[] = { DEVMETHOD(bus_delete_resource, bus_generic_rl_delete_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t atkbdc_isa_driver = { diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 95acf43a3bc6..a2fc68d0f52a 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -745,7 +745,7 @@ static device_method_t psm_methods[] = { DEVMETHOD(device_attach, psmattach), DEVMETHOD(device_detach, psmdetach), DEVMETHOD(device_resume, psmresume), - { 0, 0 } + DEVMETHOD_END }; static driver_t psm_driver = { @@ -7543,7 +7543,7 @@ static device_attach_t psmcpnp_attach; static device_method_t psmcpnp_methods[] = { DEVMETHOD(device_probe, psmcpnp_probe), DEVMETHOD(device_attach, psmcpnp_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t psmcpnp_driver = { diff --git a/sys/dev/axgbe/if_axgbe.c b/sys/dev/axgbe/if_axgbe.c index b35beca9c886..9a6b2a95d6b2 100644 --- a/sys/dev/axgbe/if_axgbe.c +++ b/sys/dev/axgbe/if_axgbe.c @@ -559,7 +559,7 @@ static device_method_t axgbe_methods[] = { DEVMETHOD(device_probe, axgbe_probe), DEVMETHOD(device_attach, axgbe_attach), - { 0, 0 } + DEVMETHOD_END }; DEFINE_CLASS_0(axgbe, axgbe_driver, axgbe_methods, @@ -602,7 +602,7 @@ static device_method_t axgbephy_methods[] = { DEVMETHOD(device_probe, axgbephy_probe), DEVMETHOD(device_attach, axgbephy_attach), - { 0, 0 } + DEVMETHOD_END }; DEFINE_CLASS_0(axgbephy, axgbephy_driver, axgbephy_methods, 0); diff --git a/sys/dev/cfe/cfe_resource.c b/sys/dev/cfe/cfe_resource.c index 78c5f149ba7d..223178e36e47 100644 --- a/sys/dev/cfe/cfe_resource.c +++ b/sys/dev/cfe/cfe_resource.c @@ -144,7 +144,7 @@ static device_method_t cferes_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t cferes_driver = { diff --git a/sys/dev/cfi/cfi_disk.c b/sys/dev/cfi/cfi_disk.c index 4c3eae473fb6..3beef8821ae4 100644 --- a/sys/dev/cfi/cfi_disk.c +++ b/sys/dev/cfi/cfi_disk.c @@ -346,7 +346,7 @@ static device_method_t cfi_disk_methods[] = { DEVMETHOD(device_probe, cfi_disk_probe), DEVMETHOD(device_attach, cfi_disk_attach), DEVMETHOD(device_detach, cfi_disk_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t cfi_disk_driver = { "cfid", diff --git a/sys/dev/chromebook_platform/chromebook_platform.c b/sys/dev/chromebook_platform/chromebook_platform.c index f873338a3ba6..c7c1ff4222a1 100644 --- a/sys/dev/chromebook_platform/chromebook_platform.c +++ b/sys/dev/chromebook_platform/chromebook_platform.c @@ -82,7 +82,7 @@ chromebook_i2c_identify(driver_t *driver, device_t bus) static device_method_t chromebook_i2c_methods[] = { DEVMETHOD(device_identify, chromebook_i2c_identify), - { 0, 0 } + DEVMETHOD_END }; static driver_t chromebook_i2c_driver = { diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index dd3df631119a..416f6e86e663 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -217,7 +217,7 @@ static device_method_t ciss_methods[] = { DEVMETHOD(device_attach, ciss_attach), DEVMETHOD(device_detach, ciss_detach), DEVMETHOD(device_shutdown, ciss_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t ciss_pci_driver = { diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index 616a2ecc1a37..81fd3cb45841 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -187,7 +187,7 @@ static device_method_t cxgb_port_methods[] = { DEVMETHOD(device_probe, cxgb_port_probe), DEVMETHOD(device_attach, cxgb_port_attach), DEVMETHOD(device_detach, cxgb_port_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t cxgb_port_driver = { diff --git a/sys/dev/cxgbe/cxgbei/icl_cxgbei.c b/sys/dev/cxgbe/cxgbei/icl_cxgbei.c index 9cdfd0fb9652..d90d7904a8ae 100644 --- a/sys/dev/cxgbe/cxgbei/icl_cxgbei.c +++ b/sys/dev/cxgbe/cxgbei/icl_cxgbei.c @@ -164,7 +164,7 @@ static kobj_method_t icl_cxgbei_methods[] = { KOBJMETHOD(icl_conn_task_done, icl_cxgbei_conn_task_done), KOBJMETHOD(icl_conn_transfer_setup, icl_cxgbei_conn_transfer_setup), KOBJMETHOD(icl_conn_transfer_done, icl_cxgbei_conn_transfer_done), - { 0, 0 } + KOBJMETHOD_END }; DEFINE_CLASS(icl_cxgbei, icl_cxgbei_methods, sizeof(struct icl_cxgbei_conn)); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index ecbe4d997278..cb0ad2342e7c 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -128,7 +128,7 @@ device_method_t cxgbe_methods[] = { DEVMETHOD(device_probe, cxgbe_probe), DEVMETHOD(device_attach, cxgbe_attach), DEVMETHOD(device_detach, cxgbe_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t cxgbe_driver = { "cxgbe", @@ -144,7 +144,7 @@ static device_method_t vcxgbe_methods[] = { DEVMETHOD(device_probe, vcxgbe_probe), DEVMETHOD(device_attach, vcxgbe_attach), DEVMETHOD(device_detach, vcxgbe_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t vcxgbe_driver = { "vcxgbe", diff --git a/sys/dev/dcons/dcons_crom.c b/sys/dev/dcons/dcons_crom.c index d31a69adf03c..59e30935d04b 100644 --- a/sys/dev/dcons/dcons_crom.c +++ b/sys/dev/dcons/dcons_crom.c @@ -253,7 +253,7 @@ static device_method_t dcons_crom_methods[] = { DEVMETHOD(device_probe, dcons_crom_probe), DEVMETHOD(device_attach, dcons_crom_attach), DEVMETHOD(device_detach, dcons_crom_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t dcons_crom_driver = { diff --git a/sys/dev/dpaa/bman_fdt.c b/sys/dev/dpaa/bman_fdt.c index 34b29ad6e236..330db7b89715 100644 --- a/sys/dev/dpaa/bman_fdt.c +++ b/sys/dev/dpaa/bman_fdt.c @@ -56,7 +56,7 @@ static device_method_t bman_methods[] = { DEVMETHOD(device_resume, bman_resume), DEVMETHOD(device_shutdown, bman_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t bman_driver = { @@ -93,7 +93,7 @@ static device_method_t bm_portals_methods[] = { DEVMETHOD(device_attach, bman_portals_fdt_attach), DEVMETHOD(device_detach, bman_portals_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t bm_portals_driver = { diff --git a/sys/dev/dpaa/fman_fdt.c b/sys/dev/dpaa/fman_fdt.c index 2386f4e7ec0b..4d3723b6de4d 100644 --- a/sys/dev/dpaa/fman_fdt.c +++ b/sys/dev/dpaa/fman_fdt.c @@ -56,7 +56,7 @@ static device_method_t fman_methods[] = { DEVMETHOD(bus_alloc_resource, fman_alloc_resource), DEVMETHOD(bus_activate_resource, fman_activate_resource), DEVMETHOD(bus_release_resource, fman_release_resource), - { 0, 0 } + DEVMETHOD_END }; DEFINE_CLASS_1(fman, fman_driver, fman_methods, diff --git a/sys/dev/dpaa/fman_mdio.c b/sys/dev/dpaa/fman_mdio.c index 6ca12befe9e7..8df716fc5571 100644 --- a/sys/dev/dpaa/fman_mdio.c +++ b/sys/dev/dpaa/fman_mdio.c @@ -90,7 +90,7 @@ static device_method_t pqmdio_methods[] = { DEVMETHOD(miibus_readreg, pqmdio_miibus_readreg), DEVMETHOD(miibus_writereg, pqmdio_miibus_writereg), - { 0, 0 } + DEVMETHOD_END }; static struct ofw_compat_data mdio_compat_data[] = { diff --git a/sys/dev/dpaa/if_dtsec_fdt.c b/sys/dev/dpaa/if_dtsec_fdt.c index b37f32c07b99..441ff9c96c50 100644 --- a/sys/dev/dpaa/if_dtsec_fdt.c +++ b/sys/dev/dpaa/if_dtsec_fdt.c @@ -77,7 +77,7 @@ static device_method_t dtsec_methods[] = { DEVMETHOD(miibus_writereg, dtsec_miibus_writereg), DEVMETHOD(miibus_statchg, dtsec_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t dtsec_driver = { diff --git a/sys/dev/dpaa/qman_fdt.c b/sys/dev/dpaa/qman_fdt.c index 35016073ba0e..89bf802e0067 100644 --- a/sys/dev/dpaa/qman_fdt.c +++ b/sys/dev/dpaa/qman_fdt.c @@ -56,7 +56,7 @@ static device_method_t qman_methods[] = { DEVMETHOD(device_resume, qman_resume), DEVMETHOD(device_shutdown, qman_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t qman_driver = { @@ -93,7 +93,7 @@ static device_method_t qm_portals_methods[] = { DEVMETHOD(device_attach, qman_portals_fdt_attach), DEVMETHOD(device_detach, qman_portals_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t qm_portals_driver = { diff --git a/sys/dev/dpms/dpms.c b/sys/dev/dpms/dpms.c index 05397e880b85..659b852c046e 100644 --- a/sys/dev/dpms/dpms.c +++ b/sys/dev/dpms/dpms.c @@ -106,7 +106,7 @@ static device_method_t dpms_methods[] = { DEVMETHOD(device_detach, dpms_detach), DEVMETHOD(device_suspend, dpms_suspend), DEVMETHOD(device_resume, dpms_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t dpms_driver = { diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index f57a19e8a112..21a520db8b89 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -684,7 +684,7 @@ static device_method_t dwc_methods[] = { DEVMETHOD(miibus_writereg, dwc1000_miibus_write_reg), DEVMETHOD(miibus_statchg, dwc1000_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; driver_t dwc_driver = { diff --git a/sys/dev/fb/fbd.c b/sys/dev/fb/fbd.c index 6bae94aa6db6..f74c11bbf86b 100644 --- a/sys/dev/fb/fbd.c +++ b/sys/dev/fb/fbd.c @@ -348,7 +348,7 @@ static device_method_t fbd_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; driver_t fbd_driver = { diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 58fcd1d5ea3d..2a1e426c24d0 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -2087,7 +2087,7 @@ static device_method_t fd_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), /* XXX */ DEVMETHOD(device_resume, bus_generic_resume), /* XXX */ - { 0, 0 } + DEVMETHOD_END }; static driver_t fd_driver = { diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c index c1c8991e3e33..0216e1fda793 100644 --- a/sys/dev/fdc/fdc_isa.c +++ b/sys/dev/fdc/fdc_isa.c @@ -210,7 +210,7 @@ static device_method_t fdc_methods[] = { DEVMETHOD(bus_write_ivar, fdc_write_ivar), /* Our children never use any other bus interface methods. */ - { 0, 0 } + DEVMETHOD_END }; static driver_t fdc_driver = { diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c index 44d3425799e9..4f8d0087e9ab 100644 --- a/sys/dev/firewire/if_fwe.c +++ b/sys/dev/firewire/if_fwe.c @@ -613,7 +613,7 @@ static device_method_t fwe_methods[] = { DEVMETHOD(device_probe, fwe_probe), DEVMETHOD(device_attach, fwe_attach), DEVMETHOD(device_detach, fwe_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t fwe_driver = { diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c index 41143e2e59d4..42f0c6f53743 100644 --- a/sys/dev/firewire/if_fwip.c +++ b/sys/dev/firewire/if_fwip.c @@ -916,7 +916,7 @@ static device_method_t fwip_methods[] = { DEVMETHOD(device_probe, fwip_probe), DEVMETHOD(device_attach, fwip_attach), DEVMETHOD(device_detach, fwip_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t fwip_driver = { diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c index be1e60e45e75..9e76000f5fb6 100644 --- a/sys/dev/firewire/sbp.c +++ b/sys/dev/firewire/sbp.c @@ -2835,7 +2835,7 @@ static device_method_t sbp_methods[] = { DEVMETHOD(device_detach, sbp_detach), DEVMETHOD(device_shutdown, sbp_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t sbp_driver = { diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c index 4efc16c1ee47..96a86c25b684 100644 --- a/sys/dev/firewire/sbp_targ.c +++ b/sys/dev/firewire/sbp_targ.c @@ -2036,7 +2036,7 @@ static device_method_t sbp_targ_methods[] = { DEVMETHOD(device_probe, sbp_targ_probe), DEVMETHOD(device_attach, sbp_targ_attach), DEVMETHOD(device_detach, sbp_targ_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sbp_targ_driver = { diff --git a/sys/dev/flash/cqspi.c b/sys/dev/flash/cqspi.c index 4774d14add0e..9da1676bae5a 100644 --- a/sys/dev/flash/cqspi.c +++ b/sys/dev/flash/cqspi.c @@ -754,7 +754,7 @@ static device_method_t cqspi_methods[] = { DEVMETHOD(qspi_write, cqspi_write), DEVMETHOD(qspi_erase, cqspi_erase), - { 0, 0 } + DEVMETHOD_END }; DEFINE_CLASS_1(cqspi, cqspi_driver, cqspi_methods, diff --git a/sys/dev/flash/flexspi/flex_spi.c b/sys/dev/flash/flexspi/flex_spi.c index 44246f4b1c2d..12f431548d2a 100644 --- a/sys/dev/flash/flexspi/flex_spi.c +++ b/sys/dev/flash/flexspi/flex_spi.c @@ -970,7 +970,7 @@ static device_method_t flex_spi_methods[] = { DEVMETHOD(device_attach, flex_spi_attach), DEVMETHOD(device_detach, flex_spi_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t flex_spi_driver = { diff --git a/sys/dev/flash/mx25l.c b/sys/dev/flash/mx25l.c index 64e3e53d4291..c7c95716aaed 100644 --- a/sys/dev/flash/mx25l.c +++ b/sys/dev/flash/mx25l.c @@ -673,7 +673,7 @@ static device_method_t mx25l_methods[] = { DEVMETHOD(device_attach, mx25l_attach), DEVMETHOD(device_detach, mx25l_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t mx25l_driver = { diff --git a/sys/dev/flash/n25q.c b/sys/dev/flash/n25q.c index 95d005125930..495649357bf1 100644 *** 1760 LINES SKIPPED *** From nobody Wed Feb 25 06:38:52 2026 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 4fLQ0X2Yn6z6Sg0S for ; Wed, 25 Feb 2026 06:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLQ0X1fhWz3HVm for ; Wed, 25 Feb 2026 06:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772001532; 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=Nxbvbep1ciwEQcvB0bnEtGELxtsWMaTawBDi+ERF7jc=; b=KHuB99fkdv860MkItES24Os3a+MbXLTCnuiaFixZ2q3SpuIvEdR3ni/qJwJBMoKT7n4+jf yZTKwWyER+24rHGVuU+n1ofxEyx0qlhwnwSX7RzIcUrWLZ/Nb+i81uQOFwLC1DFIc+8rY9 wC+kR5VeYAHzvPUG7SCGXXGU+d0Kbiv/f5HYMsjkfH2FSM5VomuT5zfqyHt1LsAFulTDFI v9eld5riYxfDCgrzBA2mc30CfS9SrNBLZsdnSbljRohCUWuMrR2SMIbsNLZCjzq50czpkw JCIf7qRhvQZxdxK0dI72NGOZv2D+zJCLzujS8Kb9fNspl9W9mxG4/B9pbpuGQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772001532; a=rsa-sha256; cv=none; b=kLABcIXytGCh52RtItL63EaVSYcghpyFqHN1vaNgqgz9RzzmRL4fH31K3tXeQMiFOOo2e9 0ZP6P/AWZOtX4c8NGVlNeG2l7LPxDkUB+IxCpnHiU+wk/th7q1WrWCIKoHf/rNsBbzWn3R 6TROp46LuoQc628mxYC0gBMp412Xq9gDgBxxWNPGqng3EkQpruvendJx8/lixRRQqmvtPS cAI3HVLWjLTAoeq6BrkyOt/EOkjwx0dnwZkcdXYZXS2TurgP2aO3fYAG9frvMlKZSGGi6E v/qcw9GSzMQOuX1reOCbovICI50SVQrTtyBHioXmkvdrVgBkLF400TXnvX8t/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772001532; 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=Nxbvbep1ciwEQcvB0bnEtGELxtsWMaTawBDi+ERF7jc=; b=wGSdQLA6LEyj/7frPS4KdVLO7qL9FB9cRdmBWyXXmxU6ck0Vc5XzWlHzhv4sH2r1a0PIc2 990mZNlF4ADwZlvRpjLF5oNtX+msottNDk0Z9pwK9DCqH3uJZKF2kIHgFbP1uGiRdOH4N0 xpFuAS8rkMYnChk5SHOHkTXoT7NaHfk7tHmmJrWu9LgZCak8TTDfabkoDS0FuiAQrQAjjh LheBS48GOrXjyHyvUGiG+hUOWodmA0pqE2YY/GAJPhWUm43uBsDq+BzmwbrFyGLXO7GRCQ y3Yu8yG1FnKy57d3nn5wRbda7SRbQbmphnySEFRBs/Z+iQA2ql4IasbIT91FHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLQ0X0zSFzrL4 for ; Wed, 25 Feb 2026 06:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43456 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 06:38:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: 94db365042d3 - main - asmc: add Wake-on-LAN control via sysctl 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94db365042d35ff7e3ee7365a87a89bab1560030 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 06:38:52 +0000 Message-Id: <699e98fc.43456.7db13a6@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=94db365042d35ff7e3ee7365a87a89bab1560030 commit 94db365042d35ff7e3ee7365a87a89bab1560030 Author: Abdelkader Boudih AuthorDate: 2026-02-25 06:32:42 +0000 Commit: Enji Cooper CommitDate: 2026-02-25 06:38:19 +0000 asmc: add Wake-on-LAN control via sysctl Apple Mac systems support Wake-on-LAN from powered-off state (S5/G2) via the AUPO SMC key. This change adds a convenience sysctl, `dev.asmc.0.wol`. This can be disabled if set to 0 and enabled if set to 1. The AUPO key is volatile and resets to 0x00 on every boot, so WoL must be manually enabled before each shutdown to work from powered-off state. Users need to run: `sysctl dev.asmc.0.wol=1` before shutting down the system. The sysctl is best set to persist in `/etc/sysctl.conf`. MFC after: 1 week Reviewed By: markj, ngie Differential Revision: https://reviews.freebsd.org/D54439 --- sys/dev/asmc/asmc.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ sys/dev/asmc/asmcvar.h | 5 +++++ 2 files changed, 50 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index dd7ad7d5e66d..35c050cab100 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -108,6 +108,7 @@ static int asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS); +static int asmc_wol_sysctl(SYSCTL_HANDLER_ARGS); struct asmc_model { const char *smc_model; /* smbios.system.product env var. */ @@ -879,9 +880,12 @@ static int asmc_init(device_t dev) { struct asmc_softc *sc = device_get_softc(dev); + struct sysctl_ctx_list *sysctlctx; int i, error = 1; uint8_t buf[4]; + sysctlctx = device_get_sysctl_ctx(dev); + if (sc->sc_model->smc_sms_x == NULL) goto nosms; @@ -951,6 +955,16 @@ asmc_init(device_t dev) out: asmc_sms_calibrate(dev); nosms: + /* Wake-on-LAN convenience sysctl */ + if (asmc_key_read(dev, ASMC_KEY_AUPO, buf, 1) == 0) { + SYSCTL_ADD_PROC(sysctlctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "wol", + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, + dev, 0, asmc_wol_sysctl, "I", + "Wake-on-LAN enable (0=off, 1=on)"); + } + sc->sc_nfan = asmc_fan_count(dev); if (sc->sc_nfan > ASMC_MAXFANS) { device_printf(dev, @@ -1704,3 +1718,34 @@ asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS) return (error); } + +/* + * Wake-on-LAN convenience sysctl. + * Reading returns 1 if WoL is enabled, 0 if disabled. + * Writing 1 enables WoL, 0 disables it. + */ +static int +asmc_wol_sysctl(SYSCTL_HANDLER_ARGS) +{ + device_t dev = (device_t)arg1; + uint8_t aupo; + int val, error; + + /* Read current AUPO value */ + if (asmc_key_read(dev, ASMC_KEY_AUPO, &aupo, 1) != 0) + return (EIO); + + val = (aupo != 0) ? 1 : 0; + error = sysctl_handle_int(oidp, &val, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + + /* Clamp to 0 or 1 */ + aupo = (val != 0) ? 1 : 0; + + /* Write AUPO */ + if (asmc_key_write(dev, ASMC_KEY_AUPO, &aupo, 1) != 0) + return (EIO); + + return (0); +} diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index a6e9c75017e0..97e5076455c9 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -125,6 +125,11 @@ struct asmc_softc { */ #define ASMC_KEY_CLAMSHELL "MSLD" /* RO; 1 byte */ +/* + * Auto power on / Wake-on-LAN. + */ +#define ASMC_KEY_AUPO "AUPO" /* RW; 1 byte */ + /* * Interrupt keys. */ From nobody Wed Feb 25 06:42:28 2026 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 4fLQ4h52W8z6Sgqc for ; Wed, 25 Feb 2026 06:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLQ4h3yvGz3JhT for ; Wed, 25 Feb 2026 06:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772001748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2Q4ivKEd4sQhmLQNSzG75ijNJQFsrYU/rdB1vzzmBU=; b=dfju0Q2IKoklKHwS2aZygnLMIxe9J7rJ1YRWypI99GJmw/USk4P9vKDat8G+0eiz/L1Tba au5jqAbl+Z53yTW8qhH7Pxiw2zhehnWzEybsmQu6m186I+w0dbyx+r7bYRjlG7A1Ycn8GV xROGVQNzA2zgEV9sHZnynO1DJUYJxOajG0Y6phu7lVgtrYFYv4PmQk1iJE2nKr6MuFSnXQ PPai13kXllP2Z8lXYf06PK/801e6gjLdHlgCtbPdCaRsgdiS3ZOXScmvGqrpbWZ6JrZmOv ZIa5JbGLNnNIhxUI50EEuUwaT7IrrNJSfB5B19l0ntB1XvhK95fPiHQLOKVOrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772001748; a=rsa-sha256; cv=none; b=yRQVr1UjZ28JMrWtIgA5DKRrr0oUjkJax3cTCn+JVE4/OoJbyAgyEXwHhO3+18xvo7/JOv mjbnFIFYlMFNko7CSTssiariXHCZAWjweFlmALuRaOyE13HnQD+qnuYxvMJPZ3w5GNThbx x/Rer4tBVeXIxF7WO2pwYSwvhPoxQG7IKvUuH1oA4xA1K4zen9Yab656LC5Hr9K+6vUT7+ cSaF3X9guYnOkNsQNmSb1C2+AFItxMNGTZ7FEqIoRD7u7kLJ10dkAqmKUIaOLKnbKOIF6j 052bb2G0gqR8fcgjvhdEys0JFRJMB5BGLlgo8s1a7qsuMqGgrfPA72uqzzb2wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772001748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e2Q4ivKEd4sQhmLQNSzG75ijNJQFsrYU/rdB1vzzmBU=; b=j0Usyt+2/1TIpuuIKiRFQvCySHGjsF41houVQ3x6vhcdVTkRYDssukmI2oajxOsLIPYsbS 0YpBZ3EDEXwl5Bm5kFU9Y0wzib2UBZf0nbmt4/VbEum/38+0HdwAy9aqcDmP6bSVtAkCqJ TN4j0HBZjRvto84himgR75LcTKfR0Q6uiB+IA+huFzAOdbtxUoEwKrFAs7PptN9bs2t802 9wM7qnG9lWusTjVM0ZfLIolhX9aiq0LELG0v9tA5VkASHsKJhZU76HL1gtpU2ggFguJUK/ XrXMleHoQCiVVL2jLPwF931FuS2WGGSMUJt3EhzPMoDBAZokGZ/qSroZLxVxgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLQ4h3JcBzrWf for ; Wed, 25 Feb 2026 06:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4478a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 06:42:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 3023bb49e115 - main - asmc: introduce the concept of generic models 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3023bb49e115b4149f9fc0683dabde172ecb1336 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 06:42:28 +0000 Message-Id: <699e99d4.4478a.67cccaa5@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3023bb49e115b4149f9fc0683dabde172ecb1336 commit 3023bb49e115b4149f9fc0683dabde172ecb1336 Author: Enji Cooper AuthorDate: 2026-02-20 06:37:05 +0000 Commit: Enji Cooper CommitDate: 2026-02-25 06:41:42 +0000 asmc: introduce the concept of generic models Having to enter in each of the models for Apple hardware, recompiling, etc, is tedious. Provide generic models so end-users can leverage some of the capabilities provided by the driver, i.e., common features like minimal fans and lights (if present on the generic model) support. The generic models are as follows: - Macmini - MacBookAir - MacBookPro - MacPro This sort of follows the pattern established by the `applesmc` driver in Linux. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55395 --- sys/dev/asmc/asmc.c | 80 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 67 insertions(+), 13 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 35c050cab100..cf977071cc69 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -176,6 +176,11 @@ static const struct asmc_model *asmc_match(device_t dev); .smc_light_right = NULL, \ .smc_light_control = NULL +#define ASMC_TEMPS_FUNCS_DISABLED \ + .smc_temps = {}, \ + .smc_tempnames = {}, \ + .smc_tempdescs = {} \ + static const struct asmc_model asmc_models[] = { { "MacBook1,1", "Apple SMC MacBook Core Duo", @@ -517,8 +522,42 @@ static const struct asmc_model asmc_models[] = { ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS, ASMC_MBA7_TEMPS, ASMC_MBA7_TEMPNAMES, ASMC_MBA7_TEMPDESCS + } +}; + +static const struct asmc_model asmc_generic_models[] = { + { + .smc_model = "MacBookAir", + .smc_desc = NULL, + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS2, + ASMC_LIGHT_FUNCS, + ASMC_TEMPS_FUNCS_DISABLED + }, + { + .smc_model = "MacBookPro", + .smc_desc = NULL, + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS2, + ASMC_LIGHT_FUNCS, + ASMC_TEMPS_FUNCS_DISABLED + }, + { + .smc_model = "MacPro", + .smc_desc = NULL, + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS2, + ASMC_LIGHT_FUNCS_DISABLED, + ASMC_TEMPS_FUNCS_DISABLED }, - { NULL, NULL } + { + .smc_model = "Macmini", + .smc_desc = NULL, + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS2, + ASMC_LIGHT_FUNCS_DISABLED, + ASMC_TEMPS_FUNCS_DISABLED + } }; #undef ASMC_SMS_FUNCS @@ -566,28 +605,41 @@ MODULE_DEPEND(asmc, acpi, 1, 1, 1); static const struct asmc_model * asmc_match(device_t dev) { + const struct asmc_model *model; + char *model_name; int i; - char *model; - model = kern_getenv("smbios.system.product"); - if (model == NULL) - return (NULL); + model = NULL; + + model_name = kern_getenv("smbios.system.product"); + if (model_name == NULL) + goto out; - for (i = 0; asmc_models[i].smc_model; i++) { - if (!strncmp(model, asmc_models[i].smc_model, strlen(model))) { - freeenv(model); - return (&asmc_models[i]); + for (i = 0; i < nitems(asmc_models); i++) { + if (strncmp(model_name, asmc_models[i].smc_model, + strlen(model_name)) == 0) { + model = &asmc_models[i]; + goto out; + } + } + for (i = 0; i < nitems(asmc_generic_models); i++) { + if (strncmp(model_name, asmc_generic_models[i].smc_model, + strlen(asmc_generic_models[i].smc_model)) == 0) { + model = &asmc_generic_models[i]; + goto out; } } - freeenv(model); - return (NULL); +out: + freeenv(model_name); + return (model); } static int asmc_probe(device_t dev) { const struct asmc_model *model; + const char *device_desc; int rv; if (resource_disabled("asmc", 0)) @@ -597,11 +649,13 @@ asmc_probe(device_t dev) return (rv); model = asmc_match(dev); - if (!model) { + if (model == NULL) { device_printf(dev, "model not recognized\n"); return (ENXIO); } - device_set_desc(dev, model->smc_desc); + device_desc = model->smc_desc == NULL ? + model->smc_model : model->smc_desc; + device_set_desc(dev, device_desc); return (rv); } From nobody Wed Feb 25 09:10:37 2026 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 4fLTMp13N1z6T1KT; Wed, 25 Feb 2026 09:10:46 +0000 (UTC) (envelope-from roger.pau@citrix.com) Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11011037.outbound.protection.outlook.com [40.107.208.37]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (secp384r1) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLTMn24wSz3YVs; Wed, 25 Feb 2026 09:10:45 +0000 (UTC) (envelope-from roger.pau@citrix.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=citrix.com header.s=selector1 header.b=A6nbrxGt; dmarc=pass (policy=reject) header.from=citrix.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (mx1.freebsd.org: domain of roger.pau@citrix.com designates 40.107.208.37 as permitted sender) smtp.mailfrom=roger.pau@citrix.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xO8mZ8EMjNhBL198ZzE1BnMP5v1ATJU+i4caqBYWjcIGdMMNMlV/w2lCEVfbPAlsHOJppaEObwn2ySGHziq2iwhMi7tUIsde4Syt+eufpp+ZxRZWfr4bGdA/NklPJDDmeWsa+/mEA3gnbMMNZDdhJWXe1k+dfRlMGpR2z6JA9079clU19Nhn5+LAtct2pb68UX2jGMOCdqyFm+Aa5WjjCQqYkQAbeV5QQ3f9ojneCve31/o42BXy/1jHQ2ZpxsYVbJVSHa6qjzXFYZikEcg4KqJnXGwVkcuVaK9gqB0YAquZf1OysPWdgoXmPP5mGoFLjOUD8XUagK9TgBeESVmaHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=D7elEguEvqa1u+1LT3VYQQPw9CDY8g61T/rVKicph1A=; b=cyJQSAS5w1KEnudqOOWxPo/P2MTvoRDpMvP7Jpug/zwEjftgsqP9D6Gtrrqmm72a+DSlJJj4d2C5nYl4YNMdvkcb6t0epzc/jC5u88/cn8QHi+IjbyZ9cNJUreoPuKAaSuPZJfv3PlB1iAKdi7iHQFXdp6chtvJntczuKAYri+6vnyhTpP+thR7llr3Ol+70WRyQ+QcJ2PPaRk/+4YiqD9CO5CctWsFLFyHuV7gm3P6L/pLyPfZtIIhWKLFWOeIuZ/1Iyw/FVnpy2OqME+n+KT/fue4ZeIVwZCAC4QB1XwZAWTfB+RX/tp96kmZHCgff35snpYyjgGJ66iZ89d8Rzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=D7elEguEvqa1u+1LT3VYQQPw9CDY8g61T/rVKicph1A=; b=A6nbrxGtLIpZcLnHTRRAXSRxjCcXGkADo3yP+4/+jI3HuF6x0zM8Bt7HkCgXLZ5hnsfUNMgN2ayn4PqtmkMK2BNNgWD8FObQ/par7hHFdBfLWPkMIeati9dpfizQ1kMwglkZzRhVwC9dcivzBWJqrM2YXHvFpguJHxhkH+kQmIU= Received: from CH7PR03MB7860.namprd03.prod.outlook.com (2603:10b6:610:24e::14) by CO1PR03MB7889.namprd03.prod.outlook.com (2603:10b6:303:275::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9654.11; Wed, 25 Feb 2026 09:10:42 +0000 Received: from CH7PR03MB7860.namprd03.prod.outlook.com ([fe80::f5ba:35df:1c9f:b343]) by CH7PR03MB7860.namprd03.prod.outlook.com ([fe80::f5ba:35df:1c9f:b343%4]) with mapi id 15.20.9632.017; Wed, 25 Feb 2026 09:10:42 +0000 Date: Wed, 25 Feb 2026 10:10:37 +0100 From: Roger Pau =?utf-8?B?TW9ubsOp?= To: Aymeric Wibo Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c5daa5a4c32c - main - acpi_spmc: Add system power management controller driver Message-ID: References: <69776f5e.2500f.227efeb7@gitrepo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <69776f5e.2500f.227efeb7@gitrepo.freebsd.org> X-ClientProxiedBy: MR1P264CA0044.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:3e::6) To CH7PR03MB7860.namprd03.prod.outlook.com (2603:10b6:610:24e::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 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH7PR03MB7860:EE_|CO1PR03MB7889:EE_ X-MS-Office365-Filtering-Correlation-Id: 0aa1a20b-29b5-4742-3168-08de744dc070 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016|7053199007; X-Microsoft-Antispam-Message-Info: PYOfunC959uJuhq0AO099F3pj4Rzy/EJhgxVpBgNHC441tlenuqBmrqQ1f1qw8qkjfPYLuvH/128HJl3eqfPEzpj19VZuJRQpefEfUnk0aVcp0B/1eqI65MpaBPbFkKHxBqlysRM+3SAmcLyuSEntro0ri543RY3ets5d7u75HKrEyLzgYiNItv2t996ZrXyK4BvK6kxHjp0BC8umP4NXfNoOqqN+ZB1SEBXQs8IkSRlzck0pbSD0d+QSjYTEFraAln/09BOvujFRdiFri0lA9PCnb1xVDwJ5/wBrYFeJe/2K28yWw7gfvbmZoRfBz0w2CS34zzXSd53AY8Rwf/t2HyvuX3I38zfDmYUklqmZBCYveUvpGsEz/gMCAhmrz70yvBc7cNKoukvZ9jjzKbzucVa09FatEe7cOEUnBVCgyAZvAIZUjyemU59/33DdIGKusV+pYB/FC6wOOR5S2K556SVOpCnDYoeVFg9BPQ+5hxExUFCjmQab/2TngqtYuprI1YWSfEIDIDel9F6h4vhx+E44fRURF5ST9pk86qpZq97hBr0n0ttWwTSFbukBscraGc/O/po6mQNW3xtFRAU9tDC5fFpc6g4vNaAKA+1IR+B8vCxdKfb81eR8bbmMWyvkS0NfFKz3WUfY2BqflLHVYPqy+tI0YvAHH5JIClQjkSAAU0Npn/b9jyraBQLhvZLz6Mi58Byl/w1f1J0X8//Z40RVFLqaOTcm+TTp5UEMjA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH7PR03MB7860.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TFpEMG9JdFlXY0tmanZtREdRcUJkZWZPNk1NUTJZQXNWTHZ0TXJLSzRSNjZS?= =?utf-8?B?eE8weW9iMlh1V0I1Q1pPS1hTSThLM0MwMjdTdVRaaFNSNUVGNGFqTW9LYnQx?= =?utf-8?B?MXpmdldlVUMrSFVRekFEdXcxeVNvN0tHK0dnWk93aGdQWWVwUmpXWjZjQXdX?= =?utf-8?B?R0Fablp4cmpmZTkwMWQ4aUdjb1dVZzZqOE9SV2UrZ0JTNmdWM01ZY0E2K1Uv?= =?utf-8?B?UUUzRktSRWxKTThreUwzZENjd0xtN0dMcTVnQVhjMCsyNyt2NzFnM0xzV1Fz?= =?utf-8?B?VjZqQ2xXNmNpaVE3NDBVczZkM0pJS2FZNE1YNUxyNHJFaDdmY2RBZzdQWndm?= =?utf-8?B?MDVqTTZEN1o4dWNsRUo4YW9xVlB2Tlg2SHk1QS9yMzZNVnViNjRvMUN0d0Uw?= =?utf-8?B?TmQ2UVFyQzNqZ2lkSFNwY0U0NnFmcmVlVWpsK3EzRG5hWXVLcklTYTRjN0Nn?= =?utf-8?B?K2xGQ0RFeUUyMm51R1FsVEtKUFBWZXdDcVpSQUFqSzRaeUlndGFQOTZqU2lD?= =?utf-8?B?M1h5YkxJVWh1a2lMYjNQbTkzZDNIeStFc3lVem90V0dmbW9GTWlxeE9yV3Ru?= =?utf-8?B?MTJTUTZNVmFzVHBrVXFPRExQSkNoWVRIL0UyRUR5NnVVSFVQN2RiTGQrZHRF?= =?utf-8?B?TlVWL01QZ1hUMVZ4YzZJZ3huRmtjQ01lRFJTMnRtOEc2WS84OUVsWTMrSlNX?= =?utf-8?B?YXZocUhoWXIvWmdkL09KYUhjL1JzTjVacTlWMktQZjlYVmdvQ2NjRVNqNW5Y?= =?utf-8?B?Ky9OeG9NV0tiWXNOWTJyVlU4YjkyeXVrQXBjejBDTS9HRmtYYVczNzdVU1pt?= =?utf-8?B?dVdsYU1ZaFVYdnl4VUxiZ1N2akpJakkyU0NOamRmZXVZSVhSckxmMnVucGoy?= =?utf-8?B?QVZMWk90aU1LRGR2SC9zRmJQNTJrWC9BWHozMWhKTFJkTmg3QTgzOFJoWHJF?= =?utf-8?B?U0EwalhaaEFVbHN5ZTd5eGJRbjFha29ndnNTZVc5dnYzKzY3STFNT0R5UUpk?= =?utf-8?B?QmNwQ3VVWVNMZEVSbnJMdWkwWDBPQjdvWTB0Qjd6cURSZlR2V1dXaGMxNWp0?= =?utf-8?B?Snp1dlB0VGg0cWtJS29yZDFraU9kUGx4am8wdVYzOVBWN2lTZngzdzdiSmxn?= =?utf-8?B?VjlLeVdoUWpXaVJGY283am5hdFdZMllUN0FJV2hvb2JIejRjdGtzZlBBZW5F?= =?utf-8?B?eENHemM1QkFGZEVYdVlEUHFmaEFYcGtuajBLbHBITWNsaFFmYW1lYnUya21D?= =?utf-8?B?QXNaaTFWeVg0RThCTEdvekhpOVlySlNQTllZRFFsUVp0alc2cURtTUV2OE5l?= =?utf-8?B?YTltcGM2aGFoRVBQNm9wV2NuOU8rMVFyK2JlRmtmRUZmMzFLZ1Z3MEYybDBk?= =?utf-8?B?ekZwU1RHaXdyUjZsK1UrQmhnaXh6ZGZzRGlWRENFTEtvTm1mcUorTjAxbjF4?= =?utf-8?B?dTByc0lhS2w3ZEhoK2Y4QlRFVzlienBPRisrQXQ3VTYrNTN1YSs4NDBjY1Z0?= =?utf-8?B?Mk1INFhiS2t6dURKc2lJTVJCLzJ1cW53cGN0dnhUMWVGSVhoalFtQlU1cHNi?= =?utf-8?B?WE00ZFYvVTRyUjdJUXFtbUxPL285VDl2Q2hma0h2Ynk5VUlrNkdOMmZuNUtv?= =?utf-8?B?N1Vrcnp1UHZBR0xIUmV4YS9KQnZyNWNqRlpmeHJYVWs1bXpsUHl3ZDN4bVNV?= =?utf-8?B?T3FKWHlWOEhkVnlsVk9FejkrNGluOWFnMS9hS1BNVWRDNjNkVVJCeXhtdU9T?= =?utf-8?B?d1FWVTBhamlEV2NTNU9NS2xBV25rU3hUcUlqNGxoQWJiZkVqZk0xSVI0TERS?= =?utf-8?B?ZTB6UmVhSnFQVExkbHFPQ0xrdWE5OU0yTDV1NGEzUG0rZmRZWGxpblZKVVpu?= =?utf-8?B?aFoxSGRWdER4ODBJcnplVUN3YzJ2S0wrdDBjYU9Yc242MmdYQTFXdGZLdjJa?= =?utf-8?B?UlRESTN4Ny8wOVVnRXhNTFlJNkdzVGdIazFoaWRiM3I5SlV2YnRON0xnTEVi?= =?utf-8?B?WWV4eVBZa09Ya0lsdmJaM3NPeGpOQlBqd09GWXF1ZS9RZzhRYlNBOHdqdmxu?= =?utf-8?B?QWhPU3dOdFY0S3pNWEtKMWFUUTVzREV5M3U5clcrMzJFbDJIRlFEd1ZCYngx?= =?utf-8?B?TXZ2Q1R5SGo5SGMvRjMvMS9lMGVNYmR3cDRUTENQckY3enZ0T1k5NkJaelFa?= =?utf-8?B?VGJEUkhnS1FwV0h5NmNVQXlaSkZiYWl0WHRZdHExNkJqYldNUUpPOE93L0dw?= =?utf-8?B?a2ZIRU1iUmhwR0FRZ0ZtUWNBNmYrNTJoVzBLZy9qU0xxaWhxQTRIM0lBNUdN?= =?utf-8?B?eEthdkJhd3dNRVBPcUREUTdEbTlaSjZKaldvcE5OejBBMHA1bkhtdz09?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0aa1a20b-29b5-4742-3168-08de744dc070 X-MS-Exchange-CrossTenant-AuthSource: CH7PR03MB7860.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2026 09:10:42.4599 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nxYrXEhPaZMn7mqU2xsRCys0q7aAbjbUnivh46Yh0xoEbRVxGat6RbTEbCWSb46hMMkae7j0MX1Z3xsihDM62g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR03MB7889 X-Spamd-Result: default: False [-4.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector10001:i=1]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.991]; DMARC_POLICY_ALLOW(-0.50)[citrix.com,reject]; R_DKIM_ALLOW(-0.20)[citrix.com:s=selector1]; R_SPF_ALLOW(-0.20)[+ip4:40.107.0.0/16]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[40.107.208.37:from]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:8075, ipnet:40.104.0.0/14, country:US]; FROM_EQ_ENVFROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[40.107.208.37:from]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[citrix.com:+] X-Rspamd-Queue-Id: 4fLTMn24wSz3YVs X-Spamd-Bar: ---- On Mon, Jan 26, 2026 at 01:42:54PM +0000, Aymeric Wibo wrote: > The branch main has been updated by obiwac: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c5daa5a4c32c9b1ecb506ddf1a80579c93c3ea6d > > commit c5daa5a4c32c9b1ecb506ddf1a80579c93c3ea6d > Author: Aymeric Wibo > AuthorDate: 2025-06-14 15:30:44 +0000 > Commit: Aymeric Wibo > CommitDate: 2026-01-26 13:42:11 +0000 > > acpi_spmc: Add system power management controller driver > > Add SPMC (system power management controller) driver as acpi_spmc. This > is the device which provides the LPI device D-state constraints and > allows for OSPM to send S0ix/modern standby entry/exit notifications. > This supports the original Intel DSM > (https://uefi.org/sites/default/files/resources/Intel_ACPI_Low_Power_S0_Idle.pdf, > untested), the AMD DSM (tested), and the Microsoft DSM (tested). > > Before entry, acpi_spmc_check_constraints is called to notify of any > violated power constraints. This will use acpi_pwr_get_state to get > current device D-states when that gets added back. I'm getting a lot of "acpi_spmc0: Unknown revision" messages from this driver on my box, below is the full (non-verbose) boot log. However the affect of those messages is not clear to me. Does it mean S0ix won't work? Or are those just warning messages? The logged text and occurrence of those should be adjusted, it's too verbose right now and the printed message doesn't help the user figure out what's going on. Thanks, Roger. --- EFI framebuffer information: addr, size 0x0, 0x0 dimensions 0 x 0 stride 0 masks 0x00000000, 0x00000000, 0x00000000, 0x00000000 Timeout initializing vt_vga GDB: no debug ports present KDB: debugger backends: ddb KDB: current backend: ddb ---<>--- Copyright (c) 1992-2026 The FreeBSD Project. Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved. FreeBSD is a registered trademark of The FreeBSD Foundation. FreeBSD 16.0-CURRENT #6 -dirty: Wed Feb 25 09:50:30 CET 2026 root@nuc:/usr/obj/usr/src/amd64.amd64/sys/GENERIC amd64 FreeBSD clang version 19.1.7 (https://github.com/llvm/llvm-project.git llvmorg-19.1.7-0-gcd708029e0b2) WARNING: WITNESS option enabled, expect reduced performance. VT(vga): resolution 640x480 CPU microcode: no matching update found CPU: 11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz (2803.20-MHz K8-class CPU) Origin="GenuineIntel" Id=0x806c1 Family=0x6 Model=0x8c Stepping=1 Features=0xbfebfbff Features2=0x7ffafbbf AMD Features=0x2c100800 AMD Features2=0x121 Structured Extended Features=0xf3bfa7eb Structured Extended Features2=0x18c05fde Structured Extended Features3=0xfc100710 XSAVE Features=0xf IA32_ARCH_CAPS=0xa005c6b VT-x: PAT,HLT,MTF,PAUSE,EPT,UG,VPID,VID,PostIntr TSC: P-state invariant, performance statistics real memory = 17179869184 (16384 MB) avail memory = 16203403264 (15452 MB) Event timer "LAPIC" quality 600 ACPI APIC Table: FreeBSD/SMP: Multiprocessor System Detected: 8 CPUs FreeBSD/SMP: 1 package(s) x 4 core(s) x 2 hardware threads random: registering fast source Intel Secure Key Seed random: fast provider: "Intel Secure Key Seed" random: unblocking device. ioapic0 irqs 0-119 Launching APs: 1 5 4 7 6 2 3 random: entropy device external interface kbd0 at kbdmux0 efirtc0: efirtc0: registered as a time-of-day clock, resolution 1.000000s smbios0: at iomem 0x414ca000-0x414ca017 smbios0: Entry point: v3 (64-bit), Version: 3.3 aesni0: acpi0: acpi0: Power Button (fixed) cpu0: on acpi0 hpet0: iomem 0xfed00000-0xfed003ff on acpi0 Timecounter "HPET" frequency 19200000 Hz quality 950 Event timer "HPET" frequency 19200000 Hz quality 550 atrtc1: on acpi0 atrtc1: Warning: Couldn't map I/O. atrtc1: registered as a time-of-day clock, resolution 1.000000s Event timer "RTC" frequency 32768 Hz quality 0 attimer0: port 0x40-0x43,0x50-0x53 irq 0 on acpi0 Timecounter "i8254" frequency 1193182 Hz quality 0 Event timer "i8254" frequency 1193182 Hz quality 100 Timecounter "ACPI-fast" frequency 3579545 Hz quality 900 acpi_timer0: <24-bit timer at 3.579545MHz> port 0x1808-0x180b on acpi0 acpi_ec0: port 0x62,0x66 on acpi0 pcib0: port 0xcf8-0xcff on acpi0 pci0: on pcib0 vgapci0: port 0x3000-0x303f mem 0x603c000000-0x603cffffff,0x4000000000-0x400fffffff at device 2.0 on pci0 vgapci0: Boot video device pcib1: at device 6.0 on pci0 pci1: on pcib1 nvme0: mem 0x6a400000-0x6a403fff at device 0.0 on pci1 pcib2: at device 7.0 on pci0 pcib3: at device 7.2 on pci0 xhci0: mem 0x603d190000-0x603d19ffff at device 13.0 on pci0 xhci0: 32 bytes context size, 64-bit DMA xhci0: xECP capabilities usbus0 on xhci0 usbus0: 5.0Gbps Super Speed USB v3.0 pci0: at device 13.2 (no driver attached) pci0: at device 13.3 (no driver attached) xhci1: mem 0x603d180000-0x603d18ffff at device 20.0 on pci0 xhci1: 32 bytes context size, 64-bit DMA xhci1: xECP capabilities usbus1 on xhci1 usbus1: 5.0Gbps Super Speed USB v3.0 pci0: at device 20.2 (no driver attached) pci0: at device 20.3 (no driver attached) pci0: at device 21.0 (no driver attached) pci0: at device 21.1 (no driver attached) pci0: at device 22.0 (no driver attached) ahci0: port 0x3090-0x3097,0x3080-0x3083,0x3060-0x307f mem 0x6a500000-0x6a501fff,0x6a503000-0x6a5030ff,0x6a502000-0x6a5027ff at device 23.0 on pci0 ahci0: AHCI v1.31 with 1 6Gbps ports, Port Multiplier not supported ahcich0: at channel 0 on ahci0 pcib4: at device 29.0 on pci0 pci2: on pcib4 igc0: mem 0x6a200000-0x6a2fffff,0x6a300000-0x6a303fff at device 0.0 on pci2 igc0: EEPROM V1.57-0 eTrack 0x80000181 igc0: Using 1024 TX descriptors and 1024 RX descriptors igc0: Using 4 RX queues 4 TX queues igc0: Using MSI-X interrupts with 5 vectors igc0: Ethernet address: 48:21:0b:35:a5:77 igc0: netmap queues/slots: TX 4/1024, RX 4/1024 isab0: at device 31.0 on pci0 isa0: on isab0 hdac0: mem 0x603d1a0000-0x603d1a3fff,0x603d000000-0x603d0fffff at device 31.3 on pci0 pci0: at device 31.5 (no driver attached) acpi_button0: on acpi0 acpi_spmc0: on acpi0 acpi_spmc0: Unknown revision -670172952 for device constraint detail package acpi_spmc0: Unknown revision -670172768 for device constraint detail package acpi_spmc0: Unknown revision -670172584 for device constraint detail package acpi_spmc0: Unknown revision -670172400 for device constraint detail package acpi_spmc0: Unknown revision -670172216 for device constraint detail package acpi_spmc0: Unknown revision -670172032 for device constraint detail package acpi_spmc0: Unknown revision -670171848 for device constraint detail package acpi_spmc0: Unknown revision -670171664 for device constraint detail package acpi_spmc0: Unknown revision -670171480 for device constraint detail package acpi_spmc0: Unknown revision -670171296 for device constraint detail package acpi_spmc0: Unknown revision -670171112 for device constraint detail package acpi_spmc0: Unknown revision -670170928 for device constraint detail package acpi_spmc0: Unknown revision -670170744 for device constraint detail package acpi_spmc0: Unknown revision -670170560 for device constraint detail package acpi_spmc0: Unknown revision -670170376 for device constraint detail package acpi_spmc0: Unknown revision -670170192 for device constraint detail package acpi_spmc0: Unknown revision -670169984 for device constraint detail package acpi_spmc0: Unknown revision -670169800 for device constraint detail package acpi_spmc0: Unknown revision -670169616 for device constraint detail package acpi_spmc0: Unknown revision -670169432 for device constraint detail package acpi_spmc0: Unknown revision -670169248 for device constraint detail package acpi_spmc0: Unknown revision -670169064 for device constraint detail package acpi_spmc0: Unknown revision -670168880 for device constraint detail package acpi_spmc0: Unknown revision -670168696 for device constraint detail package acpi_spmc0: Unknown revision -670168512 for device constraint detail package acpi_spmc0: Unknown revision -670168328 for device constraint detail package acpi_spmc0: Unknown revision -670168112 for device constraint detail package acpi_spmc0: Unknown revision -670167896 for device constraint detail package acpi_spmc0: Unknown revision -670167680 for device constraint detail package acpi_spmc0: Unknown revision -670167464 for device constraint detail package acpi_spmc0: Unknown revision -670167248 for device constraint detail package acpi_spmc0: Unknown revision -670167032 for device constraint detail package acpi_spmc0: Unknown revision -670166816 for device constraint detail package acpi_spmc0: Unknown revision -670166600 for device constraint detail package acpi_spmc0: Unknown revision -670166384 for device constraint detail package acpi_spmc0: Unknown revision -670166168 for device constraint detail package acpi_spmc0: Unknown revision -670165952 for device constraint detail package acpi_spmc0: Unknown revision -670165736 for device constraint detail package acpi_spmc0: Unknown revision -670165520 for device constraint detail package acpi_spmc0: Unknown revision -670165304 for device constraint detail package acpi_spmc0: Unknown revision -670165088 for device constraint detail package acpi_spmc0: Unknown revision -670164872 for device constraint detail package acpi_spmc0: Unknown revision -670164656 for device constraint detail package acpi_spmc0: Unknown revision -670164440 for device constraint detail package acpi_spmc0: Unknown revision -670164224 for device constraint detail package acpi_spmc0: Unknown revision -670164008 for device constraint detail package acpi_spmc0: Unknown revision -670163792 for device constraint detail package acpi_spmc0: Unknown revision -670163608 for device constraint detail package acpi_spmc0: Unknown revision -670163424 for device constraint detail package acpi_spmc0: Unknown revision -670163240 for device constraint detail package acpi_spmc0: Unknown revision -670163056 for device constraint detail package acpi_spmc0: Unknown revision -670162872 for device constraint detail package acpi_spmc0: Unknown revision -670162688 for device constraint detail package acpi_spmc0: Unknown revision -670162504 for device constraint detail package acpi_spmc0: Unknown revision -670162320 for device constraint detail package acpi_spmc0: Unknown revision -670162136 for device constraint detail package acpi_spmc0: Unknown revision -670161928 for device constraint detail package acpi_spmc0: Unknown revision -670161744 for device constraint detail package acpi_spmc0: Unknown revision -670161536 for device constraint detail package acpi_spmc0: Unknown revision -670161352 for device constraint detail package acpi_spmc0: Unknown revision -670161160 for device constraint detail package acpi_spmc0: Unknown revision -670160976 for device constraint detail package acpi_spmc0: Unknown revision -670160792 for device constraint detail package acpi_spmc0: Unknown revision -670160600 for device constraint detail package acpi_spmc0: Unknown revision -670160400 for device constraint detail package acpi_spmc0: Unknown revision -670160216 for device constraint detail package acpi_spmc0: Unknown revision -670160032 for device constraint detail package acpi_spmc0: Unknown revision -670159848 for device constraint detail package acpi_spmc0: Unknown revision -670159664 for device constraint detail package acpi_spmc0: Unknown revision -670159480 for device constraint detail package acpi_spmc0: Unknown revision -670159296 for device constraint detail package acpi_spmc0: Unknown revision -670159112 for device constraint detail package acpi_spmc0: Unknown revision -670158928 for device constraint detail package acpi_spmc0: Unknown revision -670158744 for device constraint detail package acpi_spmc0: Unknown revision -670158560 for device constraint detail package acpi_spmc0: Unknown revision -670158376 for device constraint detail package acpi_spmc0: Unknown revision -670158192 for device constraint detail package acpi_spmc0: Unknown revision -670158008 for device constraint detail package acpi_spmc0: Unknown revision -670157824 for device constraint detail package acpi_spmc0: Unknown revision -670157640 for device constraint detail package acpi_spmc0: Unknown revision -670157456 for device constraint detail package acpi_spmc0: Unknown revision -670157248 for device constraint detail package acpi_spmc0: Unknown revision -670157040 for device constraint detail package acpi_spmc0: Unknown revision -670156824 for device constraint detail package acpi_spmc0: Unknown revision -670156608 for device constraint detail package acpi_spmc0: Unknown revision -670156400 for device constraint detail package acpi_spmc0: Unknown revision -670156192 for device constraint detail package acpi_spmc0: Unknown revision -670156000 for device constraint detail package acpi_spmc0: Unknown revision -670155808 for device constraint detail package acpi_spmc0: Unknown revision -670155616 for device constraint detail package acpi_spmc0: Unknown revision -670155408 for device constraint detail package acpi_button1: on acpi0 acpi_tz0: on acpi0 uart0: <16550 or compatible> port 0x3f8-0x3ff irq 4 flags 0x10 on acpi0 uart: ns8250: UART FCR is broken (0x2) uart0: console (115200,n,8,1) acpi_syscontainer0: on acpi0 acpi_syscontainer1: on acpi0 atrtc0: at port 0x70 irq 8 on isa0 atrtc0: Warning: Couldn't map I/O. atrtc0: registered as a time-of-day clock, resolution 1.000000s atrtc0: Can't map interrupt. atrtc0: non-PNP ISA device will be removed from GENERIC in FreeBSD 16. hwpstate_intel0: on cpu0 cpufreq0: on cpu0 hwpstate_intel1: on cpu1 cpufreq1: on cpu1 hwpstate_intel2: on cpu2 cpufreq2: on cpu2 hwpstate_intel3: on cpu3 cpufreq3: on cpu3 hwpstate_intel4: on cpu4 cpufreq4: on cpu4 hwpstate_intel5: on cpu5 cpufreq5: on cpu5 hwpstate_intel6: on cpu6 cpufreq6: on cpu6 hwpstate_intel7: on cpu7 cpufreq7: on cpu7 Timecounter "TSC-low" frequency 1401600888 Hz quality 1000 Timecounters tick every 1.000 msec ugen0.1: at usbus0 uhub0 on usbus0 uhub0: on usbus0 ugen1.1: at usbus1 ZFS filesystem version: 5 ZFS storage pool version: features support (5000) uhub1 on usbus1 uhub1: on usbus1 nvme0: Allocated 64MB host memory buffer nvme_sim0: on nvme0 hdacc0: at cad 2 on hdac0 hdaa0: at nid 1 on hdacc0 pcm0: at nid 4 on hdaa0 nda0 at nvme0 bus 0 scbus1 target 0 lun 1 nda0: nda0: Serial Number 50026B738193844D nda0: nvme version 1.4 nda0: 238475MB (488397168 512 byte sectors) Trying to mount root from zfs:zroot/ROOT/default []... WARNING: WITNESS option enabled, expect reduced performance. uhub0: 5 ports with 5 removable, self powered uhub1: 16 ports with 16 removable, self powered Root mount waiting for: usbus1 ugen1.2: at usbus1 ugen1.3: at usbus1 Dual Console: Serial Primary, Video Secondary WARNING: sysctl vfs.zfs.min_auto_ashift is deprecated. Use vfs.zfs.vdev.min_auto_ashift instead. Setting hostuuid: d81bcf51-811f-c4d6-cf81-48210b35a577. Setting hostid: 0xd1e215da. Starting file system checks: /dev/gpt/efiboot0: FILESYSTEM CLEAN; SKIPPING CHECKS Mounting local filesystems:. no pools available to import Autoloading module: acpi_wmi Autoloading module: ichsmb Autoloading module: if_iwlwifi Autoloading module: if_iwx Autoloading module: ig4 iwlwifi0: mem 0x603d1a4000-0x603d1a7fff at device 20.3 on pci0 Firmware Warning (ACPI): Possibly buggy BIOS with ACPI_TYPE_INTEGER for function enumeration (20251212/ACPI-3119) Firmware Warning (ACPI): Possibly buggy BIOS with ACPI_TYPE_INTEGER for function enumeration (20251212/ACPI-3119) iwlwifi0: Detected crf-id 0x3617, cnv-id 0x20000302 wfpm id 0x80000000 iwlwifi0: PCI dev a0f0/0074, rev=0x351, rfid=0x10a100 iwlwifi0: Detected Intel(R) Wi-Fi 6 AX201 160MHz iwlwifi0: could not load firmware image 'iwlwifi-QuZ-a0-hr-b0-77.ucode' iwlwifi0: File size way too small! iwlwifi0: no suitable firmware found! iwlwifi0: iwlwifi-QuZ-a0-hr-b0-77 is required iwlwifi0: check git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git iwlwifi0: On FreeBSD the firmware package can be installed running fwget(8). ig4iic0: at device 21.0 on pci0 ig4iic0: Using MSI iicbus0: on ig4iic0 iicbus0: at addr 0x21 ig4iic1: at device 21.1 on pci0 ig4iic1: Using MSI iicbus1: on ig4iic1 ichsmb0: port 0xefa0-0xefbf mem 0x603d1ac000-0x603d1ac0ff at device 31.4 on pci0 smbus0: on ichsmb0 acpi_wmi0: on acpi0 acpi_wmi0: Embedded MOF found acpi_wmi1: on acpi0 acpi_wmi1: Embedded MOF found acpi_wmi2: on acpi0 acpi_wmi2: Embedded MOF found From nobody Wed Feb 25 11:30:37 2026 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 4fLXT92fBfz6THRH for ; Wed, 25 Feb 2026 11:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLXT922PGz3qN6 for ; Wed, 25 Feb 2026 11:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772019037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2La9R2/ynTai5Ak9pNS7j0Vn9VZ+AY+SmpuLlj6dVaQ=; b=kvftWFYd1Rd1cZOB+X4IleW6DPi5eZXVE5k9mJeLHtyaFPw730H7NVIMH7WA0hv/OQyYq3 8Q6ZZxJWr94T4uGVzTbq/XMlxaZLwPn/dXHXNW3EBS+mhiVCW1nhk1PVofoGb3YtefBm2U vOp4cFRZrMrDXOyj0H2L3qvnK0Zy00t69bKbkPViGVTDYHRHQ6hWqIfQtQMgURwvXjDKKY 5Nd49x8jKs1vbvTlDf88zOM0AYvH6YIXQnccSJYJVlxUlP5CnCntYFH1/JbXuAF2UCefuK pTpNoZna/lWbnjKctySI9llhpMhyJLbknZ1Szz/670BbXC1B02e7rQU6dfnkzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772019037; a=rsa-sha256; cv=none; b=X9gsO+/6X/0YNd+fPTVy77PkgxXgjSsM0T2DzH7x+RtmLR4RP1/U/X8Ar8zIxUt5gYNxcq 0TKmnhr+3rzfbu9zz/VFQ1g/KoZ1dzWSar/Jzjy2btjZH2iQbZCV+miq8Jt6e75OS0lrKc 2mnZF3JeyNSirlSxx3muKVOnB5gy9rTovWEducAecsUY7qgJw3zCdiWNiaJtglKLScQbd/ 02q+J2e8fs9y5GcKsteQ99cFmLItuFpBhMwhVBSbL8FnpxruC3pBDR7dDzy6YVKP09Apge KcwTkPMSFHliCLewop4S+FGnilR2fKNuNGA+8qsTq8X0WwAAAnnZ1HQ8Ikx+rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772019037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2La9R2/ynTai5Ak9pNS7j0Vn9VZ+AY+SmpuLlj6dVaQ=; b=chqL3yOv5+Csjnw1MgN9y0hlN1bqflvVoC1a+G/eOW1jlDFD8N6bV2GNC4+2RM2vpWW3ld /o8mVmkgiJvG5gUIgYG2fT+Afp7VDRzce+jIHHCLOIlxJHhKenrwqK19ZrV3mpz4Pis2i1 Ck58wix81ff5/m+E3LWwhBGPbkgMTdLrfsXWuI5xcRFFHVu8l0bRkS722jeIBR96xqbRxg lq4GVe6DcWj1ZpcQzBVSYxY9cE92fSAcgdwu5FLqxsrWof3XRvqPx2qa3rNb8kPyGyWicq gKnJ62lFe9jOhYUvGZr4k20XM0WEwhKpmhmb1eRa5fKii+zHcdRvfrTHHlYw6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLXT91f3Gz10T2 for ; Wed, 25 Feb 2026 11:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3abb8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 11:30:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: bce0c14fe19d - main - mpool/mpool_get.c: Avoid clobbering 'errno' when handling 'pread' 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: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bce0c14fe19defeef4f02cfebc018e9adf979783 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 11:30:37 +0000 Message-Id: <699edd5d.3abb8.3b1aebcd@gitrepo.freebsd.org> The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=bce0c14fe19defeef4f02cfebc018e9adf979783 commit bce0c14fe19defeef4f02cfebc018e9adf979783 Author: Bojan Novković AuthorDate: 2026-02-23 15:30:26 +0000 Commit: Bojan Novković CommitDate: 2026-02-25 11:30:05 +0000 mpool/mpool_get.c: Avoid clobbering 'errno' when handling 'pread' errors POSIX.1-2024 states that the 'free' function "shall not modify errno if ptr is a null pointer or a pointer previously returned as if by malloc() and not yet deallocated". However this is a fairly recent addition and non-compliant allocators might still clobber 'errno', causing 'mpool_get' to return the wrong error code. Fix this by saving and restoring 'errno' after calling 'free'. Sponsored by: Klara, Inc. Reviewed by: obiwac Differential Revision: https://reviews.freebsd.org/D55463 MFC after: 1 week --- lib/libc/db/mpool/mpool.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c index 1bab66d73baf..0df19dc09e4d 100644 --- a/lib/libc/db/mpool/mpool.c +++ b/lib/libc/db/mpool/mpool.c @@ -214,10 +214,14 @@ mpool_get(MPOOL *mp, pgno_t pgno, /* Read in the contents. */ off = mp->pagesize * pgno; if ((nr = pread(mp->fd, bp->page, mp->pagesize, off)) != (ssize_t)mp->pagesize) { + int serrno; + switch (nr) { case -1: /* errno is set for us by pread(). */ + serrno = errno; free(bp); + errno = serrno; mp->curcache--; return (NULL); case 0: From nobody Wed Feb 25 13:00:13 2026 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 4fLZSZ0fflz6TSmx for ; Wed, 25 Feb 2026 13:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLZSY66hZz40mw for ; Wed, 25 Feb 2026 13:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772024413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Yh1QUS18sGefBmVGYkhJg6zVDtIvOMTDT0gQb0xjAs=; b=xKa2cNaXTuoFCP+TUfi7A5seAPVP+TQDP1G1AhEgK7TlH0qD6XJpnyaeqIUNl7HHzjifB9 hZXSf4AcZnN7sONJCNue7ZL+K+h6/8wNOw80DvyJAh5oJtTm8CSLtERo2OJ+oTkemm091G n1HKyB+skiNUxQk3fEduIhAtnPz6mg0GQZDxNTyoVTF4GMhDQD5BwolNKg5/jRBiVe10B9 0fu9PyvF9B249G7GasGZobuDIj+Oa1mcAscTZzHQY2WX/Wktkvzgx7pOhlTNVuz1b2oCHA i0f0KOuUX/ADi+Yr2pQbaBc+Qkyscqgea2sABA2CnLhbdgNwkbbfPQIJBtZpnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772024413; a=rsa-sha256; cv=none; b=mnMTKFb4GbJEXiVEV5JzSW9/whhULCV6J/rsY60CPMAcPbojEETKsHTiAAOmp4AYVs76NA QXjWypviLRkgPIkeIes+n+aLGwU63Xnr7FZ7CZb9zSHDj/0cMkp9leYRRLkkJGK+ELdt/K PUuqnCvPKMyYqNqVTPOYLuOTrhDKa18Su5ml17zapN8/YTk/w7R2Nw+8a7AhWxd+7J8QjR W4jiupqvU9ttt4+wsTVYL3ArWshxxlY43yMhys6u367UaYw+nVQHPjJly4kLyNEoRYL+TZ WZNOH6grW0C8f62gU4jM3RCrB7mx5gTRzlIorvROJnE8Y/lrAuUSBGrl4qpZ+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772024413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Yh1QUS18sGefBmVGYkhJg6zVDtIvOMTDT0gQb0xjAs=; b=gfj0DvnHE+m36OJ6G9Fcwb7nErQu3VCnXv2p2+u6GNx3iS9TWw/lf0UUwyX4d8kyyfTbFh favlsJDD9O3B0gCRyzf4Imk4pF9JejRe0LhXzu9RHAtJop8UZK1g9saTMuG/eVxR6eu2wo INVk3SFkPlTcqF+G5lzLsgfGfgXp7oZ65N5w+/cxO3qiQiMdkZihFFr5/DT4isUqNJJ8hP zbPfCf3Z8ke5EZQMq9RHjl+7WaybThr+AvXxzh4nimde6GiqWYzH+NAyMFy1V/60D07Bvc LyRtx6PwDYispAR1PPfEqjowXGg0ohoLaffUO0qVG4y3GMW9k4xCojSA2gz9Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLZSY5Jj1z124R for ; Wed, 25 Feb 2026 13:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42e41 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 13:00:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 454212b9718b - main - sctp: fix so_proto when peeling off a socket 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: 454212b9718b55b43781f81bef252658e20e0fd3 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 13:00:13 +0000 Message-Id: <699ef25d.42e41.7579887f@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=454212b9718b55b43781f81bef252658e20e0fd3 commit 454212b9718b55b43781f81bef252658e20e0fd3 Author: Michael Tuexen AuthorDate: 2026-02-25 12:55:54 +0000 Commit: Michael Tuexen CommitDate: 2026-02-25 12:55:54 +0000 sctp: fix so_proto when peeling off a socket Reported by: glebius Reviewed by: rrs Fixes: d195b3783fa4 ("sctp: fix socket type created by sctp_peeloff()") Differential Revision: https://reviews.freebsd.org/D55454 --- sys/kern/uipc_socket.c | 4 ++-- sys/netinet/sctp_syscalls.c | 4 +++- sys/sys/socketvar.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 8b5d1f504e80..f7c339784693 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1316,7 +1316,7 @@ solisten_enqueue(struct socket *so, int connstatus) * XXXGL: reduce copy-paste with solisten_clone(). */ struct socket * -sopeeloff(struct socket *head) +sopeeloff(struct socket *head, struct protosw *so_proto) { struct socket *so; @@ -1336,7 +1336,7 @@ sopeeloff(struct socket *head) so->so_linger = head->so_linger; so->so_state = (head->so_state & SS_NBIO) | SS_ISCONNECTED; so->so_fibnum = head->so_fibnum; - so->so_proto = head->so_proto; + so->so_proto = so_proto; so->so_cred = crhold(head->so_cred); #ifdef MAC mac_socket_newconn(head, so); diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index 80d1d58a7866..01f241d29637 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -75,6 +75,8 @@ #include #include +#include +#include #include #include @@ -171,7 +173,7 @@ sys_sctp_peeloff(struct thread *td, struct sctp_peeloff_args *uap) td->td_retval[0] = fd; CURVNET_SET(head->so_vnet); - so = sopeeloff(head); + so = sopeeloff(head, &sctp_stream_protosw); if (so == NULL) { error = ENOMEM; goto noconnection; diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 6512a2d69fd5..0417223680fe 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -525,7 +525,7 @@ struct socket * struct socket * sonewconn(struct socket *head, int connstatus); struct socket * - sopeeloff(struct socket *); + sopeeloff(struct socket *, struct protosw *); int sopoll_generic(struct socket *so, int events, struct thread *td); int sokqfilter_generic(struct socket *so, struct knote *kn); int soaio_queue_generic(struct socket *so, struct kaiocb *job); From nobody Wed Feb 25 13:03:46 2026 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 4fLZXg0cGpz6TT88 for ; Wed, 25 Feb 2026 13:03: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLZXg039Cz41m0 for ; Wed, 25 Feb 2026 13:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772024627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UBgFVGIFeU091Q0f51jps3P6WhIrv47SMbnkQNKXbr4=; b=Tl94Lw2EVKObjt1VUfH5AiuZogKVKZFrsWEibHIs/fAMJuQf4ZHAh3j1GLLLJMsJJe0pqI J120AaygKvWra96lqe1VCVJRl5wtxKgrM7FvbF7T1+dYne0cIcwTFx0xN9PHosScj+soDN siM2zbWthAIaWpPqKWu/lmzPkJKE4yfISpuu/e22iWkZtlWWgywLi+SLApbla8GYLbfbIq kB97yJGajgHSgVnmOJ8QRYRFcanyn4PSBAlHWHah0xCBdI4dPHbAimPIfy2y90aInodpVQ yOKmLI+eJ6TbzobFrCH/UxU++/T8iHRCz/Nt5DNZhVa4Hw9D5rLfP06tJWRT2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772024627; a=rsa-sha256; cv=none; b=koSQcO8ulGY3oUJ39bgngMkTb9uZG8vKpjV9T4WFEAZJc9UcPGn/XIc4K/BfoaGf5wYJxr Kd9QKdinRYpUBbHCueQ8OAQcSqapJugE2/eZ1bdGoAMecuSd7xpx3zVud6R//+1b9OxdFQ thhb80jdwE9QYASFDhQI8xpG24hPe4RyyGr0olPVlcbP+o9JmKrfF/FbiUcHwm3PJw5lmF HiQjNHVl4H0odqJ+SYkyTVas6r2+CVvSdnrOLIhCCSZWzxF85OYVRslCYMU5q8/wCPal+Z c9dGqDbM/H89mt/C81u0B7bleFRh8ZlIkUHPNgpNCQy31TGolo5vdtapg3LOVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772024627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UBgFVGIFeU091Q0f51jps3P6WhIrv47SMbnkQNKXbr4=; b=YAztB3iJpCbk52xVeAoWY1QT2D93u/pDbSd4wvLka5G/miaB06RTWAz+ZhKCg8CW3BCuRu f7epdMO7lNrL2gdWWWQzlA3Fz+O0k6ZHDpdMxO7oPSZnf862Fzna9UrIpZpC1jjywzqW+Q VC9TfBnaR7Bmsmyh9+0TGKNa4fJ9a7WlN3raNlBiEZg+0Z/urUF/93BnLlwcvTGHBgjQcR w+RsoiXZgTFm9wk2LMLQDhX3Kx85d/um+Bo5+1cACg/YfqkKmbg0dgqXk7R6VkyBp5mfl5 wMQJvFf6dNmJD78Qpn39KzeZi4oqdcmnbuL8T2z91KhlTi67xhUbBqjaMAgyTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLZXf69tBz13K9 for ; Wed, 25 Feb 2026 13:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 432c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 13:03:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 4e28874a6048 - main - When TCP ECN decides it wants to assure an ACK is sent it needs to do it correctly and with some limits. 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: 4e28874a6048f3c5a72a42b5bcfcfc7e71cad8a6 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 13:03:46 +0000 Message-Id: <699ef332.432c4.5f0d0d29@gitrepo.freebsd.org> The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=4e28874a6048f3c5a72a42b5bcfcfc7e71cad8a6 commit 4e28874a6048f3c5a72a42b5bcfcfc7e71cad8a6 Author: Randall Stewart AuthorDate: 2026-02-25 12:59:04 +0000 Commit: Randall Stewart CommitDate: 2026-02-25 13:03:33 +0000 When TCP ECN decides it wants to assure an ACK is sent it needs to do it correctly and with some limits. So in testing I have found two interesting cases where ECN is going to make it so that an ack will be sent right away. These cases need to be limited to being in the ESTABLISHED state. You don't want ECN sending ACK's when we are transitioning in front or end states. Also we don't start a delayed ack timer at the same time set the ACKNOW flag, thats just plain wrong. Reviewed by: tuexen, rscheff Differential Revision: --- sys/netinet/tcp_ecn.c | 5 ++++- sys/netinet/tcp_input.c | 7 +++++-- sys/netinet/tcp_stacks/rack.c | 5 ++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_ecn.c b/sys/netinet/tcp_ecn.c index 31b9418c5fc2..fb650831289e 100644 --- a/sys/netinet/tcp_ecn.c +++ b/sys/netinet/tcp_ecn.c @@ -353,7 +353,10 @@ tcp_ecn_input_segment(struct tcpcb *tp, uint16_t thflags, int tlen, int pkts, in } if (thflags & TH_CWR) { tp->t_flags2 &= ~TF2_ECN_SND_ECE; - tp->t_flags |= TF_ACKNOW; + if ((tp->t_state == TCPS_ESTABLISHED) || + (tp->t_state == TCPS_FIN_WAIT_1) || + (tp->t_state == TCPS_FIN_WAIT_2)) + tp->t_flags |= TF_ACKNOW; } if ((iptos & IPTOS_ECN_MASK) == IPTOS_ECN_CE) tp->t_flags2 |= TF2_ECN_SND_ECE; diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index c015995ffc7a..35a9d7633fa7 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -539,9 +539,12 @@ cc_ecnpkt_handler_flags(struct tcpcb *tp, uint16_t flags, uint8_t iptos) CC_ALGO(tp)->ecnpkt_handler(&tp->t_ccv); - if (tp->t_ccv.flags & CCF_ACKNOW) { - tcp_timer_activate(tp, TT_DELACK, tcp_delacktime); + if (((tp->t_state == TCPS_ESTABLISHED) || + (tp->t_state == TCPS_FIN_WAIT_1) || + (tp->t_state == TCPS_FIN_WAIT_2)) && + (tp->t_ccv.flags & CCF_ACKNOW)) { tp->t_flags |= TF_ACKNOW; + tp->t_ccv.flags &= ~CCF_ACKNOW; } } } diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 42c6757b4b2a..78b0026a8c5d 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -15709,6 +15709,8 @@ rack_do_compressed_ack_processing(struct tcpcb *tp, struct socket *so, struct mb tcp_packets_this_ack(tp, ae->ack), ae->codepoint)) rack_cong_signal(tp, CC_ECN, ae->ack, __LINE__); + if (tp->t_flags & TF_ACKNOW) + rack->r_wanted_output = 1; #ifdef TCP_ACCOUNTING /* Count for the specific type of ack in */ if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { @@ -16566,7 +16568,8 @@ rack_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, tcp_packets_this_ack(tp, th->th_ack), iptos)) rack_cong_signal(tp, CC_ECN, th->th_ack, __LINE__); - + if (tp->t_flags & TF_ACKNOW) + rack->r_wanted_output = 1; /* * If echoed timestamp is later than the current time, fall back to * non RFC1323 RTT calculation. Normalize timestamp if syncookies From nobody Wed Feb 25 13:04:46 2026 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 4fLZYq1wdZz6TTJf for ; Wed, 25 Feb 2026 13:04: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLZYp6v3Yz42Z9 for ; Wed, 25 Feb 2026 13:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772024687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0AOXOEhjyyP1BaB3XptPCeXmB2ctwWzQ7rihjg5PqWc=; b=OSc4IXGMJ+xz0Bvccfs4b+SwmhFK+oS+VYUXCs6ohnoh/W0FFbP2rYxD3JLLFXcXCW4wT9 0nzXRpQLJ0jy32+yLrcfdKsoNrW7UWZJcvsCh6s63gajlIy1QquQWGvoq9LHQLxQAXPPyw xacTAZwUxt3Zu8HQzPeIW+At9ZJKOHtC9AbSy+fBlLV/ZS4IKt7nQRujO233KA8tBzurB0 YDFuEgfMgrEqm5W6S0AeM6J101i/JvdIoRqhiHsmg48JqwEnfmfjrclphAXXk4D1otYRrm VopN0jkckibj/LjR/1ujmmCt4SAkRHXzQ8yvOCSMvRScy1VmqR2PtVESaz7gbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772024687; a=rsa-sha256; cv=none; b=tIHdWZGJArkSSnr0g28DK5Y+GWpVs1dbZLJanCIoGRcy/k5o+cTL/y5z+rqbPv2bHBlygS thbYFDpIAlgXhX4zA+hJWjZxTRwDo7EvqWJCYySSudKQ6hDrJfRrm/6UMBW7L2YvOU3NXp kbJ/fU7xnbWRKUxXuB6c4eoUYBFByOZ8gJaHyRRlc8+I47osEErLpWOvdWIWbpjSca+NF5 uPca8DNJrn3BNG2mX0cQ/nuGYBn9LuBmNbEAYk194J27XUxi0DJQAAsBGGz1q9rsse4oo6 6eOAnbFTWPY4nUIx6p51nOtga8NE6e+tyO2ljwfPqT4B9CNON7T3V+N7xmH3YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772024687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0AOXOEhjyyP1BaB3XptPCeXmB2ctwWzQ7rihjg5PqWc=; b=nXvewaGdZZfnwww4L6nuY0wq3SeS6Lqf+4egglC5qaFEPzybEqlf6VHibglLUjuFZ/LcnB KyD+Tbo/+ng2I4UYiky4QUsCkIF6ww6t9vSdi+/+wMb+n6jGO49PR4uX31deX7k0U9m+Ck 940V2O7zxn4UaJNsimUsTNKnFsfnDBW6VkRGXlwuNod8cogiAWb+wHPHx4MPmDW0Il2SB3 lv/B2IhJRpq/gnnc3m/1XwBusgtaY9f3gx6W1UnGLS10Hk6dn1DGHTn5yUq+BKkABXBGiK 6ZEo/FRzYfeCpNSVFpkFkpVDWvl2nWFM1d4OVOAsJ84tUkekVdI/sq8w67KmVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLZYp6JSMz134Y for ; Wed, 25 Feb 2026 13:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44562 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 13:04:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 8d2f910ceb0f - main - tcp: BBLog incoming packets in TCPS_TIME_WAIT 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: 8d2f910ceb0f1c366bcf2146a5ba1d1074d07933 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 13:04:46 +0000 Message-Id: <699ef36e.44562.f4e71a8@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8d2f910ceb0f1c366bcf2146a5ba1d1074d07933 commit 8d2f910ceb0f1c366bcf2146a5ba1d1074d07933 Author: Michael Tuexen AuthorDate: 2026-02-25 13:01:50 +0000 Commit: Michael Tuexen CommitDate: 2026-02-25 13:04:37 +0000 tcp: BBLog incoming packets in TCPS_TIME_WAIT PR: 292293 Reviewed by: rrs, rscheff, pouria, Nick Banks, Peter Lei MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D5546 --- sys/netinet/tcp_timewait.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 259ec7dc50dc..847598422da5 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -75,6 +75,7 @@ #include #include #include +#include #include #include @@ -288,6 +289,8 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th, */ if (thflags != TH_ACK || tlen != 0 || th->th_seq != tp->rcv_nxt || th->th_ack != tp->snd_nxt) { + TCP_LOG_EVENT(tp, th, NULL, NULL, TCP_LOG_IN, 0, tlen, NULL, + true); TCP_PROBE5(receive, NULL, NULL, m, NULL, th); tcp_respond(tp, mtod(m, void *), th, m, tp->rcv_nxt, tp->snd_nxt, TH_ACK); From nobody Wed Feb 25 13:09:24 2026 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 4fLZg854TNz6TTTd for ; Wed, 25 Feb 2026 13:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLZg84Nj3z42m0 for ; Wed, 25 Feb 2026 13:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772024964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rlOU3AijB8f2b8ymAl+Ympzr9Qj1nKP7y5z5VEYLTws=; b=DA2jct/aL53H/x17Ojm/NkxRPcGiBwAEMCtzt42wlGGXadqscnGy/slyo4z1SWZn9NSGpG 87tpy7j8zZz9YBRPccIM9Nv/baPu/nW3IoJeC4fKxrlN3IQyFu0zBB9yPp1eHOTWD8s6qb 5i9YJonLlB4858XCBEkhj/yUcUpSB3mhx8ThjRwDLwSbBYD0fJUnbwiAhiarQRVHMwciy3 kyxyjCHUL6P/u5WhxbDB7IPXXU5c+zVfBOt4izrsJFdhuXjKb54YN9sVjkOFb0I8+iR+xz eK5FIbPXqC+LSRZ/u8PEs16nLRS9pBIFAAqs6p6z1ZrIdBsz/eylLYq/gcDIBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772024964; a=rsa-sha256; cv=none; b=qDo2CqUo+y6DEKrXTZYRqbuCj/gRJ2B1ZhXc7LIkWKAEFsa/G69Yv+cg+dLAExh/4H8OVg xHioBZIDpWSd98a47BmqSS3yvYARBvGb+Lch1FeL/9DWfym240uuPAk7oI4UVafoI+Mu+U ij88goR5CxP199w83s3ei/57CIQ+hsMOpTFI5Bn65zBv+saFm7c067YkPPSFG4bpK9A3RS ln1Xu85RmTiUScj8soxwqMc0rnsJotm+by9pjawuynJmDnTdiJIjsYjqW77AyXeoUNg0/6 B2+7QuVFgKLOzaqxa3RzLDAuVDWFiSBFAEy1bibIKwKQmb/uxI3dDdDNAoXR+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772024964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rlOU3AijB8f2b8ymAl+Ympzr9Qj1nKP7y5z5VEYLTws=; b=JcQ6QMb3I/Nni9KZQyYto2x1fV0o3TUZo98Z/wcQOZ+sGKquxWfC8D/diWNigBJjD0L612 YaQPdcPeQvgwyNTlZ+A2NaSeCK+YV+ajCb0Ovsv++pnj3O4RVqhefgXPIOpoC3GlYamCEP mHOJfakzyntKpHCSh9Se7Yu1nZdsDgeiH6UeBCFd3+gNBiJ5ESOSK9w9ujP2rsFIFXneyL /UykB2epQyRlUprEo1CMiNJ2AjxMs59D+BUFmR57q4YcH1ay5EMrZdEOlD+1qZOhjZPsiG 6fxxoAExPAc9GPrDESUGq+PChnJaKzfy3njgoMZxT5HYVxI2BUUfK5/MgSIJmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLZg83lFcz1339 for ; Wed, 25 Feb 2026 13:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43768 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 13:09:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: f3364d3c8c87 - main - tcp: improve handling of segments in TIME WAIT 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: f3364d3c8c876074a9a6f68168e5eb8bd60207de Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 13:09:24 +0000 Message-Id: <699ef484.43768.3dbbc2ef@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f3364d3c8c876074a9a6f68168e5eb8bd60207de commit f3364d3c8c876074a9a6f68168e5eb8bd60207de Author: Michael Tuexen AuthorDate: 2026-02-25 13:06:15 +0000 Commit: Michael Tuexen CommitDate: 2026-02-25 13:06:15 +0000 tcp: improve handling of segments in TIME WAIT The check for excluding duplicate ACKs needs to consider only TH_SYN and TH_FIN. We know that TH_ACK is set and TH_RST is cleared. All other flags, in particular TH_ECE, TH_CWR, and TH_AE needs to be ignored for the check. PR: 292293 Reviewed by: rrs MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D55489 --- sys/netinet/tcp_timewait.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 847598422da5..ba5c90c91e43 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -287,7 +287,7 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th, /* * Acknowledge the segment if it has data or is not a duplicate ACK. */ - if (thflags != TH_ACK || tlen != 0 || + if ((thflags & (TH_SYN | TH_FIN)) != 0 || tlen != 0 || th->th_seq != tp->rcv_nxt || th->th_ack != tp->snd_nxt) { TCP_LOG_EVENT(tp, th, NULL, NULL, TCP_LOG_IN, 0, tlen, NULL, true); From nobody Wed Feb 25 17:10:12 2026 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 4fLh102LhGz6THvl for ; Wed, 25 Feb 2026 17:10: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLh101ssSz3XTj for ; Wed, 25 Feb 2026 17:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772039412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oCUgFhAKH/l6eV0LNJ+oRmuBekLZv8aUmqw68qg91l8=; b=ZW9vEyQEfKcT/UIrN4kFranHcV2Q3sHoVz9CLPB15zo96ZxRy6bT0P/+HUhAJQxaYYiGjm +Ral4/F6ykqNspWNQ8jhjv2eUEnzZODWEs9wQEFL7T/iX/Vg/fKx30iXthDO4nojXqUEhH O7ATrZx43FJuuNs+GBiBUDiuv2G1y/Nx9VihiZ6mdaspBKeF20zvPA1WigRuNFOoo5EwJS jKfeaN+B9qGfWeNwMc9ehqdKqAucge5EXJ1oGaAnThYB2uP/sqCljJq0EQFw2tyJ00gD+L aYu4LMbFpvqaX9ybLXuzApLxV1WY47/EWlBqiJmQ9cUoTREQMeEp7QOobN6g6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772039412; a=rsa-sha256; cv=none; b=N4uJOla085lajZKW+IzTmr6X9UPCnsa/CNmrcOjVYTtoFXpfZOg7LlrEbmhimKeRSXal0+ 9UOpaNxdZ3m7q+F7cGN1Qi72Tc+DSjZJ/YdsGZ5PLq67JF8SgyWb71RiOelLy4Rr4pEEpF uoddeRnvqnEDTtx7UMnK3Mk0ukaJTjHo24CdqWMoUhCqFt4GVDJ7+JY3vfDuxx7IHf6NS9 cmY4HNJCbfzsucHE4adxfvjXa2uZbrWBFFjVeDKqFHXaMRhDHZEAGsTFhwLzrLcMFUogIP AkFUYuMJe6sjRp6pSU7bt5Kp4LPMdKXWZuk45+Ad8AyPk/gyutMzvNEgCcv8kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772039412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oCUgFhAKH/l6eV0LNJ+oRmuBekLZv8aUmqw68qg91l8=; b=ijd9KqlLZLJMDhDV5bQ8E3lmd4HincNjiG/1Z7qFb1swkgRTMNNO1AaDmXWMODRbQdBohq e9otcK6K9Ro3e/AmttqmvXiMIoebZYBOyYq5hfyzJpB5FNyx0bTUanxE3U3GrbRp1cOUKU yKX6rAdSCT+P2ZtXIUDyXu7gxTT+RRV4rw4sytfELfTe7JiODs7+TyEt2DafLWxq0SlfE7 sfQGrek7oNFFrkEcKZcLlQnIxNtNWvLUvvG8gFmTgkEiF6HzKGoTDQaORFALEXhIY1Vxg9 n+zeGN+bBMvxzwFDWy5UTjm7vVBtU992TXOndSFffcIPvBEmceTwC0NmvvH/rQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLh101T5nz193q for ; Wed, 25 Feb 2026 17:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34474 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 17:10:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8b64d46fab87 - main - nullfs: Fix handling of doomed vnodes in nullfs_unlink_lowervp() 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: 8b64d46fab87af3ae062901312187f3a04ad2d67 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 17:10:12 +0000 Message-Id: <699f2cf4.34474.243e2fe@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8b64d46fab87af3ae062901312187f3a04ad2d67 commit 8b64d46fab87af3ae062901312187f3a04ad2d67 Author: Mark Johnston AuthorDate: 2026-02-25 15:31:30 +0000 Commit: Mark Johnston CommitDate: 2026-02-25 15:31:30 +0000 nullfs: Fix handling of doomed vnodes in nullfs_unlink_lowervp() nullfs_unlink_lowervp() is called with the lower vnode locked, so the nullfs vnode is locked too. The following can occur: 1. the vunref() call decrements the usecount 2->1, 2. a different thread calls vrele() on the vnode, decrements the usecount 0->1, then blocks on the vnode lock, 3. the first thread tests vp->v_usecount == 0 and observes that it is true, 4. the first thread incorrectly unlocks the lower vnode. Fix this by testing VN_IS_DOOMED directly. Since nullfs_unlink_lowervp() holds the vnode lock, the value of the VIRF_DOOMED flag is stable. Thanks to leres@ for patiently helping to track this down. PR: 288345 MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55446 --- sys/fs/nullfs/null_vfsops.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 170a3dd51cd8..c3eec727aeea 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -461,16 +461,12 @@ nullfs_unlink_lowervp(struct mount *mp, struct vnode *lowervp) vhold(vp); vunref(vp); - if (vp->v_usecount == 0) { + if (VN_IS_DOOMED(vp)) { /* - * If vunref() dropped the last use reference on the - * nullfs vnode, it must be reclaimed, and its lock - * was split from the lower vnode lock. Need to do - * extra unlock before allowing the final vdrop() to - * free the vnode. + * If the vnode is doomed, its lock was split from the lower + * vnode lock. Therefore we need to do an extra unlock before + * allowing the final vdrop() to free the vnode. */ - KASSERT(VN_IS_DOOMED(vp), - ("not reclaimed nullfs vnode %p", vp)); VOP_UNLOCK(vp); } else { /* @@ -480,8 +476,6 @@ nullfs_unlink_lowervp(struct mount *mp, struct vnode *lowervp) * relevant for future reclamations. */ ASSERT_VOP_ELOCKED(vp, "unlink_lowervp"); - KASSERT(!VN_IS_DOOMED(vp), - ("reclaimed nullfs vnode %p", vp)); xp->null_flags &= ~NULLV_NOUNLOCK; } vdrop(vp); From nobody Wed Feb 25 17:20:19 2026 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 4fLhDg6M11z6TJxF for ; Wed, 25 Feb 2026 17:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLhDg5mmhz3ZWd for ; Wed, 25 Feb 2026 17:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772040019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OcZxEfvuEKOSKcQLpA3fS2lnF+XIG1oZ6fA44+VtWok=; b=e6PuaZw6rFj4sfjW8DIC6IUXu3fCO6PrZGgEG7kP8oele60dC3ySrlBov8D70rwrf3A7cC oPLjx5Fd/3atnxH4jm4QTjR9QWK5YNapdCa/LghO5wAzhxtS6D6kRyAHpKNfVAI6KwlxAE /fGKk2l6H0sAv5euAkP2KnJeanX+8RFJwkMg3k16ebXZLD5h/dYSEICc2HZSmABmgSrnNg dJNdOC+Ks+ivCk1t5XhjIdjqQz5bdhD16pGm8sUxv9KoYUfnD14vJFwwTlXxJo56pbtNPs vxKnRwW32Pp+lQ0MwHI8zOvdUfTOm3tHxFFTbGI+LY3UXFjOdssuwfGrRTGImQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772040019; a=rsa-sha256; cv=none; b=xdVXOidtetzT61+GGHeBujxbhc3PLXVfZgrvi14yy2HBIuSif2k8l+y8TZGfy3EgM1ZbfU 7TfcXkdYnzBAVrQ5YlMKpfaYxlSkbLLJids22YORI/gfs3AewqZjQo3kAivp3l/8lQzH1y ndv+zKiCZJIys0Rc0xw9RSC4q8IG2z2NEbOnBa9akVPutWx6AiDpb5y5iRjyFqhNMM0CHb 9ulv0Ob1+0NtXKy3UhPN8to4+IrWNMZrVhrlQP2/uK+d8/GFPbUbWgJdaU6Jxlhg3aiuk8 ZuVmxfw8NUa4DqLq8Dk0TXrgKsPvqKRmQVn3gM5/Ze8XWI7vZCYTumu5oH1fUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772040019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OcZxEfvuEKOSKcQLpA3fS2lnF+XIG1oZ6fA44+VtWok=; b=T8QOWVtz5VVPR81IEbJyW33GBvC+ma2wDWo60tIalj7a6rLL7cjyYSZlQn0wvG7vhyezhK wqW6gsFEO0TEPYMwMySlRigrzK1tv9U69OJ9tc4yrNhrniw381z6mNdCZoIfglvtF2aFoS TfEP9oLkhwHmyODYgHdZtpyhlAg7qZUOwbqxmJzwElhBwEypl8Ys9vJ4ejvY0/+e6C3S2F nc+U2cWDq0leOpm+5ke1B9LB0V802rLhtGQhUlvw94MT3u2RwHl0YQm+vHm8pD6qv9/au0 eY15iUFA4HxSaOpwCV1qJ5PaY8f5FcMBc5Dvop6v36qGMvX+Pipn19dv5UFw3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLhDg5N1Lz194P for ; Wed, 25 Feb 2026 17:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3777b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 17:20:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 477f020c7b54 - main - netipsec/ipsec_offload.c: handle failures to install SA nicely 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: 477f020c7b5453bcd3bff7f1491e9830027b271e Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 17:20:19 +0000 Message-Id: <699f2f53.3777b.68820e75@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=477f020c7b5453bcd3bff7f1491e9830027b271e commit 477f020c7b5453bcd3bff7f1491e9830027b271e Author: Konstantin Belousov AuthorDate: 2026-01-27 01:00:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-25 17:19:36 +0000 netipsec/ipsec_offload.c: handle failures to install SA nicely If driver refused to install SA, record rejected handle for SA on the interface always, not only for EOPNOTSUPP case. The ipsec_accel_output() function did the right thing if there is no rejection handle, but not having the handle allows further attempts to install the SA on the interface. If driver installed the SA, but ipsec_accel_handle_sav() returned error, uninstall the SA from the interface. Hardware must not be set up to process packets for which kernel expects no processing is done. In both cases, free the drv_spi if a handle was not installed. But keep drv_spi allocated if the deinstall returned an error from the driver. Reviewed by: slavash Tested by: Wafa Hamzah Sponsored by: NVidia networking MFC after: 1 week --- sys/netipsec/ipsec_offload.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c index 632e99b8cfce..23d36c395c43 100644 --- a/sys/netipsec/ipsec_offload.c +++ b/sys/netipsec/ipsec_offload.c @@ -308,23 +308,38 @@ ipsec_accel_sa_newkey_cb(if_t ifp, void *arg) dprintf("ipsec_accel_sa_newkey: driver " "refused sa if %s spi %#x\n", if_name(ifp), be32toh(tq->sav->spi)); - error = ipsec_accel_handle_sav(tq->sav, - ifp, drv_spi, priv, IFP_HS_REJECTED, NULL); - /* XXXKIB */ } else { dprintf("ipsec_accel_sa_newkey: driver " "error %d if %s spi %#x\n", error, if_name(ifp), be32toh(tq->sav->spi)); - /* XXXKIB */ + } + error = ipsec_accel_handle_sav(tq->sav, ifp, drv_spi, priv, + IFP_HS_REJECTED, NULL); + if (error != 0) { + dprintf("ipsec_accel_sa_newkey: handle_sav REJECTED " + "err %d if %s spi %#x\n", error, + if_name(ifp), be32toh(tq->sav->spi)); + free_unr(drv_spi_unr, drv_spi); } } else { error = ipsec_accel_handle_sav(tq->sav, ifp, drv_spi, priv, IFP_HS_HANDLED, NULL); if (error != 0) { - /* XXXKIB */ - dprintf("ipsec_accel_sa_newkey: handle_sav " + dprintf("ipsec_accel_sa_newkey: handle_sav HANDLED " "err %d if %s spi %#x\n", error, if_name(ifp), be32toh(tq->sav->spi)); + error = ifp->if_ipsec_accel_m->if_sa_deinstall(ifp, + drv_spi, priv); + if (error == 0) + free_unr(drv_spi_unr, drv_spi); + /* + * If driver refused to deinstall the SA, keep + * drv_spi leaked so that it is not reused. + * The SA is still programmed into the + * hardware with the drv_spi ident, so it is + * better to leak the drv_spi then reuse for + * another SA and have issues due to aliasing. + */ } } out: From nobody Wed Feb 25 17:20:20 2026 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 4fLhDj1JsVz6TJn3 for ; Wed, 25 Feb 2026 17:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLhDh6Q9Zz3Zj1 for ; Wed, 25 Feb 2026 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772040020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhDb7azHn0/x9uABes9ttNhICuWK/F6PewIId5wBzn0=; b=VJbBRSFnYOxLA8uR5AxKtc4uao8CvAGjmqZ+K1powxyQyZtkHJ7cWgTcNUH6eWIyC+tbTT cnfbzXK1TB8Nt/jCGx6nnOaqzUwwbFxC4U+2qw8q4fczwtxii3yYXa0IwEh6ZImMRVK3jj vuO0ZZEn5a1NythHYqwjTG6+wEvDWIuhuwbtnAPphiN6/dvkCMjuFEICvx9eK52VW5bf8P OTagDoI+UcQcXlC/nCgzJ0JNNVl9Jb+FURSy4fhBeqYYLDpyDXkzG3RxtSn1HWZG3XkPQf FKoOoquZtpIZFdlGJS1Ic+DvZs2/nKoEZsR+XDp2tRqDM+LaFgnexLoRuRGE/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772040020; a=rsa-sha256; cv=none; b=Gke5H/0g4P5Eo8at23S6EhNbPOa2ojydWgFVwgP5hKtVjbtRi4emdFNJDOu7i/E7jEmckk nZJ+oYzrznEbtOaA1wa0nP9jgOxdpNw74+6Ln3Ui5GXMXYAH0NQhYoSo2iqNa17bz7XQTD pAT+JrtE5WDm0wDAXZvY9FCdRdoUPwkI9iLEPDDgtDLjHzgtv/ANpkO9KszVWdY77Vrs8X AXaOTyhJ1s7eSDUE6N5zketKRKESIHY2ocFLXeiYqCWwPgFzkYIQcT4DFiI+upula+yU3S wWNkNKg+LmQsgv9Oy5ohQxvvm2gIgQFIIS6bZ8ZwLun0Py1pZh9+jIvgmeNa8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772040020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhDb7azHn0/x9uABes9ttNhICuWK/F6PewIId5wBzn0=; b=AcrLNaocnhho9qlXe6zFZDWxPOUxD1O1htIKnAkHYFf/WtmJQ5abJWm0KKQuvUW0HE/Kay MeD8Beh9xCGzQ9w60BN+OpvXPRvve95vPkunyh3NsHAO12gs6qNcwrvEqT4vk+uRvCgygQ 58KLZz3mT0kq6IhV89sOH5ISi3wYKm10Ux7yUjPr1d+GqOL7wBwG8dXn+lwyA87cSEZYLw Rqzt5NM6Mangd7CVn1D8go8zcES73VZbEJVTnZ5xLb6SOdw5z5v4BdNfAnNG1Gk+vu70VO r3nnykZ6hSGHze4FibqyF91lt8pWYVR7NUUktrZYENuUGxfjPk3bygzBmPY53A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLhDh5n8pz1962 for ; Wed, 25 Feb 2026 17:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3891e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 17:20:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0e5caac7d543 - main - ipsec_offload: add comment stating why ipsec_accel_sa_newkey_cb() returns 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: 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: 0e5caac7d543687d540fa83a7125726c7c9e6e58 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 17:20:20 +0000 Message-Id: <699f2f54.3891e.7d80e848@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0e5caac7d543687d540fa83a7125726c7c9e6e58 commit 0e5caac7d543687d540fa83a7125726c7c9e6e58 Author: Konstantin Belousov AuthorDate: 2026-02-04 02:34:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-25 17:19:36 +0000 ipsec_offload: add comment stating why ipsec_accel_sa_newkey_cb() returns 0 Reviewed by: slavash Tested by: Wafa Hamzah Sponsored by: NVidia networking MFC after: 1 week --- sys/netipsec/ipsec_offload.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c index 23d36c395c43..e3a9d3247491 100644 --- a/sys/netipsec/ipsec_offload.c +++ b/sys/netipsec/ipsec_offload.c @@ -343,6 +343,13 @@ ipsec_accel_sa_newkey_cb(if_t ifp, void *arg) } } out: + /* + * Return 0, ignoring any errors from the SA installation. + * This function is a callback for if_foreach_sleep(), which + * stops iteration if one of the callbacks returns non-zero. + * We need to offer the SA to all interfaces that could + * offload it. + */ return (0); } From nobody Wed Feb 25 17:20:21 2026 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 4fLhDk1dbzz6TK1s for ; Wed, 25 Feb 2026 17:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLhDk0LMgz3Zj3 for ; Wed, 25 Feb 2026 17:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772040022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nyc4FUR//0FLYSMaDscLUmM7+cMhY9gWVMcxQviBpJY=; b=HaNBFDkxtMXs+emVBy0wQaRuY9CW+tS+vIiCBLSKmBuf1ZGT3jpqDyzvZtfohy+8YrhqZe QO5nrwAJrQqciKklaFuwt9uQqyq1qHZK4Lud5yB7GJiK4e+3zRcn+CsV8Z/zzerWviE5Ex 029Tl37bOnCW4yvBX6/qKX0YrdN/sg2Y2bdiTrvYPoo5xXqjZYcYxp4HuH679Pmdnpujjt ndbaO3zWdVusHxhGLBkiEVQxeKCdQeyETiNxvKxBfXFqdzCJOq1Mt7hnLOOwKZ/7Lyetme cEj+F1uaAjSRVdw1moAsKCsboZi55KN/YRmZ7J/SHmH1ANqh2HjhWsnS6oSU/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772040022; a=rsa-sha256; cv=none; b=D3xALaf1ZL6b5rMQwdsWejRmIxiuyaUxVn9H6mtEwdxf2HKq7lj6ATcZu+ZefyU6B7/vrx l9ASBZjXLa3htlv3CiS0AsyQZJOTh+mWuCUTRp/AJLaSrNvrtQ+enEzxRfCsEXdP31COtE KmoCZY73ygu0Q+HBCW0CpMxIeMA/n/AtgqH2iWHiN5ry9jUgWizvn/7RidQ95EnrcN2AAI rjm5AogKlJaewVv7/Yg9pKK4xp+zyTgrLtXaRdfFwyQHj/WY/Smlk0gdF78PrS8dYd0p8m 9ATxaciLGGRJFOij7i334pfh7uuz7UDq3/FgJ9rTcTiU1Wu02y4Mbt8hkSlaVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772040022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nyc4FUR//0FLYSMaDscLUmM7+cMhY9gWVMcxQviBpJY=; b=iWUPpevnbHRaLB9ohd0dBflsU/Lf4P+bN+qCPXuxF2CTdzWV9/HTBPvBppQ7CPnHXSeaLe rSLTsO/1Z1WWXq7M3K7twtcQBZF2/sZLjeQvNkhOReNg/4YrgWj3dHl87tkIrqfG076w1k AIAUovmaXDI3m1+zPa6g0AWvnU+8eYw/tXa8QXCiNcMLQ39n58HsjAiPAGDBRvTIIoTrBC 2LSaNhzV1/nQunsG7HX6rUGgkmszpqzhc4GA/Shk9WIUJ5+ZHmvfIjbBH7mYehG6fzzBLS FXFriNJIbDzDzkkkKCKDFv+ruXjLU4x4IiXk2HU6tvnysARcZg8dKFF7bpfBYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLhDj6dC7z1963 for ; Wed, 25 Feb 2026 17:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38391 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 17:20:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: de29fd032225 - main - mlx5: report IPSEC offload capabilities whenever IPSEC_OFFLOAD is configured 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: de29fd0322254127c3ebaedbc91ee4f9620f5fdf Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 17:20:21 +0000 Message-Id: <699f2f55.38391.59be0d76@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=de29fd0322254127c3ebaedbc91ee4f9620f5fdf commit de29fd0322254127c3ebaedbc91ee4f9620f5fdf Author: Konstantin Belousov AuthorDate: 2026-01-28 05:32:53 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-25 17:19:36 +0000 mlx5: report IPSEC offload capabilities whenever IPSEC_OFFLOAD is configured Do it always for bootverbose if offload was enabled in the kernel config, not only if the device actually supports all required capabilities to do the offload. Otherwise, having the code to print the caps is pointless. Reviewed by: slavash Tested by: Wafa Hamzah Sponsored by: NVidia networking MFC after: 1 week --- sys/dev/mlx5/mlx5_accel/ipsec.h | 1 + sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c | 19 ++++++++++++++----- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 3 +++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/sys/dev/mlx5/mlx5_accel/ipsec.h b/sys/dev/mlx5/mlx5_accel/ipsec.h index c3f3a2372482..8685c07e84db 100644 --- a/sys/dev/mlx5/mlx5_accel/ipsec.h +++ b/sys/dev/mlx5/mlx5_accel/ipsec.h @@ -204,6 +204,7 @@ struct mlx5e_ipsec_pol_entry { /* This function doesn't really belong here, but let's put it here for now */ void mlx5_object_change_event(struct mlx5_core_dev *dev, struct mlx5_eqe *eqe); +void mlx5e_ipsec_report(struct mlx5e_priv *priv); int mlx5e_ipsec_init(struct mlx5e_priv *priv); void mlx5e_ipsec_cleanup(struct mlx5e_priv *priv); diff --git a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c index 3f3c575c9dad..bdbad6a084d9 100644 --- a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c +++ b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c @@ -739,13 +739,14 @@ static const struct if_ipsec_accel_methods mlx5e_ipsec_funcs = { .if_hwassist = mlx5e_if_ipsec_hwassist, }; -int mlx5e_ipsec_init(struct mlx5e_priv *priv) +void +mlx5e_ipsec_report(struct mlx5e_priv *priv) { - struct mlx5_core_dev *mdev = priv->mdev; - struct mlx5e_ipsec *pipsec; - if_t ifp = priv->ifp; - int ret; + struct mlx5_core_dev *mdev; + if (!bootverbose) + return; + mdev = priv->mdev; mlx5_core_info(mdev, "ipsec " "offload %d log_max_dek %d gen_obj_types %d " "ipsec_encrypt %d ipsec_decrypt %d " @@ -775,6 +776,14 @@ int mlx5e_ipsec_init(struct mlx5e_priv *priv) MLX5_CAP_FLOWTABLE_NIC_RX(mdev, reformat_del_esp_transport_over_udp) != 0, MLX5_CAP_IPSEC(mdev, ipsec_esn) != 0); +} + +int mlx5e_ipsec_init(struct mlx5e_priv *priv) +{ + struct mlx5_core_dev *mdev = priv->mdev; + struct mlx5e_ipsec *pipsec; + if_t ifp = priv->ifp; + int ret; if (!(mlx5_ipsec_device_caps(mdev) & MLX5_IPSEC_CAP_PACKET_OFFLOAD)) { mlx5_core_dbg(mdev, "Not an IPSec offload device\n"); diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index daa98752c59b..0baeab31b100 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -4713,6 +4713,9 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev) goto err_rl_init; } +#ifdef IPSEC_OFFLOAD + mlx5e_ipsec_report(priv); +#endif if ((if_getcapenable2(ifp) & IFCAP2_BIT(IFCAP2_IPSEC_OFFLOAD)) != 0) { err = mlx5e_ipsec_init(priv); if (err) { From nobody Wed Feb 25 17:20:23 2026 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 4fLhDl3tNgz6TK6V for ; Wed, 25 Feb 2026 17:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLhDl1Qwnz3ZdD for ; Wed, 25 Feb 2026 17:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772040023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJkhGFj2VhcKwNEJoL2Jq5qdTmurkNR8AFBSelPT7jA=; b=FYSVseSmPKkJZLar13vzU8wCVT6nDi4YOyxVrkK+VHyTNOpxl0YhRKCkGfk7pe1uJxt/P5 rF2CqHqN+RD3OyWs6iKUFHge0pX6Qz6fJiXMesSgITbLenxDZYgTEH8cfb6appWOV5e2yS gkJip3h2HRYKTBJvlle/Kkt0nZyy9I4zdlvudicVcmElfGMYMd2zILbeVw0DClSnqhclke pMDSpoRDOlZupACnvVlGE2EWXapABePE+PEEoqKptzKH+p7iJie92bG4halKqRqBj8bd7n j+4J/vTqCVO/0rk0DmVDBENmCHoq/gOe/IOYSA7RDbShUISbW4ZBWmUXZ9GDpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772040023; a=rsa-sha256; cv=none; b=ZVH+KAYBgABAeFuDGt6JwrdWlzujbFtD4xqgFTtIramkDPkdzycJrdbWBU5i7ABfcaeLgr k2xJRLNoRcaWm+RythCYG56e4RTlCjRTtitZCT54jstXaXNVxrUknmZSFlMyGTDzTBWDGZ sP+A7wmWEDo8/FKlEkMjsHK2x0UUmCt4K6UkEIvBNTn6VHGG721Xy8w/x2MPRdZqmgWNia vD0GSTcQXyxueRvfGZB7OqiZyzqnFm/8r/HeFehE78iwmodWLBGgJJGhPnMVMjfdjVRIH/ MItfSdZoIdP3cUFL0RgwPWjGc24hFdnmsF/I260jTN862y6I97warizmdbd2Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772040023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJkhGFj2VhcKwNEJoL2Jq5qdTmurkNR8AFBSelPT7jA=; b=yzBMb0JUefBXfX/FFuXwjr/U/xvz40fUmj7L28KTgtRITWd+NP7MFhxfQNv3kU475Tos3p GEBrpkcm7UL7pWPgPS26DHOs7E/tFQIKp3i5+2EBr5HMwffZcnPD+3/TBKgXsEC/3MAOWO A5NcfKltOQ6V34GWEKqJjMF0YnOQTavJWuVwuFyzl0VFS0/ugjHK0GSUbV0ryQWyAKbDQE YK2gAk7p/8gRF4tke2Sb82ki1nNq3wed4ireY6olTA1U4LL7Lyo1RTMZNwTA/4tFmAtMLS b36lGeU5Olx4BmwGs4MAPSUxNHgVOQenOUZZ4r1Mgpv36MsYiveQH5lMehym1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLhDl0HgXz19LZ for ; Wed, 25 Feb 2026 17:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37432 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 17:20:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 87ca74de89e0 - main - mlx5: convert GET_TRUNK_IF() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87ca74de89e0ae96774674f7ae14d303fad5b780 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 17:20:23 +0000 Message-Id: <699f2f57.37432.4a747006@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=87ca74de89e0ae96774674f7ae14d303fad5b780 commit 87ca74de89e0ae96774674f7ae14d303fad5b780 Author: Konstantin Belousov AuthorDate: 2026-01-29 00:25:01 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-25 17:19:36 +0000 mlx5: convert GET_TRUNK_IF() to function Reviewed by: slavash Tested by: Wafa Hamzah Sponsored by: Nvidia networking MFC after: 1 week --- sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c index bdbad6a084d9..325c70969306 100644 --- a/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c +++ b/sys/dev/mlx5/mlx5_accel/mlx5_ipsec.c @@ -418,24 +418,30 @@ err_xfrm: return err; } -#define GET_TRUNK_IF(vifp, ifp, ept) \ - if (if_gettype(vifp) == IFT_L2VLAN) { \ - NET_EPOCH_ENTER(ept); \ - ifp = VLAN_TRUNKDEV(vifp); \ - NET_EPOCH_EXIT(ept); \ - } else { \ - ifp = vifp; \ +static struct ifnet * +mlx5_get_trunk_if(struct ifnet *vifp) +{ + struct epoch_tracker et; + struct ifnet *res; + + if (if_gettype(vifp) == IFT_L2VLAN) { + NET_EPOCH_ENTER(et); + res = VLAN_TRUNKDEV(vifp); + NET_EPOCH_EXIT(et); + } else { + res = vifp; } + return (res); +} static int mlx5e_if_sa_newkey(struct ifnet *ifpo, void *sav, u_int dev_spi, void **privp) { struct mlx5e_ipsec_priv_bothdir *pb; - struct epoch_tracker et; struct ifnet *ifp; int error; - GET_TRUNK_IF(ifpo, ifp, et); + ifp = mlx5_get_trunk_if(ifpo); pb = malloc(sizeof(struct mlx5e_ipsec_priv_bothdir), M_DEVBUF, M_WAITOK | M_ZERO); @@ -478,10 +484,9 @@ static int mlx5e_if_sa_deinstall(struct ifnet *ifpo, u_int dev_spi, void *priv) { struct mlx5e_ipsec_priv_bothdir pb, *pbp; - struct epoch_tracker et; struct ifnet *ifp; - GET_TRUNK_IF(ifpo, ifp, et); + ifp = mlx5_get_trunk_if(ifpo); pbp = priv; pb = *(struct mlx5e_ipsec_priv_bothdir *)priv; @@ -516,10 +521,9 @@ mlx5e_if_sa_cnt(struct ifnet *ifpo, void *sa, uint32_t drv_spi, void *priv, struct mlx5e_ipsec_priv_bothdir *pb; u64 packets_in, packets_out; u64 bytes_in, bytes_out; - struct epoch_tracker et; struct ifnet *ifp; - GET_TRUNK_IF(ifpo, ifp, et); + ifp = mlx5_get_trunk_if(ifpo); pb = priv; mlx5e_if_sa_cnt_one(ifp, sa, drv_spi, pb->priv_in, @@ -652,12 +656,11 @@ mlx5e_if_spd_install(struct ifnet *ifpo, void *sp, void *inp1, void **ifdatap) { struct mlx5e_ipsec_pol_entry *pol_entry; struct mlx5e_priv *priv; - struct epoch_tracker et; u16 vid = VLAN_NONE; struct ifnet *ifp; int err; - GET_TRUNK_IF(ifpo, ifp, et); + ifp = mlx5_get_trunk_if(ifpo); if (if_gettype(ifpo) == IFT_L2VLAN) VLAN_TAG(ifpo, &vid); priv = if_getsoftc(ifp); From nobody Wed Feb 25 17:52:00 2026 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 4fLhxV28gDz6TNgT for ; Wed, 25 Feb 2026 17:52:14 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLhxT5JXFz3hLQ for ; Wed, 25 Feb 2026 17:52:13 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b="D/X4YgCo"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::42e as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-82735a41985so4556b3a.2 for ; Wed, 25 Feb 2026 09:52:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772041933; x=1772646733; darn=freebsd.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=EDjzfVLRUKa7ZYPnLyAVv6qvrrORjygse1rce365qxo=; b=D/X4YgCodDvmLuuvm9hlycWXWF+E9jVTq32NS1v3CfhQb6dUKBjU34ZrVBXaIPEMpw XTTqYxsDAC8+oHcnTcYBamSGlmeXAqhSM460D70Xe7QZs4m39e6gka76gv6ORIA5hTca psESohEZFzVq/McL1Vc+fLxWUTuP85D2Xe20eGJb9wZS35AbvxKLp8dU6WTTBC/DKO6c 60Db5L7MsDhNvpbXpp4KH23UM7mPbbITwc8fsWRaq0RMB5FHKUSE+anLmHjFms6tVMbW dt1lJH7eIO4QhlJ/V8o+h/uXjcK+79167dsguPCB4XvOCgLAk1CvBpVWnzljmxMzPKfI bpIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772041933; x=1772646733; 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=EDjzfVLRUKa7ZYPnLyAVv6qvrrORjygse1rce365qxo=; b=Lsyxsgiu4UQSokkwMy7YhNzYy7cpnNDmWpucQ1ugpvFM5vsiBLo6AYVuB4FDS3sdND hvS/TWA48kDoeZttAiKaCeqE1vUI+Qi6pz4JOziotSXk7udbt0elVLnzeBzk1RtypLJ+ inFWdTU68K95Z/7/TiuGRxkgW4dHBjRz66oDgpH/w+Jc9fAe4uxN5+Ri55lgWopY8qJH 43UVZGvrnzrTDsFRit7K/Q16Xd+FpMxAcJ1zXngx7lBs4ASXyaNelvB5ogBVTp7TuLnL h1OmgNv03Y9m/F362rPbxxK4NUqjWOJeE2JClbhkfP4iOYCbijHY3fjKADztb0qmmt7/ MMFg== X-Forwarded-Encrypted: i=1; AJvYcCV9f2eWgxIAT93taPdH5ljG//CWafIVJMeflNiGCmN81J7bmiAEIf6Ijkcj9uNoCK9i8neYo4YQs8FvO9kIa14jJCPUEQ==@freebsd.org X-Gm-Message-State: AOJu0YzKEx0GUQnp1IS/5e+VSGve6j0F3tvu3puGG+i/SjGik0NZ2Wj3 wHWw23mksDTvnzA2mcIBuHZWu2DM/bjDxE31InwIAm1zCmSdsipqXM+e X-Gm-Gg: ATEYQzwowmtMfhRg+sIkyy8GoRsc+HUuXNyXkiTc5h4a2PtVZsieQiE3ZYpKUsOOwUv Zq4XaLeZyM7k2tYbad+0PIhZbHGOX3Mm81W7gcn7ANnnUsDwYuC3FO2oHQnE1nQc6LDzSZruYEn j0jOgjMeBt3//gsdhwt1JARaLhEzozTE7uTQJhkBWxw8lr4ASQMKchhLOdJWgDUGZL8ssMEp+u8 2ujqpLe4253dcUMw4CAgb4/PCGs+rw4q/GR27qnur17ksn5YgKj47PJt80VzkKHZ6eMDGpaiwdl kmmGGTyB8AlntdcYc8OMUqxewiet20W2mariyLmJ6PpWEN5bL8h/DOiB2pOrLsrGM69cb9HgccL 3HISyT5CeGngk02sNK7qzRlPLzOa96g1HGNofu3RhNRlY98NmeSTe7XUvepkdh+kkeIKtBtLAEc MGK9H/irD8g6fAGic0g32+TdJkm+OgIT9LluCQMJCi X-Received: by 2002:a05:6a00:895:b0:81b:bc05:e27d with SMTP id d2e1a72fcca58-8273375f52fmr1088940b3a.40.1772041932655; Wed, 25 Feb 2026 09:52:12 -0800 (PST) Received: from smtpclient.apple ([162.118.1.182]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-826dd8ecc83sm14245700b3a.62.2026.02.25.09.52.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Feb 2026 09:52:12 -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 \(3826.700.81.1.4\)) Subject: Re: git: 64dab63f3b3b - main - LinuxKPI: Use negative bit field size to trigger BUILD_BUG_ON_ZERO From: "Enji Cooper (yaneurabeya)" In-Reply-To: <202201101950.20AJor0m009372@gitrepo.freebsd.org> Date: Wed, 25 Feb 2026 09:52:00 -0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <241DCDC1-B8A5-43CF-9FAA-19406EB8A996@gmail.com> References: <202201101950.20AJor0m009372@gitrepo.freebsd.org> To: Vladimir Kondratyev X-Mailer: Apple Mail (2.3826.700.81.1.4) X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEMAIL_FROM(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_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::42e:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; 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: 4fLhxT5JXFz3hLQ X-Spamd-Bar: --- > On Jan 10, 2022, at 11:50=E2=80=AFAM, Vladimir Kondratyev = wrote: >=20 > The branch main has been updated by wulf: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D64dab63f3b3b6c6a1f8a92f43bed0aa2= 8319d627 >=20 > commit 64dab63f3b3b6c6a1f8a92f43bed0aa28319d627 > Author: Vladimir Kondratyev > AuthorDate: 2021-12-25 18:42:15 +0000 > Commit: Vladimir Kondratyev > CommitDate: 2022-01-10 19:49:38 +0000 >=20 > LinuxKPI: Use negative bit field size to trigger BUILD_BUG_ON_ZERO >=20 > compile time assertion on non-NULL pointers. Tests conducted show = that > _Static_assert, negative array size method and current code does = not > handle pointers well enough. Bit field method solves this problem. >=20 > This change is derrived from Linux implementation of = BUILD_BUG_ON_ZERO. >=20 > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D33674 > --- > sys/compat/linuxkpi/common/include/linux/kernel.h | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) >=20 > diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h = b/sys/compat/linuxkpi/common/include/linux/kernel.h > index 419dae214396..a84f577dd912 100644 > --- a/sys/compat/linuxkpi/common/include/linux/kernel.h > +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h > @@ -109,9 +109,7 @@ > #define BUILD_BUG_ON_MSG(x, msg) BUILD_BUG_ON(x) > #define BUILD_BUG_ON_NOT_POWER_OF_2(x) BUILD_BUG_ON(!powerof2(x)) > #define BUILD_BUG_ON_INVALID(expr) while (0) { (void)(expr); } > - > -extern const volatile int lkpi_build_bug_on_zero; > -#define BUILD_BUG_ON_ZERO(x) ((x) ? lkpi_build_bug_on_zero : 0) > +#define BUILD_BUG_ON_ZERO(x) ((int)sizeof(struct { int:-((x) !=3D 0); = })) Hi Vladimir, I think this change is causing build problems now with gcc14. = Please see the snippet from = https://ci.freebsd.org/job/FreeBSD-main-amd64-gcc14_build/2986/consoleText= below. Thanks, -Enji --- all_subdir_rtw89 --- --- core.o --- In file included from = /workspace/src/sys/compat/linuxkpi/common/include/linux/kernel.h:44, from = /workspace/src/sys/compat/linuxkpi/common/include/linux/skbuff.h:39, from = /workspace/src/sys/compat/linuxkpi/common/include/linux/ip.h:40, from /workspace/src/sys/contrib/dev/rtw89/core.c:9: /workspace/src/sys/contrib/dev/rtw89/core.c: In function = 'rtw89_bcn_calc_drift': = /workspace/src/sys/compat/linuxkpi/common/include/linux/build_bug.h:60:33:= error: statement with no effect [-Werror=3Dunused-value] 60 | #define BUILD_BUG_ON_ZERO(x) ((int)sizeof(struct { int:-((x) = !=3D 0); })) | ^ /workspace/src/sys/compat/linuxkpi/common/include/linux/sort.h:37:9: = note: in expansion of macro 'BUILD_BUG_ON_ZERO' 37 | BUILD_BUG_ON_ZERO(swap); \ | ^~~~~~~~~~~~~~~~~ /workspace/src/sys/contrib/dev/rtw89/core.c:2575:9: note: in expansion = of macro 'sort' 2575 | sort(drift, RTW89_BCN_TRACK_STAT_NR, sizeof(*drift), = cmp_u16, NULL); | ^~~~= From nobody Wed Feb 25 20:19:12 2026 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 4fLmC41zj8z6Tgdr for ; Wed, 25 Feb 2026 20:19: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLmC41BDKz41Gk for ; Wed, 25 Feb 2026 20:19:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772050752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HrhJzI+sDZWqOjaqstHg/jjABh863vNA0FFPSJU5onU=; b=xEnclVxYKbxJdvYX1mcOxt+h6r5I58zoiPMpjK5EthoMyFjvBvB+zk+Q/bmGO71TroXZV1 HNd4ZfvsCIT8Sh4SdokWpgpzNpfKEWyb80scTOyU8dBKijorXTT/LWdSUJPzgPNldB4TG3 tqg0dQeiryXch7VgDw0+ilKSnE3S63RVkiy2YfWexegSZD35GjwieJMsLafAtOrGSU0AIx tblgx0eWkwm42YC/dzrRFrf2AvEbdcEBmEFStYd+dwVhIMgG6dOrZsikWxayBSL1Nr4H0w wTNdFc9W068lQRwQ74+SP/SPbI3J40psyuEWs8y2ebrXiDwdu1nT13f4HoPDjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772050752; a=rsa-sha256; cv=none; b=LXjHBpSmpUj35zjGfup5mFUiOStg+Iy86JB6MoaTih5d6dh1uPTMMO2Ga7Vq2Qsi2bjtJb Vv8hrnHa54FafsZjm1i+zrb8DZjze5o1yJoGLw345vjXFwUMI+rhujswbBJ71egk2PrEiw A+Lm/1YEOoNddWMl/1+9hODRi2oPcSq/2TF0mjHw+fUDF92vZ5Sz3KubZiEv5XlSmlQSXW fBUBRhZ70PdsfFUmsWOaDoC7oAhU5G4265nayQBBVUjG+J/b22ohPro1Pn3M7oVreRJfXw MaNpoMMnMyVpxcrzY+93MjaG0e4Dk/CbXiU3SmHbjsJkDlEVsQiG4G+/dAKfJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772050752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HrhJzI+sDZWqOjaqstHg/jjABh863vNA0FFPSJU5onU=; b=Y9yB6Z+6c9uEHxbC7qCSHSzuOLisvHjZm45vFkhHcPVeql5nqxHpf1iZKHB/b4p8Na0jUl AseUg7emN5vP83jnHHRShRNDFzO5bkGPtr6XMAFenlza63S9yrdgl3wRSZai3BLNd9wF0g 4EM8hrMQCDHnenSUbXtg0pkrtNp3/HI6cJ5C0cNL8xrytNfye5tZmqBFrqcAflVutPdrTV RYBPydJLX0qf4baUJjlJn5EVGb9jEOTnlc8UcBd0xSTk0nFJ7H0NcbMV5zjTi+8PzvhNhi TtNMXUWAtIpuM9ZtIhwruncVHQ9ZARB3ctq+UbBNprpcux+O7bbs7yCFqqa1HQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLmC40VTFz1Fgj for ; Wed, 25 Feb 2026 20:19:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21ef0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 20:19:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: 722fbfef0abb - main - ffs snapshots: pass valid args to vn_start_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: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 722fbfef0abb4de31fb91fd35f9b85fd534725c4 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 20:19:12 +0000 Message-Id: <699f5940.21ef0.1823f74a@gitrepo.freebsd.org> The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=722fbfef0abb4de31fb91fd35f9b85fd534725c4 commit 722fbfef0abb4de31fb91fd35f9b85fd534725c4 Author: Eric van Gyzen AuthorDate: 2026-02-25 16:26:06 +0000 Commit: Eric van Gyzen CommitDate: 2026-02-25 16:44:38 +0000 ffs snapshots: pass valid args to vn_start_write If the initial no-wait vn_start_write fails, we pass the old PCATCH flag to the following sleepable vn_start_write. Following a75d1ddd74, that flag should be V_PCATCH. Sponsored by: Dell Inc. Differential Revision: https://reviews.freebsd.org/D55512 --- sys/ufs/ffs/ffs_snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index 31823458ed8a..a024cbf84283 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -282,7 +282,7 @@ restart: NDFREE_PNBUF(&nd); vput(nd.ni_dvp); if ((error = vn_start_write(NULL, &wrtmp, - V_XSLEEP | PCATCH)) != 0) + V_XSLEEP | V_PCATCH)) != 0) return (error); goto restart; } From nobody Wed Feb 25 21:12:53 2026 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 4fLnP12yXZz6TnLy for ; Wed, 25 Feb 2026 21:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLnP11stJz47Dq for ; Wed, 25 Feb 2026 21:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772053973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AEUabYiJLEWqTEUEOVh3BfQTtfltTdSDlWBZtmYZh7M=; b=nf4uIlbpmGShVrmHbkvOy5PaIQS5Mq+zoTUjah5tc7swiTvGIDf67yoN7yu2EK4KhMvOa8 1q6D1QzNVoGm1HEssE/xrxrSPLsITd2zeqswrtyAc6ITd9B1pZ3cKomYgGJUF2NuBm8vaF 4j5j4+iBK1wlZ/ev0oShljbm3P/FVa1S/Oskct6HyeRpbyPNEk9V9jdptw7wLXQFq/Uplw VNx1Dox2BusrbFX2g0Sgsooo4U+L5cxdXn+6vYlMFAIRvKGPhmGf3njX1jvvQOUxuq5kUK 4Fu6L/hMu8OwdEu7ELVDuCbnd0OeIHmfEoxbliAtjd31V8u1aM9w35mEW3zB4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772053973; a=rsa-sha256; cv=none; b=dwZNwrXd72V9pe04VJUMmxKYqHf+utxRA3P94qQZe4KaJIFy7Ujdr6st5dpp6ghJBtpIDJ MnyKJ6aVogovo4hqXl+X1d7uG4uI0yIrIW0CoetbxDXN/9f+qkW6yaPDItCeIPhzSy07fN 5LagH3Q/3RgGAiBgxLzjF+bt678kI6Q5DMIhadGngkf82/udLSD0IyeZRxsfeAUli+qXBw v2zyKu3FHeAkTxGIbJYThLvAZ0DV8kY9TnzUK7XC0bWwqc3b6mxj7eBz/T30T5dlsbXjXI 6ggWJ0Vr/Rd9rlIf7xcoGWvgkpKmkxwURXLcgMSKIjsFgKa1VqL3M5zV+AG2xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772053973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AEUabYiJLEWqTEUEOVh3BfQTtfltTdSDlWBZtmYZh7M=; b=LBTOZAsXo/BP9vDLagzAQ7R1dR0gfpNdf58MErOTSGc4OignmZnXpN961P5zQSS/9qNRmv 792xmdarFCl7fILcH4I3c+A8xDppvNASXm3uukH0lasqoDy+uXXww+c7hXCi0pOLpo8CTs hTiWtjLwxX+aw6Rtc2YFYv7zDV38kCCgXxwVDDP+t2vMKWOW8vP510fQQuZg2GWFDxyil7 WT3ZB624e+pZUfdYATvhxQYuf+uqXa0q/lbUubMf8dhWPAmC5srIIgrJo5XWEn3230yGxR oQvZuxSbWteNivp4Z+oorFuE2qW6sclgckxDujm28U021OpByMzLE/r/NOMS9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLnP10hNVz1HCs for ; Wed, 25 Feb 2026 21:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30816 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 21:12:53 +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: 6e589e6e8e64 - main - system(3): Improve signal handling 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: 6e589e6e8e64793adb437c561ec084dbb6ad1ced Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 21:12:53 +0000 Message-Id: <699f65d5.30816.41b354e9@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6e589e6e8e64793adb437c561ec084dbb6ad1ced commit 6e589e6e8e64793adb437c561ec084dbb6ad1ced Author: Dag-Erling Smørgrav AuthorDate: 2026-02-25 21:12:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-25 21:12:21 +0000 system(3): Improve signal handling Ignore SIGINT and SIGQUIT and block SIGCHLD, as POSIX requires. To deal with the concurrency problem described in POSIX, we keep track of the count of concurrent invocations. We ignore and block signals only when the counter was zero before we incremented it, and restore them only when the counter reaches zero after we decrement it. Note that this does not address the issue of thread cancellation. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: bnovkov, sef, kevans Differential Revision: https://reviews.freebsd.org/D55471 --- lib/libc/stdlib/system.c | 116 +++++++++++++++++++++++++++++------------------ 1 file changed, 73 insertions(+), 43 deletions(-) diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c index b581a6ec3b14..17dd63eb52f9 100644 --- a/lib/libc/stdlib/system.c +++ b/lib/libc/stdlib/system.c @@ -32,21 +32,22 @@ #include "namespace.h" #include #include + +#include +#include #include -#include #include +#include #include #include -#include -#include #include "un-namespace.h" #include "libc_private.h" +#include "spinlock.h" #pragma weak system int system(const char *command) { - return (((int (*)(const char *)) __libc_interposing[INTERPOS_system])(command)); } @@ -54,54 +55,83 @@ system(const char *command) int __libc_system(const char *command) { - pid_t pid, savedpid; - int pstat; - struct sigaction ign, intact, quitact; - sigset_t newsigblock, oldsigblock; + static spinlock_t lock = _SPINLOCK_INITIALIZER; + static volatile unsigned long concurrent; + static struct sigaction ointact, oquitact; + struct sigaction ign; + sigset_t sigblock, osigblock; + int pstat = -1, serrno = 0; + pid_t pid; - if (!command) /* just checking... */ - return(1); + if (command == NULL) /* just checking... */ + return (1); - (void)sigemptyset(&newsigblock); - (void)sigaddset(&newsigblock, SIGCHLD); - (void)sigaddset(&newsigblock, SIGINT); - (void)sigaddset(&newsigblock, SIGQUIT); - (void)__libc_sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); - switch(pid = vfork()) { /* - * In the child, use unwrapped syscalls. libthr is in - * undefined state after vfork(). + * If we are the first concurrent instance, ignore SIGINT and + * SIGQUIT. Block SIGCHLD regardless of concurrency, since on + * FreeBSD, sigprocmask() is equivalent to pthread_sigmask(). */ - case -1: /* error */ - (void)__libc_sigprocmask(SIG_SETMASK, &oldsigblock, NULL); - return (-1); - case 0: /* child */ + if (__isthreaded) + _SPINLOCK(&lock); + if (concurrent++ == 0) { + memset(&ign, 0, sizeof(ign)); + ign.sa_handler = SIG_IGN; + sigemptyset(&ign.sa_mask); + (void)__libc_sigaction(SIGINT, &ign, &ointact); + (void)__libc_sigaction(SIGQUIT, &ign, &oquitact); + } + sigemptyset(&sigblock); + sigaddset(&sigblock, SIGCHLD); + (void)__libc_sigprocmask(SIG_BLOCK, &sigblock, &osigblock); + if (__isthreaded) + _SPINUNLOCK(&lock); + + /* + * Fork the child process. + */ + if ((pid = fork()) < 0) { /* error */ + serrno = errno; + } else if (pid == 0) { /* child */ /* - * Restore original signal dispositions and exec the command. + * Restore original signal dispositions. */ - (void)__sys_sigprocmask(SIG_SETMASK, &oldsigblock, NULL); - execl(_PATH_BSHELL, "sh", "-c", command, (char *)NULL); + (void)__libc_sigaction(SIGINT, &ointact, NULL); + (void)__libc_sigaction(SIGQUIT, &oquitact, NULL); + (void)__sys_sigprocmask(SIG_SETMASK, &osigblock, NULL); + /* + * Exec the command. + */ + execl(_PATH_BSHELL, "sh", "-c", command, NULL); _exit(127); + } else { /* parent */ + /* + * Wait for the child to terminate. + */ + while (_wait4(pid, &pstat, 0, NULL) < 0) { + if (errno != EINTR) { + serrno = errno; + break; + } + } } - /* - * If we are running means that the child has either completed - * its execve, or has failed. - * Block SIGINT/QUIT because sh -c handles it and wait for - * it to clean up. + + /* + * If we are the last concurrent instance, restore original signal + * dispositions. Unblock SIGCHLD, unless it was already blocked. */ - memset(&ign, 0, sizeof(ign)); - ign.sa_handler = SIG_IGN; - (void)sigemptyset(&ign.sa_mask); - (void)__libc_sigaction(SIGINT, &ign, &intact); - (void)__libc_sigaction(SIGQUIT, &ign, &quitact); - savedpid = pid; - do { - pid = _wait4(savedpid, &pstat, 0, (struct rusage *)0); - } while (pid == -1 && errno == EINTR); - (void)__libc_sigaction(SIGINT, &intact, NULL); - (void)__libc_sigaction(SIGQUIT, &quitact, NULL); - (void)__libc_sigprocmask(SIG_SETMASK, &oldsigblock, NULL); - return (pid == -1 ? -1 : pstat); + if (__isthreaded) + _SPINLOCK(&lock); + if (--concurrent == 0) { + (void)__libc_sigaction(SIGINT, &ointact, NULL); + (void)__libc_sigaction(SIGQUIT, &oquitact, NULL); + } + if (!sigismember(&osigblock, SIGCHLD)) + (void)__libc_sigprocmask(SIG_UNBLOCK, &sigblock, NULL); + if (__isthreaded) + _SPINUNLOCK(&lock); + if (serrno != 0) + errno = serrno; + return (pstat); } __weak_reference(__libc_system, __system); From nobody Wed Feb 25 21:12:54 2026 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 4fLnP23Rz2z6TnG5 for ; Wed, 25 Feb 2026 21:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLnP221mQz478X for ; Wed, 25 Feb 2026 21:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772053974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DWBtLwpf/hM1u8GqgUvy7KDTDSIZOeLKyUB/dXg4dBc=; b=hx4UkmWSa1WMvX2YLI++jqbPG2Q5E0S29XN3urgku36Q3glS8zWWW0O1F9gAleM0vvuRGD vq6sq2BN/+yPYEOlpZXr8LflIbpjow6djWlREH1DRmG/BRU8jQ8Ekv1Z5/43dUqaMtuFUT tBw540nZ1rd0jYzpylWl3D7jIgyjMjm0t6pSf7SP0BK1VngWYHJnW9zGYaCuUzGQxNRykr uayLUZFK1zuxiO2YvbveMxLs6b5W2JU1Y80bJ0uJ9vo7CnVaaQvnkp5Xc/uqOc2m0XZLfr zLnBzvhOf1C4zuuw2djV1F4BoH675H9kOGh0GVA+EFEqpYzIJsg0HdwTKZyA8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772053974; a=rsa-sha256; cv=none; b=xiRPIRjKEAnNUy7Ymu3uBov/VZLcg3aW7z+RT7uDGoCj8IeeCrTZjMSRMH5cgeRdTEw0cp NdXNOSUw42Rbm+NCnIt0ZFx9nIxTGYXr94zY2ppIduFaIYX9eyblLzCZikp4JqUoqoULIB epzuS9qIawYqYUlZ1IDhIMLyth6SHijwzRHcjg+sNzmljIexT0kdvWRII0qysPbH3ao9Wu RC5eN5d5eMZu8j0p0B4kTxwGmsDkhLpucyT8uFiY94a11Jy4s6cYvJcwhbz7eqLlSSp/OE CF4FzpsQ0AO1BZtR0Jqr0reZt+5AIbCDVQ+QrOXWR+bUFtrUplWDxctWpc9Lug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772053974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DWBtLwpf/hM1u8GqgUvy7KDTDSIZOeLKyUB/dXg4dBc=; b=jDaMq3dSELdbRA1tZGhFQRTjPQMyX/nSuQwG7aWWlDstxTK4sFrplDloElnJ4UDao/mtDk NXj9/TqevAH8jWPlVPU4bfLCwAKbFDdPp2OOf3PFkc1I2q6VICsSB55U6RpXmdEoDRhatA PvgjFGTtsApnl6k92r5jiwJirCv8fybalDuqw00gs+1fZMspPQl/bupFRAcHAH5alERzQJ gxbWoSGNqpX4VW3auLBWi+2+MMKekZAff6EL+ECXlbGhOKMYzmP9W6qMaKYR3prBbArXvs QNj2WmXbFQN6zH7Rufax2zTFFrlOJpeTo8KURckD5DfnMYpMviLp2aHaVM88Tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLnP21ZRqz1HbM for ; Wed, 25 Feb 2026 21:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27fcd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 21:12: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: 7a1ade5109ac - main - system(3): Write our own 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a1ade5109ac57d1f59eaa75b5d0f13fabecf6ba Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 21:12:54 +0000 Message-Id: <699f65d6.27fcd.1a11d18e@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7a1ade5109ac57d1f59eaa75b5d0f13fabecf6ba commit 7a1ade5109ac57d1f59eaa75b5d0f13fabecf6ba Author: Dag-Erling Smørgrav AuthorDate: 2026-02-25 21:12:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-25 21:12:29 +0000 system(3): Write our own tests Replace the somewhat perfunctory NetBSD tests with our own. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: bnovkov, kevans Differential Revision: https://reviews.freebsd.org/D55482 --- lib/libc/tests/stdlib/Makefile | 3 +- lib/libc/tests/stdlib/system_test.c | 164 ++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 1 deletion(-) diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile index 9d84becfbd1f..a714a8cab774 100644 --- a/lib/libc/tests/stdlib/Makefile +++ b/lib/libc/tests/stdlib/Makefile @@ -17,6 +17,7 @@ ATF_TESTS_C+= qsort_s_test ATF_TESTS_C+= qsort_bench ATF_TESTS_C+= set_constraint_handler_s_test ATF_TESTS_C+= strfmon_test +ATF_TESTS_C+= system_test ATF_TESTS_C+= tsearch_test ATF_TESTS_CXX+= cxa_thread_atexit_test ATF_TESTS_CXX+= cxa_thread_atexit_nothr_test @@ -44,7 +45,6 @@ NETBSD_ATF_TESTS_C+= posix_memalign_test NETBSD_ATF_TESTS_C+= random_test NETBSD_ATF_TESTS_C+= strtod_test NETBSD_ATF_TESTS_C+= strtol_test -NETBSD_ATF_TESTS_C+= system_test # TODO: need to come up with a correct explanation of what the patch pho does # with h_atexit @@ -78,6 +78,7 @@ LIBADD.${t}+= netbsd util LIBADD.libc_exit_test+= pthread LIBADD.strtod_test+= m +LIBADD.system_test+= pthread SUBDIR+= dynthr_mod SUBDIR+= libatexit diff --git a/lib/libc/tests/stdlib/system_test.c b/lib/libc/tests/stdlib/system_test.c new file mode 100644 index 000000000000..713e4bb0f87a --- /dev/null +++ b/lib/libc/tests/stdlib/system_test.c @@ -0,0 +1,164 @@ +/*- + * Copyright (c) 2026 Klara, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +ATF_TC(system_true); +ATF_TC_HEAD(system_true, tc) +{ + atf_tc_set_md_var(tc, "descr", "system(\"true\")"); +} +ATF_TC_BODY(system_true, tc) +{ + ATF_REQUIRE_EQ(W_EXITCODE(0, 0), system("true")); +} + +ATF_TC(system_false); +ATF_TC_HEAD(system_false, tc) +{ + atf_tc_set_md_var(tc, "descr", "system(\"false\")"); +} +ATF_TC_BODY(system_false, tc) +{ + ATF_REQUIRE_EQ(W_EXITCODE(1, 0), system("false")); +} + +ATF_TC(system_touch); +ATF_TC_HEAD(system_touch, tc) +{ + atf_tc_set_md_var(tc, "descr", "system(\"touch file\")"); +} +ATF_TC_BODY(system_touch, tc) +{ + /* The file does not exist */ + ATF_CHECK_ERRNO(ENOENT, unlink("file")); + + /* Run a command that creates it */ + ATF_REQUIRE_EQ(W_EXITCODE(0, 0), system("touch file")); + + /* Now the file exists */ + ATF_CHECK_EQ(0, unlink("file")); +} + +ATF_TC(system_null); +ATF_TC_HEAD(system_null, tc) +{ + atf_tc_set_md_var(tc, "descr", "system(NULL)"); +} +ATF_TC_BODY(system_null, tc) +{ + ATF_REQUIRE_EQ(1, system(NULL)); +} + +/* + * Define PROCMASK_IS_THREADMASK if sigprocmask() gets / sets the thread + * mask in multithreaded programs, which makes it impossible to verify + * that system(3) correctly blocks and unblocks SIGCHLD. + */ +#ifdef __FreeBSD__ +#define PROCMASK_IS_THREADMASK 1 +#endif + +static void * +system_thread(void *arg) +{ + char cmd[64]; + int i = (int)(intptr_t)arg; + + snprintf(cmd, sizeof(cmd), "rm flag%d ; lockf -ns lock%d true", i, i); + return ((void *)(intptr_t)system(cmd)); +} + +ATF_TC(system_concurrent); +ATF_TC_HEAD(system_concurrent, tc) +{ + atf_tc_set_md_var(tc, "descr", "Concurrent calls"); +} +ATF_TC_BODY(system_concurrent, tc) +{ +#define N 3 + sigset_t normset, sigset; + pthread_t thr[N]; + char fn[8]; + int fd[N]; + void *arg, *ret; + + /* Create and lock the locks */ + for (int i = 0; i < N; i++) { + snprintf(fn, sizeof(fn), "lock%d", i); + fd[i] = open(fn, O_CREAT|O_EXCL|O_EXLOCK|O_CLOEXEC, 0644); + ATF_REQUIRE_MSG(fd[i] >= 0, "%s: %m", fn); + } + + /* Create the flags */ + for (int i = 0; i < N; i++) { + snprintf(fn, sizeof(fn), "flag%d", i); + ATF_REQUIRE_EQ(0, symlink(fn, fn)); + } + + /* Get the current and expected signal mask */ + sigprocmask(0, NULL, &normset); + + /* Spawn threads which block on these files */ + for (int i = 0; i < N; i++) { + arg = (void *)(intptr_t)i; + ATF_REQUIRE_INTEQ(0, + pthread_create(&thr[i], NULL, system_thread, arg)); + } + + /* Wait until the flags are gone */ + for (int i = 0; i < N; i++) { + snprintf(fn, sizeof(fn), "flag%d", i); + while (readlink(fn, fn, sizeof(fn)) > 0) + usleep(10000); + ATF_REQUIRE_EQ(ENOENT, errno); + } + + /* Release the locks */ + for (int i = 0; i < N; i++) { + /* Check the signal dispositions */ + ATF_CHECK_EQ(SIG_IGN, signal(SIGINT, SIG_IGN)); + ATF_CHECK_EQ(SIG_IGN, signal(SIGQUIT, SIG_IGN)); +#ifndef PROCMASK_IS_THREADMASK + sigprocmask(0, NULL, &sigset); + ATF_CHECK(sigismember(&sigset, SIGCHLD)); +#endif + + /* Close the file, releasing the lock */ + ATF_REQUIRE_INTEQ(0, close(fd[i])); + + /* Join the thread and check the return value */ + ATF_CHECK_INTEQ(0, pthread_join(thr[i], &ret)); + ATF_CHECK_INTEQ(W_EXITCODE(0, 0), (int)(intptr_t)ret); + } + + /* Check the signal dispositions */ + ATF_CHECK_EQ(SIG_DFL, signal(SIGINT, SIG_DFL)); + ATF_CHECK_EQ(SIG_DFL, signal(SIGQUIT, SIG_DFL)); + sigprocmask(0, NULL, &sigset); + ATF_CHECK_EQ(0, memcmp(&sigset, &normset, sizeof(sigset_t))); +#undef N +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, system_true); + ATF_TP_ADD_TC(tp, system_false); + ATF_TP_ADD_TC(tp, system_touch); + ATF_TP_ADD_TC(tp, system_null); + ATF_TP_ADD_TC(tp, system_concurrent); + return (atf_no_error()); +} From nobody Wed Feb 25 21:12:55 2026 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 4fLnP33scVz6TnPG for ; Wed, 25 Feb 2026 21:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLnP32dKxz47Jr for ; Wed, 25 Feb 2026 21:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772053975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kMLGAHGcQoy1qBXWTWtYSkvp7WNkAOnLk922St4zBcw=; b=tuHlsgcgJRIWJy9gktDJbKjkRy0wBpv2Ap2SiRgaa4zwa0Xk00iltvZ7Su/qUhYZU2NgOW 3Rcsuw9wsBd5cbEt8dZxQHwWXup1ZP7Kv4oybM0siWK/r1tnYOb0ZcfWvXzp28Pmrr6CM5 PZHejOXiK1TRe67KBW3+rPUEkGsLn1wBCx0GG7bTAULg2XlQE3E0oct4LhYzolFIYnopTl YC5eV74IUvkogfFlVYQYXyV1HTFmRDjnoVSaAXHp4OLQismMDl3BWRoaz1AfFjWTeKZEGk EIcZR1VMkJDNAo/IIKVDgkg06n7WzO5Ylw1zzwm0OYNymlgM+Hby6bl8A9kXFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772053975; a=rsa-sha256; cv=none; b=mQpqmryNmKhkAFFiqqDu6KfiK3xBNK3A2pcyR0c+GfMbm59t5zlVd+CvkPoN+fuKgN+1fh tmqMiZ4vEm35TbwOom3e0mJFIRNtSeRNf49Y0sACfJ7M09hsJx9tThNSYdQmN8K7CVZyOW viFdD6VxvNsn+aP99NBeP13qpAw9HuHML2yocY5N4eIRXMc519GRzaiJvR6NgFrHxXjJdd /bkXnyIsQYYrXejO3lR8Msg7XoscVL5vwyIBcoN4RsylOgsbcFXhoDijC5CgUtyhPOGdjX EYDLj7knvNDx4g0l2/ihZClVa42Tt2tUgHepRXEuiCvv3fC7J1cp9lZ/moJQXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772053975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kMLGAHGcQoy1qBXWTWtYSkvp7WNkAOnLk922St4zBcw=; b=j0ab05eDKPNAh97RNLPT7rSAl+iDyii3f4jFtcBT3XbWRD3OIGuOQ1la6hxso+Er1F8z2m 7huoSRmR/Xxhb0pDg+XpQdge0htDbT5dL/1vMiH3t1A6darqMW+VkchJWG4ofmgwGSMkTG u7jpffV6UgoTXGUiwZYGaiR33b/U4d3aUhzvf7vffez5hJ8SM0vrzkjcGWhQdtcTR1hRpa VEoS9rKMOKEGxPTsCQSvCtfhwxhc+fr5a/0fHT/Kjr19ctgYUEHonVzSrsOx0hNdwSCC3b ZxzJPLe5aWo0NC2tU+v6i03pWN2Y1o6Pl3GoZ6lzybdAv3jSUk1JjcHLX3Ikaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLnP329ZPz1HPf for ; Wed, 25 Feb 2026 21:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27fd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 21:12:55 +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: 7305604b29d3 - main - system(3): Clarify return values 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: 7305604b29d3db29c9bb5de6e7a25829fb541d1e Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 21:12:55 +0000 Message-Id: <699f65d7.27fd7.233b8521@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7305604b29d3db29c9bb5de6e7a25829fb541d1e commit 7305604b29d3db29c9bb5de6e7a25829fb541d1e Author: Dag-Erling Smørgrav AuthorDate: 2026-02-25 21:12:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-25 21:12:36 +0000 system(3): Clarify return values Our manual page currently states that system() will return 127 if it fails to execute the shell. The actual return value is, to quote POSIX, “as if the command language interpreter had terminated using exit(127) or _exit(127)”. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: bnovkov, kevans Differential Revision: https://reviews.freebsd.org/D55483 --- lib/libc/stdlib/system.3 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdlib/system.3 b/lib/libc/stdlib/system.3 index 119432342f70..f09577099a5c 100644 --- a/lib/libc/stdlib/system.3 +++ b/lib/libc/stdlib/system.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 11, 2024 +.Dd February 24, 2026 .Dt SYSTEM 3 .Os .Sh NAME @@ -77,8 +77,10 @@ or \-1 if an error occurred when invoking .Xr fork 2 or .Xr waitpid 2 . -A return value of 127 means the execution of the shell -failed. +If the child process fails to execute the shell, it will terminate +with an exit code of 127 and +.Nm +will return the corresponding exit status. .Sh SEE ALSO .Xr sh 1 , .Xr execve 2 , From nobody Wed Feb 25 21:12:56 2026 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 4fLnP4669Mz6TnX2 for ; Wed, 25 Feb 2026 21:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLnP43hLBz47K5 for ; Wed, 25 Feb 2026 21:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772053976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C/pGglxByI/B98SyYAlYgs9odB4GIpOHR+NGT1Oqejs=; b=vATClW1dfUyHfs4lTlyMoMicsftwylM9mOUhIwO5z9KpJcHpDSe0Qxyy4IhFi4m4UTr+F4 81TopoMOYRlK3pfMsqqr7WglpzFWyPjiKDB7zCjbTL7uvKaByEYNlRy7N8tiqNK6NfWMVs SBIurF84ZE8CkJuKbf2k4XYqj/ioNmwT6t6Xojx6Z6uu7AqzOQPycu41K8IrMG9TwxFnXm apFJS/4HL8OmcemJxfT+AIqaHJMLLrr+PuXTZ7ov/yyiWHo1D3TOkqeFKn+mn6u+70Kcx3 LyvHmoTMGLyqqK7h3boN/sATS8PrELF7+/YuLSM1vrHbCB+jTBfuheoKvlrQOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772053976; a=rsa-sha256; cv=none; b=hwFQBZEcX+fAYlW5/bsz0oREVOWXJ4MSMmdK0I6k6kihapIBqHKXtDUBiLobpYRvd3h5e8 xB2uYkc3upryrs+hy1xVvhLOpZfACRK9PxRBxoLJKh/A/7Mgfe1BLSBlybYfTkvwnXz9ob cgX0dvgAO4MeBZQXaMDxslPm5i94hU6SzycR9cG6oAqvDaeMt4RKUAROwV2fSIoque/GC2 UPfOszHu66biYXSlW+11HNaG81fK+XTPsNodMK02YbTbwLbS2o18cGOEcRIhKrCs2MV1Qc Kd8r4RnzYjh/1aZzVSR07UOurXozeIWYdwpJgLYOC39lX49P/7NTkW9G5MPeug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772053976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C/pGglxByI/B98SyYAlYgs9odB4GIpOHR+NGT1Oqejs=; b=PtEcReBrbV20jUPy5IokiIzV4UXm1wwlwm10w5/jiaDCnnUwGpwflKvGxIOSlSHdDdyE3P u3f8zyy/o+Oxcway28SgFT4aUpUjWwYVKarvjZX46V/U7VjCjEaQZjLSLw7Vpsf3sum4+Y 7+Sl70fzk0I7FlqaefRwV9OmQqCnaiSbxtjDRVN2lEMlNSMZV0PyDWyjx2vfjVsON1PIkA 6SToOpIf1EL5/jtio62w9yNX++Dzls8tCXajBYhCgHexJsLEBTw99p6I8QYC4CX9LHNchC 4K0TIaTMPO0fvymTw/hL27CHDSd+RTA90NE+Ji5bxR5ZcT4PieO/N17fTg7umQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLnP430NDz1GZD for ; Wed, 25 Feb 2026 21:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30799 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 21:12:56 +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: 8ae3f4499194 - main - system(3): Fix null 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ae3f44991948cc97b09adc248a9a46db71bf9e0 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 21:12:56 +0000 Message-Id: <699f65d8.30799.72e465a3@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8ae3f44991948cc97b09adc248a9a46db71bf9e0 commit 8ae3f44991948cc97b09adc248a9a46db71bf9e0 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-25 21:12:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-25 21:12:42 +0000 system(3): Fix null case Our manual page states that if given a null pointer, system() returns non-zero if the shell is available and zero if it is not. This is consistent with the C standard's description of system(), but it is not what we actually do. What we actually do is always return non-zero, as required by POSIX. As the POSIX rationale explains, implementing the logic required by the C standard does not violate POSIX, since a conforming system always has a shell, therefore the logic will always return non-zero. Since our libc is commonly used in non-conforming situations such as chroots or thin jails, we should implement the full logic required by the C standard. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: obiwac, bnovkov, kevans Differential Revision: https://reviews.freebsd.org/D55484 --- lib/libc/stdlib/system.c | 2 +- lib/libc/tests/stdlib/system_test.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c index 17dd63eb52f9..94f7460c9b68 100644 --- a/lib/libc/stdlib/system.c +++ b/lib/libc/stdlib/system.c @@ -64,7 +64,7 @@ __libc_system(const char *command) pid_t pid; if (command == NULL) /* just checking... */ - return (1); + return (eaccess(_PATH_BSHELL, X_OK) == 0); /* * If we are the first concurrent instance, ignore SIGINT and diff --git a/lib/libc/tests/stdlib/system_test.c b/lib/libc/tests/stdlib/system_test.c index 713e4bb0f87a..b6a31583d52d 100644 --- a/lib/libc/tests/stdlib/system_test.c +++ b/lib/libc/tests/stdlib/system_test.c @@ -57,10 +57,20 @@ ATF_TC(system_null); ATF_TC_HEAD(system_null, tc) { atf_tc_set_md_var(tc, "descr", "system(NULL)"); + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(system_null, tc) { + /* First, test in a normal environment */ ATF_REQUIRE_EQ(1, system(NULL)); + + /* Now enter an empty chroot */ + ATF_REQUIRE_EQ(0, chroot(".")); + ATF_REQUIRE_EQ(0, chdir("/")); + + /* Test again with no shell available */ + ATF_REQUIRE_EQ(0, system(NULL)); + ATF_REQUIRE_EQ(W_EXITCODE(127, 0), system("true")); } /* From nobody Wed Feb 25 23:10:35 2026 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 4fLr0q368Jz6SXcj for ; Wed, 25 Feb 2026 23:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLr0q2Z9vz3VYw for ; Wed, 25 Feb 2026 23:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772061035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IKnY9vJEbJ3DKVGeSykMPMWSqiH4k8INfVuds1ADneg=; b=wXAeeM8s7Vx4HsaDw8v9gYlLopVjd5yZCphzVOHLhTv2K4lM/Lj3v7uM9gI3AmR+kgKvm+ Jnlp4toCmRw6A+wwZ8l4DsI3bTM6QTc17mGnaZBS4kxh2SHESjhM1KxzqxeVzgsa/rfwkt 0UyB4Fr9y+lpxWbYxlS3Deq2Vnv74F8VsNr5mH29jtmk+lNsUNMsCqWW74LMhkCw5pKGSl 7te0J7MPzdUCZCqh9l2rKBlF5vZHhBcgBMPb6TkX+/Oba/cCTia3EmHi7M26o4HOBhs80b djVx+MjD0Q6zuUfPJBrkdo10cPQWPEyYwNYgNMTZwZeKX2xM0C/5SJMyTK0B2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772061035; a=rsa-sha256; cv=none; b=LzhPR6Zlg+cNsnCOe5UDOk9QBdqkgq6GkWv0Q6+uos4zr7HolXJH8btM+RyKVm4t7xzNYy oKIZyrSPgn2HolJr4KmhDN02PE2yNCBfaZEUhJUiF3sltzFav3hw0T/jgfPlqL6yyYG1mB ZMqudoqvLzTBxRWWzbumj8ZUsw0+s+9/xR1OflgUNifkggr4GMCONdW4/C68yIuG93MuNc oHdVh+6qtr1IHtmDVAFL0K2b08pmyJKtqMwf+54xkqkqTxovT2uSArj8CusoXK4N59z5Aw Kl2vEq3cxQcCgmdmRTirTq6o7kjQ/JPU4pRSGFIZybUt1yiPxwR5SzkBlF4+cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772061035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IKnY9vJEbJ3DKVGeSykMPMWSqiH4k8INfVuds1ADneg=; b=Q2wPVlsRKGinf9J2eDy0yRvCGoqQ6NeOP4FWgAV6UNIbn9IDUlWf0FB8g4uDOjlv2uVBAm 6Ww3Q8LAxhh0ubptvsNpyWZz5hwPexxWntyZdREIul7OlTgOeM37hAIl4nIluDKZUpKHrr CBrAI10+6oUNDoNHlX3f592Pm/56Ij5YpclR9fxbrEdnm5nuyt0u70z6vFixxlL5zsyu26 7AqgVCdQnXBB3MGLcOP8RYvSCxe2TsqTCl4LesePrP2T1owHvw1eLD9jY0DeR2RvT3WBxt sAOygtohmQ2z6rrdxstWK9I48j25YENXyyspYHokTGGUIEvpPfoNJauXMj1yPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLr0q28hWz1LV5 for ; Wed, 25 Feb 2026 23:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b3d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 23:10:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: David Bright Subject: git: 42ab99095b7d - main - procstat: CID 1593951: Resource leak 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: dab X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42ab99095b7dc2243629574e1c627cf5e6a9070c Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 23:10:35 +0000 Message-Id: <699f816b.3b3d9.505fb456@gitrepo.freebsd.org> The branch main has been updated by dab: URL: https://cgit.FreeBSD.org/src/commit/?id=42ab99095b7dc2243629574e1c627cf5e6a9070c commit 42ab99095b7dc2243629574e1c627cf5e6a9070c Author: David Bright AuthorDate: 2026-02-21 22:47:00 +0000 Commit: David Bright CommitDate: 2026-02-22 21:29:25 +0000 procstat: CID 1593951: Resource leak Summary: A trivial resource leak fix; free the allocated memory before return. Test Plan: Code inspection, run command. I built a simple program that waits for a signal on a kqueue, then ran that. The standard procstat displays: ``` fbsd-dev% Waiting for SIGTERM... procstat -a kqueue PID KQFD FILTER IDENT FLAGS FFLAGS DATA UDATA STATUS 84352 3 SIGNAL 15 C - 0 0x0 - ``` The revised procstat displays: ``` fbsd-dev% sudo LD_LIBRARY_PATH=/usr/obj/usr/home/dab/git/freebsd/src/arm64.aarch64/lib/libutil /usr/obj/usr/home/dab/git/freebsd/src/arm64.aarch64/usr.bin/procstat/procstat -a kqueue PID KQFD FILTER IDENT FLAGS FFLAGS DATA UDATA STATUS 84352 3 SIGNAL 15 C - 0 0x0 - fbsd-dev% ``` As expected, the two displays are identical. This doesn't prove that the leak is gone, but it does prove that the revised command still operates correctly. I think it can clearly be seen from inspection of the change that the leak has been remedied. Reviewed-bys: vangyzen Differential Revision: https://reviews.freebsd.org/D55422 --- usr.bin/procstat/procstat_kqueue.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.bin/procstat/procstat_kqueue.c b/usr.bin/procstat/procstat_kqueue.c index ce9d2cb42fe2..b4d396e12d3a 100644 --- a/usr.bin/procstat/procstat_kqueue.c +++ b/usr.bin/procstat/procstat_kqueue.c @@ -135,8 +135,10 @@ procstat_kqueue_flags(const struct pk_elem *names, unsigned flags, bool commas) } } - if (strlen(res) == 0) - return (strdup("-")); + if (strlen(res) == 0) { + free(res); + res = strdup("-"); + } return (res); } From nobody Wed Feb 25 23:35:02 2026 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 4fLrY24F61z6SbcG for ; Wed, 25 Feb 2026 23:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLrY23mb6z3Z0t for ; Wed, 25 Feb 2026 23:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772062502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ds26vwPIODzTJX99+DrZnvoLDZVCWZ8Y5WOBKE0ng4=; b=BC8ucGMKmmKvSDulFhyCLJzJQRpQBXNSM1PKa25v+EUmHk5CmOwLBrXkj/Lor9MBkVXkSP VGJak8ruY/uZKEhLPJJNT2ELdL52LKWVTaI3qeUDXiId8LVikmiax9e3sZkYZB7ZIvem0R oB2/5TCuecQh8ynfTsNeJmWqvL59rTbtDmYTzrFTxtRDKlGwUa06bQ08gG7JQ1papdYphl cJ796i+K9eBb16fY3zuyDKDzfNpPXx9WBdBCKnfeI89j/wlwCk+yaDr028I+IaS+kFbcUO 8c60dEz9QFgA2vAxyvEzh9KAHPWXfWf6fNrQhGzzXluRYIKnY4J3zv2c4ESKDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772062502; a=rsa-sha256; cv=none; b=xSLcmcOWI0d84sZcsnI8HxHa6osIh29fXrlYzpRQovPeHUQ5hfw1yD7NR8uPB7esBs8imk HtoWHuZnBRw0uc/6Yvm5jdKnKgBsMOhJIKjJY1A6H5DKfWjo6Uv5BlLAUo+5gqZXHKUJwe U/nEW7Mnc6a4zEpe7x6pThepxL3rEVqIO13VrzRFce7S4stXDI1nbX48ZaEj6P6PKLy11G h3Uey8M7DBwMBlMRQXJODLuGkSOYrBtsGi/bRnYalcy+SFUVFAj4CSJ4O6YmK7htL7J8tD do9NysaGZPpNOqvyRjpBngYOEjq7GVJdUXTRXuUOjpiTWYAljltVuh/dRPZNaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772062502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ds26vwPIODzTJX99+DrZnvoLDZVCWZ8Y5WOBKE0ng4=; b=Yl19729xUAWtsR5HUsMvRqPZsJXKMw/w3t4cTP0cqpMnUnlE39FhIrbOViADLiMYWFkiWd T8Hk2UcT8293fVtCn5FjgyadK+MpVTl24ylkPzQnqLPM5rLmcwCm0fGNhyznCgXYwSkzQo +520HKBetIHIKKH3w0Jv6uRMkRYRtPtyBdNw+zbYEkRA8WA+HA0ahjGgURrYJJicxco44U Ubn3HZ4msB5V7IsrQHKpwj4ZXqZrqNYO+Ucne2FLaXnU9qBt8zuKAdxif2nr6DmySzjpCT +sZvQCPZrFVB2fGhbOyCTtmxuHuxHyAamyYynLJF2OlXpv369vtSNgJrRTPjRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLrY22jP4z1M2G for ; Wed, 25 Feb 2026 23:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f0ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 23:35:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 2a6c2d9c38dc - main - libnetbsd: add math.h and sys/time.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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a6c2d9c38dc421025b6c18cac68fe9965c574c0 Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 23:35:02 +0000 Message-Id: <699f8726.3f0ac.2ddade18@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=2a6c2d9c38dc421025b6c18cac68fe9965c574c0 commit 2a6c2d9c38dc421025b6c18cac68fe9965c574c0 Author: Enji Cooper AuthorDate: 2026-02-25 23:19:56 +0000 Commit: Enji Cooper CommitDate: 2026-02-25 23:34:32 +0000 libnetbsd: add math.h and sys/time.h - `math.h`: `isinff(..)` - `sys/time.h`: `timespec*(x)` These two headers are used by tests in newer snapshots of `contrib/netbsd-tests`. MFC after: 1 week --- lib/libnetbsd/math.h | 14 ++++++++++++++ lib/libnetbsd/sys/time.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/lib/libnetbsd/math.h b/lib/libnetbsd/math.h new file mode 100644 index 000000000000..bffc94f82d67 --- /dev/null +++ b/lib/libnetbsd/math.h @@ -0,0 +1,14 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Enji Cooper + */ + +#ifndef __LIBNETBSD_MATH_H__ +#define __LIBNETBSD_MATH_H__ + +#include_next + +#define isinff(x) __isinff(x) + +#endif diff --git a/lib/libnetbsd/sys/time.h b/lib/libnetbsd/sys/time.h new file mode 100644 index 000000000000..9ddde16e84e3 --- /dev/null +++ b/lib/libnetbsd/sys/time.h @@ -0,0 +1,35 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Enji Cooper + */ + +#ifndef _LIBNETBSD_SYS_TIME_H_ +#define _LIBNETBSD_SYS_TIME_H_ + +#include_next + +#define timercmp(tvp, uvp, cmp) \ + (((tvp)->tv_sec == (uvp)->tv_sec) ? \ + ((tvp)->tv_usec cmp (uvp)->tv_usec) : \ + ((tvp)->tv_sec cmp (uvp)->tv_sec)) +#define timespecadd(tsp, usp, vsp) \ + do { \ + (vsp)->tv_sec = (tsp)->tv_sec + (usp)->tv_sec; \ + (vsp)->tv_nsec = (tsp)->tv_nsec + (usp)->tv_nsec; \ + if ((vsp)->tv_nsec >= 1000000000L) { \ + (vsp)->tv_sec++; \ + (vsp)->tv_nsec -= 1000000000L; \ + } \ + } while (0) +#define timespecsub(tsp, usp, vsp) \ + do { \ + (vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec; \ + (vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec; \ + if ((vsp)->tv_nsec < 0) { \ + (vsp)->tv_sec--; \ + (vsp)->tv_nsec += 1000000000L; \ + } \ + } while (0) + +#endif From nobody Thu Feb 26 02:54:04 2026 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 4fLwyh1kkqz6T3Q7 for ; Thu, 26 Feb 2026 02:54: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLwyh0xdmz41RD for ; Thu, 26 Feb 2026 02:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772074444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qy+/tmfi5hHdF8LsRz2V1CVJVyfhX602pfvl3moToPs=; b=x6uzAe2pDmvD8kRkaMVcxLTCCO3AACJOPTNHgWjVyZiKxbHqiK0mhkiiUQVwQqvsIrm3ZZ k7Nvjq5vxJ/b20SyfFIt0on59QP1Bmz08y6LaRv4bLlCNr+gFvsq3JcUjUNrDpo/Nrbg5o x7byusg8CH14N3gyUfWHiJe5O1fbkiK0H9A1eEJjhPvbSAde7iyO9uCtwaKx4AxApve7Ry vUcs0awQRMR0RW9c1Dh4GBdf+hXgw9vt9itoTiLPYU3odaJUOciDhtNaniavMruelIjFW1 iolOXXMt/OMvqSAjXzP5RkY++CBJAop1CUgkxRBssNtunFhrAz/TCsAcH+2OUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772074444; a=rsa-sha256; cv=none; b=CG62Mt7m2C8AQ6J2hg2dgXzX/PdFK9cjW+PeboLaurjb4PqESmrrFvf5yWTePQ+QV90tcQ OTAhCc0rzM8g7aQbVm+vO+9Ukf4BOxUthIhtRWfvht3VVlqCUuCKX3M540B65SfxLn8aM5 lQsuzF/nw3q+kzRhR2MTVyBQzgh3yVxTouN8xEN/+6TfTSfOxI/8Drtuf3cEaDEXSYVd5C w8h/eWRFlNaYkWtq7RaYKSFE3um9IOTtpuaXkWN1EPqiHJUOMKZMqu0SvAJjYP9ZCl9exE NtAAcaxIlwTdPpbaChK7J/3BaBuJicwcn9RcWF1MP9hUlIHGt9jD+5MO/40nwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772074444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qy+/tmfi5hHdF8LsRz2V1CVJVyfhX602pfvl3moToPs=; b=XEoRHJrk4YQTPXvGFjEtuPZomITf5oczCH/BSE8Kz4VmawS67VcmTk/yLkzKU58riLiGUc fQ6vOH9DNZ2QpFxx2tMOmBX4SWkosjqlQlFamJdKb2aLg3NaZYg7Qsjg+YkRijNI+4htOH GUn2ahdHdjyYd0knnWQNMKEm/6TzNG9UN0UPbQlqM2IrFspkRJNmL2mHP9CpUpJIhVUKPD dDWwEwspFi/x1WIwpb7jOeGSSBwWd5vUMYbrjqJDUkl5WN8P6yl5qapLONAGwg2V5mgxLa g8rMsUy4hUHbKl/dCdkMiAguoO/JXqFyGEkGsBCR+dW/Wp5ND04pV9XEi1gbdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLwyh0J27z1Rk6 for ; Thu, 26 Feb 2026 02:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24dcc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 02:54:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Lo Subject: git: 25e89051df7a - main - rge.4: correct media types 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: kevlo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25e89051df7ace23ae4953c21402e568cfce78b4 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 02:54:04 +0000 Message-Id: <699fb5cc.24dcc.2f34737f@gitrepo.freebsd.org> The branch main has been updated by kevlo: URL: https://cgit.FreeBSD.org/src/commit/?id=25e89051df7ace23ae4953c21402e568cfce78b4 commit 25e89051df7ace23ae4953c21402e568cfce78b4 Author: Kevin Lo AuthorDate: 2026-02-26 02:52:14 +0000 Commit: Kevin Lo CommitDate: 2026-02-26 02:52:14 +0000 rge.4: correct media types in the manual page Correct media types for 1000Mbit/s, 2500Mbit/s, 5000Mbit/s and 10Gbit/s. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55496 --- share/man/man4/rge.4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/share/man/man4/rge.4 b/share/man/man4/rge.4 index 5b624cb6bf95..1ef8c1b34fc1 100644 --- a/share/man/man4/rge.4 +++ b/share/man/man4/rge.4 @@ -84,23 +84,23 @@ option can also be used to select either or .Cm half-duplex modes. -.It Cm 1000baseTX -Set 1000baseTX operation over twisted pair. +.It Cm 1000baseT +Set 1000baseT operation over twisted pair. The RealTek gigE chips support 1000Mbps in .Cm full-duplex mode only. -.It Cm 2500baseTX -Set 2500baseTX operation over twisted pair. +.It Cm 2500Base-T +Set 2500Base-T operation over twisted pair. The RealTek devices support 2.5Gbit in .Cm full-duplex mode only. -.It Cm 5000baseTX -Set 5000baseTX operation over twisted pair. +.It Cm 5000Base-T +Set 5000Base-T operation over twisted pair. The RealTek devices support 5Gbit in .Cm full-duplex mode only. -.It Cm 10000baseTX -Set 10000baseTX operation over twisted pair. +.It Cm 10Gbase-T +Set 10Gbase-T operation over twisted pair. The RealTek devices support 10Gbit in .Cm full-duplex mode only. From nobody Thu Feb 26 03:56:19 2026 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 4fLyLW4Sl0z6TBJs for ; Thu, 26 Feb 2026 03:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLyLW3d2Kz3CSp for ; Thu, 26 Feb 2026 03:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772078179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fjH2bguszh4QHuj4ZqdTHuauBQimoQPN5BdKhRT0HwI=; b=YNwQ5xmbWX/ghY7EvgKotUcepw1aBhfBbYMDYiUiZjnElZeLEtfnQIZB1GKIg5OIzwU2B7 ON/ZgyPSbbntXLXYLoIcafO1jSffvXYOOjO/uKanY7PCK5EavecGFUBgvkvDf1pNyvZRiL 48szHo+n+5RI8NCBOLbJXCjonDF8FIkltGq8/+Rg916ERvRkYWjcImg9wyg3hruBmrQnCD njz9VRKKqTMeM95s9fMVsToUt3rigjYFqUb0M56s9BpL3+1/BVmP88Ui7o07rwPEsY0vWY HeJ+k4tmoWXSzMtXxbps7tH1noakEfKIjyFAWoD6r8zadKECeUam3Bgt4c4J7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772078179; a=rsa-sha256; cv=none; b=LM7ZRlomKT4Tf89M5sKwbPBLnpSPa56IcVSf95qizCwKafc4+nZ7Sw4JZirqBlQgnYYYwc dJylfYV9O4FTCzuZVlLsCaVsZHy76ffVcWsNZJGKTc1xKAp7RP7otH4aGzhYdHOot8TPvo nBaiuSUP6snuB0MdVdPOYdLLJayeZdPXmydgnz4IQlWU49n11pcuNzhNRX3jE3ST25bum8 yw/fKTJ0H6Xvbvv4PtwHWkfk/9KVucXGTOev/jcKUbw+r0gLb/QtAxopEhCE8TUiGa5NG8 eBgEPhSQ0zN0LzWCtXfmG8L1UNvnKR5beYDPQEArJEy8rXApqxUg7wZG7jkTnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772078179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fjH2bguszh4QHuj4ZqdTHuauBQimoQPN5BdKhRT0HwI=; b=F4Mu6q+B4BuYv8LLpiiDl8BtVj9+p+uWbC0xA3T9F+D7Uh1zJtdsMUU5y1Agrai/6VKVZx ZPBJHJlBl71ZTJv34fmuQL4hiBLle7gnc9zAtnVJFryKM9KR52vhifYyHtxFiBis4p6z+/ vA7rE8Zj37c117ioMHaFj/oMyOx7aM2B0C5zzPSsz2U1xwQB+Zr3N+AdEniaaPXS88nsJQ AGJim54GsHRw9rebnr0BhggHCkKbzjF3MnGWLCjgYrpxGx41EHl/58Wspi20U9wj3Q14Ki tTJoAp6FH3uPBUWXvy9SGzTA4mYvPL57PDvV4d80e2MDHcvRXbQI8nWaggnn8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLyLW38K7zp7 for ; Thu, 26 Feb 2026 03:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3237a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 03:56:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: a54a36c40f07 - main - ath: migrate to new net80211 encryption key 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a54a36c40f07092ace706ccec8c3db6f6a1877c1 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 03:56:19 +0000 Message-Id: <699fc463.3237a.681a6e95@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=a54a36c40f07092ace706ccec8c3db6f6a1877c1 commit a54a36c40f07092ace706ccec8c3db6f6a1877c1 Author: Adrian Chadd AuthorDate: 2026-02-26 03:49:27 +0000 Commit: Adrian Chadd CommitDate: 2026-02-26 03:49:27 +0000 ath: migrate to new net80211 encryption key API Migrate to the new encryption key API rather than poking at the key struct directly. Differential Revision: https://reviews.freebsd.org/D54479 --- sys/dev/ath/if_ath_keycache.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/sys/dev/ath/if_ath_keycache.c b/sys/dev/ath/if_ath_keycache.c index a58625ad2803..2b40a8940674 100644 --- a/sys/dev/ath/if_ath_keycache.c +++ b/sys/dev/ath/if_ath_keycache.c @@ -134,12 +134,16 @@ ath_keyset_tkip(struct ath_softc *sc, const struct ieee80211_key *k, * TX key goes at first index, RX key at the rx index. * The hal handles the MIC keys at index+64. */ - memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_mic)); + memcpy(hk->kv_mic, + ieee80211_crypto_get_key_txmic_data(k), + sizeof(hk->kv_mic)); KEYPRINTF(sc, k->wk_keyix, hk, zerobssid); if (!ath_hal_keyset(ah, k->wk_keyix, hk, zerobssid)) return 0; - memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); + memcpy(hk->kv_mic, + ieee80211_crypto_get_key_rxmic_data(k), + sizeof(hk->kv_mic)); KEYPRINTF(sc, k->wk_keyix+32, hk, mac); /* XXX delete tx key on failure? */ return ath_hal_keyset(ah, k->wk_keyix+32, hk, mac); @@ -149,8 +153,12 @@ ath_keyset_tkip(struct ath_softc *sc, const struct ieee80211_key *k, * slot, just set key at the first index; the hal * will handle the rest. */ - memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); - memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic)); + memcpy(hk->kv_mic, + ieee80211_crypto_get_key_rxmic_data(k), + sizeof(hk->kv_mic)); + memcpy(hk->kv_txmic, + ieee80211_crypto_get_key_txmic_data(k), + sizeof(hk->kv_txmic)); KEYPRINTF(sc, k->wk_keyix, hk, mac); return ath_hal_keyset(ah, k->wk_keyix, hk, mac); } @@ -160,13 +168,19 @@ ath_keyset_tkip(struct ath_softc *sc, const struct ieee80211_key *k, * NB: must pass MIC key in expected location when * the keycache only holds one MIC key per entry. */ - memcpy(hk->kv_mic, k->wk_txmic, sizeof(hk->kv_txmic)); + memcpy(hk->kv_mic, + ieee80211_crypto_get_key_txmic_data(k), + sizeof(hk->kv_txmic)); } else - memcpy(hk->kv_txmic, k->wk_txmic, sizeof(hk->kv_txmic)); + memcpy(hk->kv_txmic, + ieee80211_crypto_get_key_txmic_data(k), + sizeof(hk->kv_txmic)); KEYPRINTF(sc, k->wk_keyix, hk, mac); return ath_hal_keyset(ah, k->wk_keyix, hk, mac); } else if (k->wk_flags & IEEE80211_KEY_RECV) { - memcpy(hk->kv_mic, k->wk_rxmic, sizeof(hk->kv_mic)); + memcpy(hk->kv_mic, + ieee80211_crypto_get_key_rxmic_data(k), + sizeof(hk->kv_mic)); KEYPRINTF(sc, k->wk_keyix, hk, mac); return ath_hal_keyset(ah, k->wk_keyix, hk, mac); } @@ -210,8 +224,10 @@ ath_keyset(struct ath_softc *sc, struct ieee80211vap *vap, KASSERT(cip->ic_cipher < nitems(ciphermap), ("invalid cipher type %u", cip->ic_cipher)); hk.kv_type = ciphermap[cip->ic_cipher]; - hk.kv_len = k->wk_keylen; - memcpy(hk.kv_val, k->wk_key, k->wk_keylen); + hk.kv_len = ieee80211_crypto_get_key_len(k); + memcpy(hk.kv_val, + ieee80211_crypto_get_key_data(k), + ieee80211_crypto_get_key_len(k)); } else hk.kv_type = HAL_CIPHER_CLR; From nobody Thu Feb 26 03:56:20 2026 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 4fLyLX5nFhz6TBJt for ; Thu, 26 Feb 2026 03:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLyLX4bb6z3Clh for ; Thu, 26 Feb 2026 03:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772078180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0doAuEpIX1KOhS+t/tlxvUz/5daFQfGtTb6Qhx/t7hU=; b=ozU5haHDhllIjZlw/QxY00RCrk/u0wg3hZEMD9aMmnL72q5xiXqJWPOaTnCj23bUWUccYF IjImU37aTMxL4rrIa+Zo73X6QtW9r1q+GzOOUsei9HIs8Bnnb40tJkr8IZvTc4G52f7kZb xGK3M02h1JuwQJepP8oiwU+Hcps6FFpOofijaYjZfN5ftuZEVkjpi8DxoeptjwJAkGyQtt H3Medug0Doqgsb6keT6WVIqj9vVppLoKZwk7C0992uAFer9KjBlaegjQrOP6R80y9emHBS D1RYnAlCSDMpLkrDUAgravwN98g2yFcuIX0vdVOKRCDXPBuE3iy7cLMSnD87OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772078180; a=rsa-sha256; cv=none; b=X4Iy7Dlr4I/BJaYv93Dnz+DHZaI9u+uiqqt6W93Q5RHkb5Jg3vrytXkH0K7YpuJ6EjjoRU VuzHlMhHanItED/21sPFrPf5vRsLZZGAaVh+cW/abW9Hgp1WfdwNl4Cj/gBXKCBFGQCFCR U9hUhxKgEU6gapVyt1z9pfcl7XpNnUTunqIcOVveI2Vsy6P1xq6nNqtPv+z4rHiW7NV5iP Du0X8q6ix2LABNyAv79IDOVCeItgmpkqFd1Gi1ZshKmf+9D8irtkJlZm9aK/x8SMetmEVJ zAYq0vcNqI7XEXN4JS8sNpEXEq47r5cRcgbdaP50xtlPaAxg4+0fxi/V/6LT7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772078180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0doAuEpIX1KOhS+t/tlxvUz/5daFQfGtTb6Qhx/t7hU=; b=BmI/dVQamn8PwcOX6m9SNjYV1X7BCXwbZ7Zl85WvxQZo27Hh3uxWMK+4ruZqZUe5vtmwKh q+wnvjO/Paybs4ElwKa3E6aR2dJhfX47R8t5CU8aO6v6Unh+fUGWHvwwmF6+Toviq11fpL TDJDQ0Qm/BRgd9Zud2flbUmozRyRewQoCvxdaMeBc1bpVKjLvtdfd3aTJnwDa0ZkV5f701 1ZZH4cEfP3h8i0jDbMBXLfYiLRtYnpPw5YVqbNgE5wIj3JRIgVo/6logA+Ty03otOei2oe K3pUHA+aCCut34awKl31Tiz88jhzYhXVcK7gsMO2TXg8rkRN24OREDV7LrZPGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLyLX3xXwz1GR for ; Thu, 26 Feb 2026 03:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 328ce by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 03:56:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: fec9453dcea4 - main - ipw: migrate to new net80211 encryption key 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fec9453dcea41f2716baa350c7e0fe33cdeb4d4b Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 03:56:20 +0000 Message-Id: <699fc464.328ce.5fa66cc7@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=fec9453dcea41f2716baa350c7e0fe33cdeb4d4b commit fec9453dcea41f2716baa350c7e0fe33cdeb4d4b Author: Adrian Chadd AuthorDate: 2026-02-26 03:49:34 +0000 Commit: Adrian Chadd CommitDate: 2026-02-26 03:49:34 +0000 ipw: migrate to new net80211 encryption key API Migrate to the new encryption key API rather than poking at the key struct directly. Differential Revision: https://reviews.freebsd.org/D54480 --- sys/dev/ipw/if_ipw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c index 9db562669487..a1c4f7ad8041 100644 --- a/sys/dev/ipw/if_ipw.c +++ b/sys/dev/ipw/if_ipw.c @@ -2020,9 +2020,10 @@ ipw_setwepkeys(struct ipw_softc *sc) continue; wepkey.idx = i; - wepkey.len = wk->wk_keylen; + wepkey.len = ieee80211_crypto_get_key_len(wk); memset(wepkey.key, 0, sizeof wepkey.key); - memcpy(wepkey.key, wk->wk_key, wk->wk_keylen); + memcpy(wepkey.key, ieee80211_crypto_get_key_data(wk), + ieee80211_crypto_get_key_len(wk)); DPRINTF(("Setting wep key index %u len %u\n", wepkey.idx, wepkey.len)); error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY, &wepkey, From nobody Thu Feb 26 03:56:21 2026 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 4fLyLZ6XScz6TBD9 for ; Thu, 26 Feb 2026 03:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLyLZ1Ffpz3Clw for ; Thu, 26 Feb 2026 03:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772078182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsLcqRQBMiMMv0N4XL1DEixRdorR4OWEpf3e0p9YYSU=; b=DTB89oAuj4s5mMMB5+jndMQf1dIWYWa8+yHT79B6Kye6nOElgnYUO/jBI5FQ5HOaYPN2zR Vanw0w9A25LHQAwQsQ3CXTLsJH2Jlr1J2CoK8hgjx7jVt7AEcNe+mkVozxknmSrOeBy66h bvv3wqYTYJo7tpla2WQxwCNo8TZop6KpTWxmRPJof1fFnC24i1KuGF+PYq1AclBngKs5FR FKUS+jUcaP/f6q0M+9ZU4/lQQIOGf4KPoE4XLx35wT6ZsD/siGBAFJ+wTfbfQfPi0FjWKT 61ZOB8XNHytbiFtMz0jEIDDxj4pXENMRy2QQ0A51egcYl6qX5D4RgobGa0JyqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772078182; a=rsa-sha256; cv=none; b=u+XTK/yJgTDRU98IwVnqLrF+f2q0vMcbdselk9pmjX2bKNcVyGO4rleYjRp4YLyHg93Etx caMltGw9VkDanLk5zycXmUCqugwzuJBeq8ud+r6IsCTx63cfTit+bK6uuQh8FFxEbmKxGe 1sv7cMZXUpRWZQKEeJlIlX5oBgQdXxG6o+CWaF6x6bo1xPIa7zZf4dVIXANDCzJa4708Tm Jkl3o5O7gQ/Ppl0IWQH9j8A/tlkoapcJHY/XTF92hOJwe6s3qK4j+6HUGqQeid48poP0ft e0VxJT7866deo0ssSGZXm6LPjeQGhaKI2OdmrK9W/+ODPfoBb/UyDH9nKSJlOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772078182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsLcqRQBMiMMv0N4XL1DEixRdorR4OWEpf3e0p9YYSU=; b=qeH1/j9PuDTRDQw1MbSLxipNZrfpuuJ6q47c/odM3U8vkuxHzWeaa80RgLGtZEXm18kFgD EvTwFhuiKdfAfRMcDLYwqasZmEa7muFRguale3hlJb9rmrPUFInY0meY3CJhs9OluGUET3 Vi4lC+pppTIfydiEuSelFG6yN3xT29wf1jC1yfAijCNxJjxbfr5gXDWVOuBXa8YYVJkmfn 2qZ/3Swsp27uewlBiw26mzQZeHdOrX/U1C19WWFCekSeXlWeGx1oBTaHA6eckpUlnKrRYb 0tZooUb1LD3J6wlvA/rJzHkFyxrih+oXu51A/kDvyHkBKTxVedlhVgcSpNj8Ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLyLY4mgtz1Dh for ; Thu, 26 Feb 2026 03:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 328d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 03:56:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 76a20323fcfb - main - iwi: migrate to new net80211 encryption key 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76a20323fcfb9df34cd8529129cad0c4317115fb Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 03:56:21 +0000 Message-Id: <699fc465.328d2.30049797@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=76a20323fcfb9df34cd8529129cad0c4317115fb commit 76a20323fcfb9df34cd8529129cad0c4317115fb Author: Adrian Chadd AuthorDate: 2026-02-26 03:49:38 +0000 Commit: Adrian Chadd CommitDate: 2026-02-26 03:49:38 +0000 iwi: migrate to new net80211 encryption key API Migrate to the new encryption key API rather than poking at the key struct directly. Differential Revision: https://reviews.freebsd.org/D54481 --- sys/dev/iwi/if_iwi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c index 26b8037186a6..8146b513d4e6 100644 --- a/sys/dev/iwi/if_iwi.c +++ b/sys/dev/iwi/if_iwi.c @@ -2534,9 +2534,10 @@ iwi_setwepkeys(struct iwi_softc *sc, struct ieee80211vap *vap) wepkey.cmd = IWI_WEP_KEY_CMD_SETKEY; wepkey.idx = i; - wepkey.len = wk->wk_keylen; + wepkey.len = ieee80211_crypto_get_key_len(wk); memset(wepkey.key, 0, sizeof wepkey.key); - memcpy(wepkey.key, wk->wk_key, wk->wk_keylen); + memcpy(wepkey.key, ieee80211_crypto_get_key_data(wk), + ieee80211_crypto_get_key_len(wk)); DPRINTF(("Setting wep key index %u len %u\n", wepkey.idx, wepkey.len)); error = iwi_cmd(sc, IWI_CMD_SET_WEP_KEY, &wepkey, From nobody Thu Feb 26 03:56:22 2026 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 4fLyLb0HNbz6TB3X for ; Thu, 26 Feb 2026 03:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLyLZ603xz3CT8 for ; Thu, 26 Feb 2026 03:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772078182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tjkPu1qx06sHMgECZLK894VYqbG4ggiAyAT4bO0ZiRA=; b=uWtB+7pHph9GXgUhT8bKTG5VccbnS4Z2V+dpXAZWrXf3XtH+PRIChVfBXkRAuPTzj9fAou HkN2KWmVMPMcocWAWKGzo39G9A2yKW8XuzNgaDxOLyCiMzAkoodV5QNj7PCMeq7h08KH+R Lm6YyGQO6L8B6FWRA7yj3Jxfp4wYZawVjwaOpUeOv1lk7jcWQNimso2ApZhr7DFwCUxSpb ck7ixO/+rDvtOR76mo0oIXKmZZebxV+nyDwCQkdXphEfmPPcBizYiR3TA7r+SrikJvX2tO 0VU2z0shEBmZ1uWENOHgW4yDe14AlAWqipsTsGXSxQ0+ITdM5YRJM5YP0uj9Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772078182; a=rsa-sha256; cv=none; b=uwYNsONQq2UR2seuUF0gt5QLUB+8prhwrJfZD+C9G/GOaD0m1zI3tPHvy2PhHGK8VC5ZZv ec6lxaynOnN6lj0WBPRdTtViT5C6dYFuUAIqqf5zOGzZ7+tFoORwT/C+VxZAT6S7C4FvO1 CpSxRYDDmV2dXhO794g6fT/rSpVX97ome44S1CZJIIVdIQsoyxUEhQ8meKD8Zi9yLi+IK6 RfAZhMHVjZthSBVz73lt5Broc7KFZkFAaFIHn0TYHOEcmBo0Kkk1mdwnFrx9hqBrOCdPPs 0xTG+V8YUY5Im1m4mTz6qi57A92WFGo6+6wCLu12nl7ZqTZrTS8jVaSct1wWwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772078182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tjkPu1qx06sHMgECZLK894VYqbG4ggiAyAT4bO0ZiRA=; b=GrUGNE7jfPBJ8B5DWBe6iSdKaSjDTH+vypOyRsNL1H0kG+toy24rBEHDtzIc2gc3gUlUqP hFKuuH/J4k7qMdJlpmJpkxFs2tGxtDn9itFlZj8Lul5o1v+kVOI0o+DYlh5WHm85kwnNd1 msCEqmrFdrhmlEaejzkPL2Qy8rlSOmTo+khvnl5i3/+T+FsXy2Blyx8kVzWyl1FGkJUrsm DQD1ft9Slv/xb8WJ6ddHLWjXoBlRrOQgXxLR8XiF4Brj+EVQLewDabAXgZg7WrnpCM7lx5 wNhzfNN6wJm6kd9sRpuLvOaNUwWlTk5c4YJ1Jh2dWjDxdYegDivuqbTv3cOW8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLyLZ5DzCz1GS for ; Thu, 26 Feb 2026 03:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31cee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 03:56:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 70786de406b6 - main - wpi: migrate to new net80211 encryption key 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70786de406b62bed55566ec95c932e150c25c3b3 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 03:56:22 +0000 Message-Id: <699fc466.31cee.5fde8a7e@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=70786de406b62bed55566ec95c932e150c25c3b3 commit 70786de406b62bed55566ec95c932e150c25c3b3 Author: Adrian Chadd AuthorDate: 2026-02-26 03:49:43 +0000 Commit: Adrian Chadd CommitDate: 2026-02-26 03:49:43 +0000 wpi: migrate to new net80211 encryption key API Migrate to the new encryption key API rather than poking at the key struct directly. Differential Revision: https://reviews.freebsd.org/D54482 --- sys/dev/wpi/if_wpi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c index 471700ca9f5c..f6039c5bb790 100644 --- a/sys/dev/wpi/if_wpi.c +++ b/sys/dev/wpi/if_wpi.c @@ -2917,7 +2917,8 @@ wpi_tx_data(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni) break; } - memcpy(tx->key, k->wk_key, k->wk_keylen); + memcpy(tx->key, ieee80211_crypto_get_key_data(k), + ieee80211_crypto_get_key_len(k)); } if (wh->i_fc[1] & IEEE80211_FC1_MORE_FRAG) { @@ -3031,7 +3032,8 @@ wpi_tx_data_raw(struct wpi_softc *sc, struct mbuf *m, break; } - memcpy(tx->key, k->wk_key, k->wk_keylen); + memcpy(tx->key, ieee80211_crypto_get_key_data(k), + ieee80211_crypto_get_key_len(k)); } tx->len = htole16(totlen); @@ -4627,7 +4629,8 @@ wpi_load_key(struct ieee80211_node *ni, const struct ieee80211_key *k) node.control = WPI_NODE_UPDATE; node.flags = WPI_FLAG_KEY_SET; node.kflags = htole16(kflags); - memcpy(node.key, k->wk_key, k->wk_keylen); + memcpy(node.key, ieee80211_crypto_get_key_data(k), + ieee80211_crypto_get_key_len(k)); again: DPRINTF(sc, WPI_DEBUG_KEY, "%s: setting %s key id %d for node %d (%s)\n", __func__, From nobody Thu Feb 26 03:56:23 2026 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 4fLyLc0ycgz6TB55 for ; Thu, 26 Feb 2026 03:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLyLb6dR6z3CTH for ; Thu, 26 Feb 2026 03:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772078183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aRE0ZpQnAim8bI8tdXo9zYjT8LOPpcK/PKP9ouHGJNw=; b=sn8gAMaM62crCBs3JIgsHQMCfp3qYqyGHt7CiDGSSVX9j65Ij0oMu55cu0DFPDOVCnsoGv Y3MN+w+TqHGpZhI6ItvMED2T9IUDylgi2+pm+UzJHrlvDik6chc5BUPjVlek+a7Qxljgi/ 2axMmdXgrWDarFzODyYtDXwJ5k2p3EOknE8PKF8QUKKAKPj9kYMy+n7OdSUlvWRJfCbVSs wilBcAxT2Gxdu/DdHXjKApj5RSvmts7oC36L0UD/i7fdi4tPyBKHpBAdCb3zPP8XQ+1cOq zY/PpqbUWvRbSIYRu12ZmAjZ/eaiPCCAuZMSVgzV71LGQ6oF8cNUpOW8arVhXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772078183; a=rsa-sha256; cv=none; b=hDyzmqD6kIUDz1xOzmvs1yJrlUwOHnwezHP4NVQjNjrR97bRSHwlXPTv7bYgQK3eK3nqc5 sX0ElGbCSn/YV9ibMknWXBj3B1qwDNFf8MEwG68qQUu4yGBYHVJiRpl0NM0KDXl+RCjI+Q YlNprZ7MdT1Fd8d6sv6HwsccZ7NjrvK637l0aD3zfviU4JZiOFHRhXqPVlg/JWQ7f92c1y rBAKPqjeA5Yqe8Ts+D7Z1nFxdr0Vn3I+iufx4RZMNHJphIw0Dht+A0uh0SNNsUcMQQ+i9L bTcBkrLmpaYPyNUfvt6iUiTjR8m/NQ7+VmvSYmgE4m0H0W1MrSu32V+POAnIww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772078183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aRE0ZpQnAim8bI8tdXo9zYjT8LOPpcK/PKP9ouHGJNw=; b=WHAVeC2bH8lIh0pzkfKoN1j7IJW5sQyxixn1jkDkNP3YpFwIQ/Frsh496Qwr9OO9iaH2Rc 9v9PUGkhBdA44l1Isf8B4dpCZNC50/iHQtXtYaWXPlqfE2uvGhEwQrIowullfjCiix9tiB 0BK6b8NeIAYizwjgZcuJtWwG0OjNCjWOc4+KD8CLFP3nrEM0j6BmWrCDAUAdxWWVwDG5mo EyQDueTcNb64zPVDx5SKBaqrREREjY97nfAxe4rR6ujaVIYCzPKjUMtZfA2ugVQ1ShuXjR wxZmyXYnic1Bf6WChgOdGuTAr+viU7sZpoMbDumUsCJxumRGwW65QvTWVgRaHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLyLb63p7zwl for ; Thu, 26 Feb 2026 03:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31cf2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 03:56:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 8ebc054acacc - main - mwl: migrate to new net80211 encryption key 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ebc054acacc70de6b95fc171ff724f344374172 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 03:56:23 +0000 Message-Id: <699fc467.31cf2.4b082269@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=8ebc054acacc70de6b95fc171ff724f344374172 commit 8ebc054acacc70de6b95fc171ff724f344374172 Author: Adrian Chadd AuthorDate: 2026-02-26 03:49:59 +0000 Commit: Adrian Chadd CommitDate: 2026-02-26 03:49:59 +0000 mwl: migrate to new net80211 encryption key API Migrate to the new encryption key API rather than poking at the key struct directly. Notably this driver was very clear about its expectation the net80211 key layout w/ key, TX MIC and RX MIC matches the firmware layout and just memcpy()'ed it. That has been refactored. Differential Revision: https://reviews.freebsd.org/D54484 --- sys/dev/mwl/if_mwl.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c index 9f3d34f4f50d..513c3d9c60e4 100644 --- a/sys/dev/mwl/if_mwl.c +++ b/sys/dev/mwl/if_mwl.c @@ -1638,28 +1638,43 @@ _mwl_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k, switch (cip->ic_cipher) { case IEEE80211_CIPHER_WEP: hk.keyTypeId = KEY_TYPE_ID_WEP; - hk.keyLen = k->wk_keylen; + hk.keyLen = ieee80211_crypto_get_key_len(k); if (k->wk_keyix == vap->iv_def_txkey) hk.keyFlags = KEY_FLAG_WEP_TXKEY; if (!IEEE80211_IS_STATICKEY(k)) { /* NB: WEP is never used for the PTK */ (void) addgroupflags(&hk, k); } + memcpy(hk.key.aes, ieee80211_crypto_get_key_data(k), + ieee80211_crypto_get_key_len(k)); break; case IEEE80211_CIPHER_TKIP: hk.keyTypeId = KEY_TYPE_ID_TKIP; hk.key.tkip.tsc.high = (uint32_t)(k->wk_keytsc >> 16); hk.key.tkip.tsc.low = (uint16_t)k->wk_keytsc; hk.keyFlags = KEY_FLAG_TSC_VALID | KEY_FLAG_MICKEY_VALID; - hk.keyLen = k->wk_keylen + IEEE80211_MICBUF_SIZE; + hk.keyLen = ieee80211_crypto_get_key_len(k) + + IEEE80211_MICBUF_SIZE; if (!addgroupflags(&hk, k)) hk.keyFlags |= KEY_FLAG_PAIRWISE; + + /* Copy in TKIP MIC after the 16 byte main key */ + memcpy(hk.key.aes, ieee80211_crypto_get_key_data(k), + ieee80211_crypto_get_key_len(k)); + memcpy(hk.key.aes + IEEE80211_KEYBUF_SIZE, + ieee80211_crypto_get_key_txmic_data(k), + 8); + memcpy(hk.key.aes + IEEE80211_KEYBUF_SIZE + 8, + ieee80211_crypto_get_key_rxmic_data(k), + 8); break; case IEEE80211_CIPHER_AES_CCM: hk.keyTypeId = KEY_TYPE_ID_AES; - hk.keyLen = k->wk_keylen; + hk.keyLen = ieee80211_crypto_get_key_len(k); if (!addgroupflags(&hk, k)) hk.keyFlags |= KEY_FLAG_PAIRWISE; + memcpy(hk.key.aes, ieee80211_crypto_get_key_data(k), + ieee80211_crypto_get_key_len(k)); break; default: /* XXX should not happen */ @@ -1667,11 +1682,6 @@ _mwl_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k, __func__, k->wk_cipher->ic_cipher); return 0; } - /* - * NB: tkip mic keys get copied here too; the layout - * just happens to match that in ieee80211_key. - */ - memcpy(hk.key.aes, k->wk_key, hk.keyLen); /* * Locate address of sta db entry for writing key; From nobody Thu Feb 26 06:16:27 2026 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 4fM1SD2x47z6TT66 for ; Thu, 26 Feb 2026 06:16:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fM1SD0vJ4z3Y8J for ; Thu, 26 Feb 2026 06:16:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772086588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fyAgFkVyQ1fS5vo+26EFDD4wTLD716+IW7MrABGEwU=; b=a/KvgslROhbetiQVfM6qyiIK+NJeriTONbkC+7AItThH9Zq7GchJtypRjlhWaVPRvMrmvl aHI7IBmpSM3kPH46PfZWOGYx05esmmhqBlpWBY7onQXIZYkcNwVaRftS8K8TJ28U5zW91o QTSPMPzBinUrBZHKjrUk60ZJKYi7xSjVZs6+OUmuT+05OUQS3GQ3wnpLSMqlVrT+knBXWO eX63dtDwfUorxO9lidgpsCho4vqAQDPVcR8Wbe3wIyQAawfUoOfxQ1Iv/AcOfkk5hXHZ4l n27y1YgC8fbdV6NYmTkqPOMv7yZhfpn5Q6aF2gTSyxlMt1ekDnqc2byWHNXNqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772086588; a=rsa-sha256; cv=none; b=F2uPoKD03gZnXCnkGvAjYyHIC2hgrsDLbAaVZXPIfLhwoMST1m7A0KsoWP4YWVxE9wU3kP NfVS5MkLJKXrxKhNscTntwL4F2ACKefjetM8ngR0h2O7ywoIOYRE3NH2+Kjob6Or8dGUaK s3Pk4a4SVs8RRLE0326gvG/C4qcE46cJpYoVCZGNgqiegGBjui6ov8O8vfwTiIk6rf8ntT bADqoihApxxmsHwfZ7OZb7gVKegiBJtDlYf01Y8ikxfvwtb8KZrssytjc/ae3pOhiVr58k VKpxGgwN5PdxnbTZb1Q8iEM1/W7nC5tHThzlC5toIi6cZazUWRQPth0z3IbTbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772086588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fyAgFkVyQ1fS5vo+26EFDD4wTLD716+IW7MrABGEwU=; b=YlzPMjxn67X5NKxKVdPkQ8i2/YRXmlDGdvUFTnkRxdmUiZ5H81wLO0PaseXwmLPlqJKZ6L xJ82bJy8VgJuaPBByHJCrpGu6PDycOK9iiKA4pnpDFc7DB3sbN22ghdjqTcfG8cQ1rm/xM Rs2JAVkGvosJrys3pbvgAaEh6wobD2t4zs1lyKKsmxoerUSt6/0onGTVYgEXTdR32g6EGL p5S2P1CpYjR1ylfRQd9w6NGNHALPOc2C6G5boz7speiOC1+zbyravM8jlYxK99VaE0nlJw fX78/Tlw8TClT2j9S1IiW8178p2SI2wHkqQW0B3TYHpN+SPoThtx+Hz6Iwpkng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM1SC6S2lz4rm for ; Thu, 26 Feb 2026 06:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40648 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 06:16:27 +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: 56fbfd1ecdc7 - main - lpd: Add timeout option 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: 56fbfd1ecdc78fc99b3a2e381c355ce8980de39d Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 06:16:27 +0000 Message-Id: <699fe53b.40648.78a6c4bf@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=56fbfd1ecdc78fc99b3a2e381c355ce8980de39d commit 56fbfd1ecdc78fc99b3a2e381c355ce8980de39d Author: Dag-Erling Smørgrav AuthorDate: 2026-02-26 06:15:14 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-26 06:15:14 +0000 lpd: Add timeout option Set a 120-second receive timeout on all client connections, and add a command-line option to change that value. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55400 --- usr.sbin/lpr/lpd/lpd.8 | 8 +++++++- usr.sbin/lpr/lpd/lpd.c | 30 +++++++++++++++++++----------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/usr.sbin/lpr/lpd/lpd.8 b/usr.sbin/lpr/lpd/lpd.8 index 9a4e46996811..9d24a450ba0e 100644 --- a/usr.sbin/lpr/lpd/lpd.8 +++ b/usr.sbin/lpr/lpd/lpd.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 15, 2021 +.Dd February 19, 2026 .Dt LPD 8 .Os .Sh NAME @@ -34,6 +34,7 @@ .Sh SYNOPSIS .Nm .Op Fl cdlpsFW46 +.Op Fl t Ar timeout .Op Ar port# .Sh DEPRECATION NOTICE This facility is scheduled for removal prior to the release of @@ -108,6 +109,11 @@ This means that will not accept any connections from any remote hosts, although it will still accept print requests from all local users. +.It Fl t Ar timeout +Set the network receive timeout for client connections to +.Ar timeout +seconds. +The default is 120. .It Fl F By default, .Nm diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c index 089b8fedc2d5..d1dcd0766a77 100644 --- a/usr.sbin/lpr/lpd/lpd.c +++ b/usr.sbin/lpr/lpd/lpd.c @@ -61,28 +61,28 @@ */ #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 -#include +#include +#include #include "lp.h" #include "lp.local.h" #include "pathnames.h" @@ -117,6 +117,7 @@ uid_t uid, euid; int main(int argc, char **argv) { + struct timeval tv = { .tv_sec = 120 }; int ch_options, errs, f, funix, *finet, i, lfd, socket_debug; fd_set defreadfds; struct sockaddr_un un, fromunix; @@ -139,7 +140,7 @@ main(int argc, char **argv) errx(EX_NOPERM,"must run as root"); errs = 0; - while ((i = getopt(argc, argv, "cdlpswFW46")) != -1) + while ((i = getopt(argc, argv, "cdlpst:wFW46")) != -1) switch (i) { case 'c': /* log all kinds of connection-errors to syslog */ @@ -159,6 +160,9 @@ main(int argc, char **argv) case 's': /* secure (no inet) */ sflag++; break; + case 't': + tv.tv_sec = atol(optarg); + break; case 'w': /* netbsd uses -w for maxwait */ /* * This will be removed after the release of 4.4, as @@ -386,6 +390,10 @@ main(int argc, char **argv) syslog(LOG_WARNING, "accept: %m"); continue; } + if (tv.tv_sec > 0) { + (void) setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &tv, + sizeof(tv)); + } if (fork() == 0) { /* * Note that printjob() also plays around with From nobody Thu Feb 26 06:16:26 2026 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 4fM1SJ0jLQz6TTBm for ; Thu, 26 Feb 2026 06:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fM1SH6hDcz3YFx for ; Thu, 26 Feb 2026 06:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772086592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpiTk3exn1jw2kp1fEJ6M35gqzf+CU5f7RroS0VgBGY=; b=bLpIBmsxycPYTyjecCv0OGeo1b09EPubsjqNkRL71CYzTDE0eivIERXHM5SGWtvzmfzy2l mIkwPMrJqYnq3idjrNyl/tpkemfQCo4bz8jb+P4ErpKwTQ7fdOTM39K5uNIplBnP7+oCS7 PhsPfDqwgwVee6cDVQFnTDWEv+xH89hDBo6sao5D/YTFU0TyWmoREAkFRuChFfqekA4K2S V9itXYh26W3iHH7Fhyh2aqUR9s3lnSoxmaQKIRTkn7AdG1VhBkXS7KluTnZa6VYePo7xHN OfjyAFZEezfLC97JpxWPPZ1zClr2k4zV6u+OIa1M/40sGMlhAbz1OOYTZQxhug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772086592; a=rsa-sha256; cv=none; b=S2dpuLFWJ11wGyLNxVcAMddsG/gENoEmw/T4iIQZxvqDzVfLJuCGHaXP9wF27RmKKQc7/X Lzf0vIcG9mzXW7eyBoDu1Lr99XZf/+ohorSKI2P2Ou8EVTqFhlJQLWeRjERrP2o+iyeVSZ ev+Sx5UN0wng1eyiTYEec//8pjqOCuQ0iBdHn9nVvl39hqWOOxu2ASE7jhei3/TuPMMSTq VCzMrzIoMcVWuzToawCwrYfgM8gIwIgsG0JsrfG9Pbfj0zJr6EX8u1VNU33RUBTwg6BoBN fL0Mh771ce0fj3DHSLyf/SArGMoLRpEKFvbO5jjEZpMVSsKlGluKt7l0dbeThg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772086592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpiTk3exn1jw2kp1fEJ6M35gqzf+CU5f7RroS0VgBGY=; b=tq21B3/q2QTDECU2pkW8J1OQ926OSelRe1a+Ao9L1r85xac1Uqtkiet4GYRgYC1RBGU157 Ol1URs3MK6vL3eJHdQwv7dkvDv6N5gUvNs79htJwDBn/ZJxLoi0vL6Ffe34pM+K7JPIJgk bVUGRqSO5pvkggAYeq2UJ3GDONarrtj7Y5wIaxNbOReKKilAT8Cbgk7W7ecKYtXbifMhKw ynaXQTIYfOQM3StQqX08qz8GT0KWvx2+tlVr7VVSAtkobf84YxBpok64dj+iLjVu5rDrW3 Y+GKxfkPoFPAr+d/lLpC4SWasF2H0QHDO0frZFO6BTm8VW8VVnzTiKyxBejRLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM1SH69h5z4NY for ; Thu, 26 Feb 2026 06:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41918 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 06:16:26 +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: 9065be0a5902 - main - lpd: Improve robustness 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: 9065be0a5902e058d25a42bd9b3fbe9dc28b189d Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 06:16:26 +0000 Message-Id: <699fe53a.41918.3b436976@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9065be0a5902e058d25a42bd9b3fbe9dc28b189d commit 9065be0a5902e058d25a42bd9b3fbe9dc28b189d Author: Dag-Erling Smørgrav AuthorDate: 2026-02-26 06:15:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-26 06:15:06 +0000 lpd: Improve robustness * Check for integer overflow when receiving file sizes. * Check for buffer overflow when receiving file names, and fully validate the names. * Check for integer overflow when checking for available disk space. * Check for I/O errors when sending status codes. * Enforce one job per connection and one control file per job (see code comments for additional details). * Simplify readfile(), avoiding constructs vulnerable to integer overflow. * Don't delete files we didn't create. * Rename read_number() to read_minfree() since that's all it's used for, and move all the minfree logic into it. * Fix a few style issues. PR: 293278 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55399 --- usr.sbin/lpr/lpd/recvjob.c | 291 +++++++++++++++++++++++++++++---------------- 1 file changed, 189 insertions(+), 102 deletions(-) diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c index f103829b19e8..94ff82ecb88f 100644 --- a/usr.sbin/lpr/lpd/recvjob.c +++ b/usr.sbin/lpr/lpd/recvjob.c @@ -39,22 +39,25 @@ #include #include -#include -#include -#include #include #include -#include +#include +#include +#include +#include +#include #include #include #include +#include +#include #include "lp.h" #include "lp.local.h" #include "ctlinfo.h" #include "extern.h" #include "pathnames.h" -#define ack() (void) write(STDOUT_FILENO, sp, (size_t)1) +#define digit(ch) ((ch) >= '0' && (ch) <= '9') /* * The buffer size to use when reading/writing spool files. @@ -62,15 +65,16 @@ #define SPL_BUFSIZ BUFSIZ static char dfname[NAME_MAX]; /* data files */ -static int minfree; /* keep at least minfree blocks available */ -static const char *sp = ""; +static size_t minfree; /* keep at least minfree blocks available */ static char tfname[NAME_MAX]; /* tmp copy of cf before linking */ -static int chksize(int _size); +static void ack(struct printer *_pp); +static void nak(struct printer *_pp); +static int chksize(size_t _size); static void frecverr(const char *_msg, ...) __printf0like(1, 2); static int noresponse(void); static void rcleanup(int _signo); -static int read_number(const char *_fn); +static void read_minfree(void); static int readfile(struct printer *_pp, char *_file, size_t _size); static int readjob(struct printer *_pp); @@ -118,7 +122,7 @@ recvjob(const char *printer) } else if (stat(pp->spool_dir, &stb) < 0) frecverr("%s: stat(%s): %s", pp->printer, pp->spool_dir, strerror(errno)); - minfree = 2 * read_number("minfree"); /* scale KB to 512 blocks */ + read_minfree(); signal(SIGTERM, rcleanup); signal(SIGPIPE, rcleanup); @@ -129,18 +133,35 @@ recvjob(const char *printer) /* * Read printer jobs sent by lpd and copy them to the spooling directory. * Return the number of jobs successfully transferred. + * + * In theory, the protocol allows any number of jobs to be transferred in + * a single connection, with control and data files in any order. This + * would be very difficult to police effectively, so enforce a single job + * per connection. The control file can be sent at any time (first, last, + * or between data files). All files must bear the same job number, and + * the data files must be sent sequentially. If any of these requirements + * is violated, we close the connection and delete everything. + * + * Note that RFC 1179 strongly implies only one data file per job; I + * assume this is a mistake in the RFC since it is supposed to describe + * this code, which predates it, but was written by a third party. */ static int readjob(struct printer *pp) { - register int size; - int cfcnt, dfcnt; - char *cp, *clastp, *errmsg; + ssize_t rlen; + size_t len, size; + int cfcnt, dfcnt, curd0, curd2, curn, n; + char *cp, *clastp, *errmsg, *sep; char givenid[32], givenhost[MAXHOSTNAMELEN]; - ack(); + tfname[0] = dfname[0] = '\0'; + ack(pp); cfcnt = 0; dfcnt = 0; + curd0 = 'd'; + curd2 = 'A'; + curn = -1; for (;;) { /* * Read a command to tell us what to do @@ -148,16 +169,16 @@ readjob(struct printer *pp) cp = line; clastp = line + sizeof(line) - 1; do { - size = read(STDOUT_FILENO, cp, (size_t)1); - if (size != (ssize_t)1) { - if (size < (ssize_t)0) { + rlen = read(STDOUT_FILENO, cp, 1); + if (rlen != 1) { + if (rlen < 0) { frecverr("%s: lost connection", pp->printer); /*NOTREACHED*/ } return (cfcnt); } - } while ((*cp++ != '\n') && (cp <= clastp)); + } while (*cp++ != '\n' && cp <= clastp); if (cp > clastp) { frecverr("%s: readjob overflow", pp->printer); /*NOTREACHED*/ @@ -165,37 +186,47 @@ readjob(struct printer *pp) *--cp = '\0'; cp = line; switch (*cp++) { - case '\1': /* cleanup because data sent was bad */ + case '\1': /* abort print job */ rcleanup(0); continue; - case '\2': /* read cf file */ - size = 0; - dfcnt = 0; - while (*cp >= '0' && *cp <= '9') - size = size * 10 + (*cp++ - '0'); + case '\2': /* read control file */ + if (tfname[0] != '\0') { + /* multiple control files */ + break; + } + for (size = 0; digit(*cp); cp++) { + if (ckd_mul(&size, size, 10) || + ckd_add(&size, size, *cp - '0')) + break; + } if (*cp++ != ' ') break; /* - * host name has been authenticated, we use our - * view of the host name since we may be passed - * something different than what gethostbyaddr() - * returns + * The next six bytes must be "cfA" followed by a + * three-digit job number. The rest of the line + * is the client host name, but we substitute the + * host name we've already authenticated. */ - strlcpy(cp + 6, from_host, sizeof(line) - + (size_t)(line - cp - 6)); - if (strchr(cp, '/')) { - frecverr("readjob: %s: illegal path name", cp); - /*NOTREACHED*/ - } - strlcpy(tfname, cp, sizeof(tfname)); - tfname[sizeof (tfname) - 1] = '\0'; + if (cp[0] != 'c' || cp[1] != 'f' || cp[2] != 'A' || + !digit(cp[3]) || !digit(cp[4]) || !digit(cp[5])) + break; + n = (cp[3] - '0') * 100 + (cp[4] - '0') * 10 + + cp[5] - '0'; + if (curn == -1) + curn = n; + else if (curn != n) + break; + len = snprintf(tfname, sizeof(tfname), "%.6s%s", cp, + from_host); + if (len >= sizeof(tfname)) + break; tfname[0] = 't'; if (!chksize(size)) { - (void) write(STDOUT_FILENO, "\2", (size_t)1); + nak(pp); continue; } - if (!readfile(pp, tfname, (size_t)size)) { + if (!readfile(pp, tfname, size)) { rcleanup(0); continue; } @@ -208,27 +239,62 @@ readjob(struct printer *pp) cfcnt++; continue; - case '\3': /* read df file */ + case '\3': /* read data file */ + if (curd0 > 'z') { + /* too many data files */ + break; + } *givenid = '\0'; *givenhost = '\0'; - size = 0; - while (*cp >= '0' && *cp <= '9') - size = size * 10 + (*cp++ - '0'); + for (size = 0; digit(*cp); cp++) { + if (ckd_mul(&size, size, 10) || + ckd_add(&size, size, *cp - '0')) + break; + } if (*cp++ != ' ') break; - if (strchr(cp, '/')) { - frecverr("readjob: %s: illegal path name", cp); - /*NOTREACHED*/ - } + /* + * The next six bytes must be curd0, 'f', curd2 + * followed by a three-digit job number, where + * curd2 cycles through [A-Za-z] while curd0 + * starts at 'd' and increments when curd2 rolls + * around. The rest of the line is the client + * host name, but we substitute the host name + * we've already authenticated. + */ + if (cp[0] != curd0 || cp[1] != 'f' || cp[2] != curd2 || + !digit(cp[3]) || !digit(cp[4]) || !digit(cp[5])) + break; + n = (cp[3] - '0') * 100 + (cp[4] - '0') * 10 + + cp[5] - '0'; + if (curn == -1) + curn = n; + else if (curn != n) + break; + len = snprintf(dfname, sizeof(dfname), "%.6s%s", cp, + from_host); + if (len >= sizeof(dfname)) + break; if (!chksize(size)) { - (void) write(STDOUT_FILENO, "\2", (size_t)1); + nak(pp); continue; } - strlcpy(dfname, cp, sizeof(dfname)); + switch (curd2++) { + case 'Z': + curd2 = 'a'; + break; + case 'z': + curd0++; + curd2 = 'A'; + break; + } dfcnt++; trstat_init(pp, dfname, dfcnt); - (void) readfile(pp, dfname, (size_t)size); - trstat_write(pp, TR_RECVING, (size_t)size, givenid, + if (!readfile(pp, dfname, size)) { + rcleanup(0); + continue; + } + trstat_write(pp, TR_RECVING, size, givenid, from_host, givenhost); continue; } @@ -243,52 +309,55 @@ readjob(struct printer *pp) static int readfile(struct printer *pp, char *file, size_t size) { - register char *cp; char buf[SPL_BUFSIZ]; - size_t amt, i; - int err, fd, j; + ssize_t rlen, wlen; + int err, f0, fd, j; fd = open(file, O_CREAT|O_EXCL|O_WRONLY, FILMOD); if (fd < 0) { - frecverr("%s: readfile: error on open(%s): %s", - pp->printer, file, strerror(errno)); + /* + * We need to pass the file name to frecverr() so it can + * log an error, but frecverr() will then call rcleanup() + * which will delete the file if we don't zero out the + * first character. + */ + f0 = file[0]; + file[0] = '\0'; + frecverr("%s: readfile: error on open(%c%s): %s", + pp->printer, f0, file + 1, strerror(errno)); /*NOTREACHED*/ } - ack(); - err = 0; - for (i = 0; i < size; i += SPL_BUFSIZ) { - amt = SPL_BUFSIZ; - cp = buf; - if (i + amt > size) - amt = size - i; - do { - j = read(STDOUT_FILENO, cp, amt); - if (j <= 0) { - frecverr("%s: lost connection", pp->printer); + ack(pp); + while (size > 0) { + rlen = read(STDOUT_FILENO, buf, MIN(SPL_BUFSIZ, size)); + if (rlen < 0 && errno == EINTR) + continue; + if (rlen <= 0) { + frecverr("%s: lost connection", pp->printer); + /*NOTREACHED*/ + } + size -= rlen; + while (rlen > 0) { + wlen = write(fd, buf, rlen); + if (wlen < 0 && errno == EINTR) + continue; + if (wlen <= 0) { + frecverr("%s: write error on write(%s)", + pp->printer, file); /*NOTREACHED*/ } - amt -= j; - cp += j; - } while (amt > 0); - amt = SPL_BUFSIZ; - if (i + amt > size) - amt = size - i; - if (write(fd, buf, amt) != (ssize_t)amt) { - err++; - break; + rlen -= wlen; } } - (void) close(fd); - if (err) { + if (close(fd) != 0) { frecverr("%s: write error on close(%s)", pp->printer, file); /*NOTREACHED*/ } if (noresponse()) { /* file sent had bad data in it */ - if (strchr(file, '/') == NULL) - (void) unlink(file); + (void) unlink(file); return (0); } - ack(); + ack(pp); return (1); } @@ -297,13 +366,13 @@ noresponse(void) { char resp; - if (read(STDOUT_FILENO, &resp, (size_t)1) != 1) { + if (read(STDOUT_FILENO, &resp, 1) != 1) { frecverr("lost connection in noresponse()"); /*NOTREACHED*/ } if (resp == '\0') - return(0); - return(1); + return (0); + return (1); } /* @@ -311,36 +380,42 @@ noresponse(void) * 1 == OK, 0 == Not OK. */ static int -chksize(int size) +chksize(size_t size) { - int64_t spacefree; struct statfs sfb; + size_t avail; if (statfs(".", &sfb) < 0) { syslog(LOG_ERR, "%s: %m", "statfs(\".\")"); return (1); } - spacefree = sfb.f_bavail * (sfb.f_bsize / 512); - size = (size + 511) / 512; - if (minfree + size > spacefree) - return(0); - return(1); + /* more free space than we can count; possible on 32-bit */ + if (ckd_mul(&avail, sfb.f_bavail, (sfb.f_bsize / 512))) + return (1); + /* already at or below minfree */ + if (avail <= minfree) + return (0); + /* not enough space */ + if (avail - minfree <= size / 512) + return (0); + return (1); } -static int -read_number(const char *fn) +static void +read_minfree(void) { - char lin[80]; - register FILE *fp; + FILE *fp; - if ((fp = fopen(fn, "r")) == NULL) - return (0); - if (fgets(lin, sizeof(lin), fp) == NULL) { + minfree = 0; + /* read from disk */ + if ((fp = fopen("minfree", "r")) != NULL) { + if (fscanf(fp, "%zu", &minfree) != 1) + minfree = 0; fclose(fp); - return (0); } - fclose(fp); - return (atoi(lin)); + /* scale kB to 512-byte blocks */ + if (ckd_mul(&minfree, minfree, 2)) + minfree = SIZE_MAX; } /* @@ -362,8 +437,6 @@ rcleanup(int signo __unused) dfname[0] = '\0'; } -#include - static void frecverr(const char *msg, ...) { @@ -391,3 +464,17 @@ frecverr(const char *msg, ...) putchar('\1'); /* return error code */ exit(1); } + +static void +ack(struct printer *pp) +{ + if (write(STDOUT_FILENO, "\0", 1) != 1) + frecverr("%s: write error on ack", pp->printer); +} + +static void +nak(struct printer *pp) +{ + if (write(STDOUT_FILENO, "\2", 1) != 1) + frecverr("%s: write error on nak", pp->printer); +} From nobody Thu Feb 26 06:29:16 2026 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 4fM1l55DkLz6Sm8L for ; Thu, 26 Feb 2026 06:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fM1l54bnNz3bvG for ; Thu, 26 Feb 2026 06:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772087361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ESwxpP3IP1kxrNmkpuBi7XqKzifWyyYHxvYAL7sET0=; b=nHgcmqUUKN5AAaRDP/cYR/jZUQ4W4YhROL9QpIYSNR8k4py+gI5B43v4JBMbw8RDZt2zCG aOXWeLcr0FLUIYGhUTdaI6rF/GOntxafEluvux0hGZFrh4ApETNwGQLfIAlLqQRdNMN0gX vCllAocJ5dXLsGh9vUvnG6iZMkU8JaLM+RD82+HkvyOWlowcqmY9/EGfRS5ltCzmOxswH/ 6vxT+A9Sy0/53BlcY4cWckER14YhU4mM2TWU34rfIiFcWmnh/qtTmYHaWCCkusyrq4fAMD 9ixsBJvOYzBhYPmKpDHUU7tGrpsi1ToK/JEAcBToPUNSAiFYpb9pG1I7ANNczA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772087361; a=rsa-sha256; cv=none; b=lDWeQ+5h9rBUylsuDZJV3W/SF4tpOLEsu863sfY0IODidOgkAdzJybX4U/vCJI4VdwvxiB EaLQskO4DHhA0G4WG1HyReEpNWek6m6EvUfKtnb2X9ALxsCbav/Ym4XYnsed0hxP8OE/ou vheqEzgoGdXmSKBhuMb3Jpy7CAoPWoRlf2bDq13XxLAsljgxQzQYArj25JNPtdiPDKzXIU Re6R2vljf1N1K/iGgwuTA3iTp+tSPqS+S1WfRaMZgUFEwE4FUya6M+w5myJNYLo/zy9oOY vArlKwsp5OjS3VsX2S25ZuMUH5uiMh2Jx9IppTUgfZsvZ91WBOsT8P5Uv5XqIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772087361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ESwxpP3IP1kxrNmkpuBi7XqKzifWyyYHxvYAL7sET0=; b=RaimTXD/tkLZ9BammUDvF2sNCAHN3DAh+agpMUCrpzWMP7KLfJvUH+T3lLRFDvspdT0BLO evqiZITVb+U4uDB6w7Urb58vzJVqABICSrJSvmeZQXkM++TiPt7IhGObsIap28fJLwgy9O GnWyXjoJbGog2ZhfLIdvcFuhn33nNBl+DObU07eaU7MdrxY/pMTQ3wqjZExv0d33j+Cfep sagpaun2KsdScgXEQVFJjKUwBUzmlEZZGuS6Pe5h7Mb1dWjzExbBn6sbx5WavLLZB/wi7S 3ASjfhkbjWsCaCSZ4S9TY/XlA+rmJcxbIZuo7mZZUfsOYMRL2FUCQizaqRKp7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM1l54Bj1z4ML for ; Thu, 26 Feb 2026 06:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40050 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 06:29:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 6fd98877de63 - main - Refinements to the output when the EXTERROR_VERBOSE environment is set 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fd98877de633f5ec6f028e78d5a2d94527d63d0 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 06:29:16 +0000 Message-Id: <699fe83c.40050.5e7aeeb1@gitrepo.freebsd.org> The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=6fd98877de633f5ec6f028e78d5a2d94527d63d0 commit 6fd98877de633f5ec6f028e78d5a2d94527d63d0 Author: Kirk McKusick AuthorDate: 2026-02-26 06:20:12 +0000 Commit: Kirk McKusick CommitDate: 2026-02-26 06:20:12 +0000 Refinements to the output when the EXTERROR_VERBOSE environment is set When kernel external errors are available they are included in the err(3) library function messages. In addition to the extended error itself, the kernel also tracks the kernel file and line number at which the error was generated. This additional information is not included in the err(3) messages unless the EXTERROR_VERBOSE environment variable is present. Currently, when EXTERROR_VERBOSE is present, all the internal extended error information associated with the error is printed most of which is redundant with the formatted error message printed by err(3). This change will add only the kernel file and line number to the err(3) message when EXTERROR_VERBOSE is present and set to "brief". Sample output with bad protection bits to mmap: guest_16 % ./Example bigfile Example: mmap bigfile: Invalid argument (unknown PROT bits 0x8) guest_16 % setenv EXTERROR_VERBOSE guest_16 % ./Example bigfile Example: mmap bigfile: Invalid argument (unknown PROT bits 0x8 errno 22 category 1 (src sys/vm/vm_mmap.c:200) p1 0x8 p2 0) guest_16 % setenv EXTERROR_VERBOSE brief guest_16 % ./Example bigfile Example: mmap bigfile: Invalid argument (unknown PROT bits 0x8 (src sys/vm/vm_mmap.c:200)) Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55494 MFC-after: 1 week Sponsored-by: Netflix --- lib/libc/gen/err.3 | 8 +++++++- lib/libc/gen/uexterr_format.c | 28 ++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3 index 70a214152a19..2df03c2dcdde 100644 --- a/lib/libc/gen/err.3 +++ b/lib/libc/gen/err.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 29, 2012 +.Dd February 23, 2026 .Dt ERR 3 .Os .Sh NAME @@ -128,6 +128,12 @@ environment variable is present, an additional report is printed. The report includes at least the category of the error, the name of the source file (if known by the used version of libc), the source line number, and parameters. +If the +.Ev EXTERROR_VERBOSE +environment variable is present and set to "brief", +the report adds only the name of +the source file (if known by the used version of libc) +and the source line number. The format of the printed string is not contractual and might be changed. .Pp In the case of the diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index c1974f3c361a..308220adea1f 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -35,13 +35,16 @@ static const char exterror_verbose_name[] = "EXTERROR_VERBOSE"; enum exterr_verbose_state { EXTERR_VERBOSE_UNKNOWN = 100, EXTERR_VERBOSE_DEFAULT, - EXTERR_VERBOSE_ALLOW, + EXTERR_VERBOSE_ALLOW_BRIEF, + EXTERR_VERBOSE_ALLOW_FULL, }; static enum exterr_verbose_state exterror_verbose = EXTERR_VERBOSE_UNKNOWN; static void exterr_verbose_init(void) { + const char *v; + /* * No need to care about thread-safety, the result is * idempotent. @@ -50,8 +53,9 @@ exterr_verbose_init(void) return; if (issetugid()) { exterror_verbose = EXTERR_VERBOSE_DEFAULT; - } else if (getenv(exterror_verbose_name) != NULL) { - exterror_verbose = EXTERR_VERBOSE_ALLOW; + } else if ((v = getenv(exterror_verbose_name)) != NULL) { + exterror_verbose = strcmp(v, "brief") == 0 ? + EXTERR_VERBOSE_ALLOW_BRIEF : EXTERR_VERBOSE_ALLOW_FULL; } else { exterror_verbose = EXTERR_VERBOSE_DEFAULT; } @@ -78,13 +82,21 @@ __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) strlcpy(buf, "", bufsz); } - if (exterror_verbose == EXTERR_VERBOSE_ALLOW || !has_msg) { + if (exterror_verbose > EXTERR_VERBOSE_DEFAULT || !has_msg) { char lbuf[128]; - snprintf(lbuf, sizeof(lbuf), - "errno %d category %u (src sys/%s:%u) p1 %#jx p2 %#jx", - ue->error, ue->cat, cat_to_filename(ue->cat), - ue->src_line, (uintmax_t)ue->p1, (uintmax_t)ue->p2); +#define SRC_FMT "(src sys/%s:%u)" + if (exterror_verbose == EXTERR_VERBOSE_ALLOW_BRIEF) { + snprintf(lbuf, sizeof(lbuf), SRC_FMT, + cat_to_filename(ue->cat), ue->src_line); + } else if (!has_msg || + exterror_verbose == EXTERR_VERBOSE_ALLOW_FULL) { + snprintf(lbuf, sizeof(lbuf), + "errno %d category %u " SRC_FMT " p1 %#jx p2 %#jx", + ue->error, ue->cat, cat_to_filename(ue->cat), + ue->src_line, (uintmax_t)ue->p1, (uintmax_t)ue->p2); + } +#undef SRC_FMT if (has_msg) strlcat(buf, " ", bufsz); strlcat(buf, lbuf, bufsz); From nobody Thu Feb 26 07:07:46 2026 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 4fM2bR0t6Fz6SrXJ for ; Thu, 26 Feb 2026 07:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fM2bR01J1z3gTy for ; Thu, 26 Feb 2026 07:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772089667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivDSxYcYfULAOW86oImBdsWpcyvvcf50cWT9fruoN+M=; b=CLzsIub+wnDcAl56l4bbCsvNiFu+G7fUj/p8U0Dk8zDw5sYA+BA7h4vIRA8HVkm43wTRkI qVOdxv8LRpF3WO3E2JNbf+UocRnIKpxuZsgvDQfWikpWlHuN+DEDzSkKK02RTIidOxkiFC 5FRIus/Ujyfsmuj+6QLmsSOpHsbFMel/jpwCtn5Uz0gLCakSBDvnHPvb5EwlWb+aSxs/lj u7S7HSEedGhekZLjtD0N1CvmARW5JixLuJBynW4ZZo87Sf1S6W3bq3AjxwgKeWi9KwJO8y WTDneW3e2kD/FrWHYw3gUKHECh/x2l3LI8Od53981z+t7xLAAWO1R0/IByGEBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772089667; a=rsa-sha256; cv=none; b=Nuqf2iR3EgAMLTFRss/6VQ1j3knXC1a8ZCkJXLCswVHOA89srQ+F3HrODDiCiR6P1gQxz3 6Xzcwp0XBqLzqImW497w+YCGPw8jPUxOpw4umtgKHglOrSpTQ250QdW6TxEvdn8aCwFBYA ABhAMSeSo3HFjGmmrO/KUzNmeycO4OzN5tGEeXkG1gzou/bDQILDvdCqZR7/dsjAi6r1JJ BzftfpktI0pNeR52aiV52mU3ldQ/uQmbCTKeRewgrN1svAtNyhONUhbpo8FWzrIHJfk/XJ xgs8ms4j5h01flGKMh/lAU6XMLTB2PXZ0yVZavl/uCv540XfsV0M7Fg/LiKndQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772089667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivDSxYcYfULAOW86oImBdsWpcyvvcf50cWT9fruoN+M=; b=Yw1RwH5qJi2vAx29wWb+hyk9sqozmc/LVh+VvAFfKaXDs87T+jcbk9VO4Yoo1xzSdHZV0q vQRLjyoR/fh2ASiW6kKDUMSORMvO0EObPOOHocoA+tOkG0o0/7Ms9aR96Qv+n5CacAj62B la/ShRC+YccJypW0rtFozdEFgLhvbK8WVLgRuFPSk+2+BfyiJxemEFF0b2lOoLTIxEr++h CfWm7Py0LOP/7defgs957BHI5ewJkD1m+/L0Q5/JmYB93zrpw2/Sk7o411/IRojBclJduT 7EBwI5oLGC6hY2OaKZltonQMrH0JK6aUeLkwlmXacTDQNbnveoZ3vy587TALkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM2bQ6dRyz68G for ; Thu, 26 Feb 2026 07:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 463fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 07:07:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 2abdbe9d7964 - main - style.mdoc: Add example manuals to FILES 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: 2abdbe9d796419e8149705ffb4c81f0c0cdea05f Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 07:07:46 +0000 Message-Id: <699ff142.463fd.38359604@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=2abdbe9d796419e8149705ffb4c81f0c0cdea05f commit 2abdbe9d796419e8149705ffb4c81f0c0cdea05f Author: Alexander Ziaee AuthorDate: 2026-02-26 07:07:09 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-26 07:07:12 +0000 style.mdoc: Add example manuals to FILES This is the OG meat and potatoes. MFC after: 3 days Reviewed by: 0mp, carlavilla Differential Revision: https://reviews.freebsd.org/D55301 --- share/man/man5/style.mdoc.5 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/man/man5/style.mdoc.5 b/share/man/man5/style.mdoc.5 index 2f8ea90ae21f..98cc516ffd64 100644 --- a/share/man/man5/style.mdoc.5 +++ b/share/man/man5/style.mdoc.5 @@ -286,6 +286,11 @@ that would be rendered as: .Va critical_filesystems_ Ns Ar type .Ed .El +.Sh FILES +.Bl -tag -width "/usr/share/examples/mdoc/tab" +.It /usr/share/examples/mdoc/ +Examples for writing manual pages. +.El .Sh SEE ALSO .Xr man 1 , .Xr mandoc 1 , From nobody Thu Feb 26 07:41:52 2026 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 4fM3Lm5xRhz6SwF6 for ; Thu, 26 Feb 2026 07:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fM3Lm5M88z3l8k for ; Thu, 26 Feb 2026 07:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772091712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wxAXAv/8VCCTYZvVAx0AfwA4gzW/aCQLMc/yFdbPBcM=; b=i6d+rDRbJRySqaPzFA/23HtTeS3fDQZ/WzdbjygrykbcJhEiriHojq2dn/+5oHfNjov8G4 COa9A3wHEga3HqoLLxsJO6CgjnjdCvZio2GxNxk1Nuv8LpgKGJIwcBjF4kkQVP7nXPmx8+ 7LLnU7cj3sxEnZrRtU/67n7pLlB+QmfLxJ1x1CyomT7YRLGygfPKfrZp9aAzwjVCw6i+pV KXC0YWCBnUCoOhqVdWrLYHsQxnPXOQHnWWD4fEAR2ts1FIBr5sIjv3LtXZgMxjts/2QaLM dNJ2CaXS4Qn1DFXPeiQe2GeCKAUu1BoQCE/dYuV7w06Z0B5/fqxeOqdrYIzjpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772091712; a=rsa-sha256; cv=none; b=uAIYFo5KKrkIpZpk9JS6988NOQFJq27SDZq9uIvyic13Nledf4mLE+DKTTHhskE705Zd3W BZ67+7S/3sSAgaCwxyoobpGuYonaWCoaXNEGRLCHUiih3wZ6e/ewWD0Z4Zafn+KYWnCwMM iF9LsY5IL+TvmGbLDvByU5elDzeAOIPWe1yoDXrWhsqgRjxFiH+eeychi1JOVB1ulhDTNO 7I+kxv7+8KQbGmTl6OdEBdAu0Yw3nPnEqV+e/Ws97WlJ8xweVsMh+AEJRGklvdCtzjby4H 9x/NVrQQKz73qYr2KzxgZheYRQIJqj9HTDWSvOZPlJEICq7DO3kJw0QW0Csvkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772091712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wxAXAv/8VCCTYZvVAx0AfwA4gzW/aCQLMc/yFdbPBcM=; b=X/71gHcWKKoWkF7ZEqMsdZ974EKmjTCh8I1jYMvpmzUfEQbA7BlXFmeFw+Q+UHoMlDxE2g F53wlReB2wOqOVJV+x1uGu1Rn0T+fW9KTT/PlLwwVxzP98HtdT8vmsQtkpD3UO+rOIdeL2 oKWxiKsVLjy3Ba9G6JndE/oJiXGz6KAUlMXgQkDQ7a14CHVOiFEzsmoQZH8O4D+BQg7tde +anMr8GFqpW/yGUK3QiuT9vunlSJ2RvCYdo8r1bVpujiNGEpp7MGZRpWG+pKve1NuS/h2c RL2J73tZRpa6868HLEHzsJ3NOYnMCta0nGwsJ/GL+vYd+EQcI7Y6G5sWXmiuOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM3Lm4gn6z74G for ; Thu, 26 Feb 2026 07:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19c99 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 07:41:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: db5344a7445f - main - lib/libnetbsd: bring in `__type_m{ax,in}*` macro family 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db5344a7445f1a796bc3cacd32a46e88e3e589a7 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 07:41:52 +0000 Message-Id: <699ff940.19c99.1af2c339@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=db5344a7445f1a796bc3cacd32a46e88e3e589a7 commit db5344a7445f1a796bc3cacd32a46e88e3e589a7 Author: Enji Cooper AuthorDate: 2026-02-26 02:29:49 +0000 Commit: Enji Cooper CommitDate: 2026-02-26 07:41:08 +0000 lib/libnetbsd: bring in `__type_m{ax,in}*` macro family These macros are used by some of the NetBSD tests which calculate the size of types, e.g., `__type_max(time_t)`. This wraps up the set of macros needed in order to update to the a netbsd-tests snapshot from this past month. Obtained from: https://github.com/netbsd/src (55b4b44) MFC after: 1 week --- lib/libnetbsd/sys/cdefs.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/lib/libnetbsd/sys/cdefs.h b/lib/libnetbsd/sys/cdefs.h index 78c80735ad01..e4ff4a516519 100644 --- a/lib/libnetbsd/sys/cdefs.h +++ b/lib/libnetbsd/sys/cdefs.h @@ -110,4 +110,34 @@ */ #define __nothing (/*LINTED*/(void)0) +#define __negative_p(x) (!((x) > 0) && ((x) != 0)) + +#define __type_min_s(t) ((t)((1ULL << (sizeof(t) * __CHAR_BIT__ - 1)))) +#define __type_max_s(t) ((t)~((1ULL << (sizeof(t) * __CHAR_BIT__ - 1)))) +#define __type_min_u(t) ((t)0ULL) +#define __type_max_u(t) ((t)~0ULL) +#define __type_is_signed(t) (/*LINTED*/__type_min_s(t) + (t)1 < (t)1) +#define __type_min(t) (__type_is_signed(t) ? __type_min_s(t) : __type_min_u(t)) +#define __type_max(t) (__type_is_signed(t) ? __type_max_s(t) : __type_max_u(t)) + + +#define __type_fit_u(t, a) \ + (/*LINTED*/!__negative_p(a) && \ + ((__UINTMAX_TYPE__)((a) + __zeroull()) <= \ + (__UINTMAX_TYPE__)__type_max_u(t))) + +#define __type_fit_s(t, a) \ + (/*LINTED*/__negative_p(a) \ + ? ((__INTMAX_TYPE__)((a) + __zeroll()) >= \ + (__INTMAX_TYPE__)__type_min_s(t)) \ + : ((__INTMAX_TYPE__)((a) + __zeroll()) >= (__INTMAX_TYPE__)0 && \ + ((__INTMAX_TYPE__)((a) + __zeroll()) <= \ + (__INTMAX_TYPE__)__type_max_s(t)))) + +/* + * return true if value 'a' fits in type 't' + */ +#define __type_fit(t, a) (__type_is_signed(t) ? \ + __type_fit_s(t, a) : __type_fit_u(t, a)) + #endif /* _LIBNETBSD_SYS_CDEFS_H_ */ From nobody Thu Feb 26 09:40:15 2026 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 4fM5zd5gKWz6TB6x for ; Thu, 26 Feb 2026 09:40:29 +0000 (UTC) (envelope-from wschnr@googlemail.com) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 4fM5zc1jN2z40j2 for ; Thu, 26 Feb 2026 09:40:28 +0000 (UTC) (envelope-from wschnr@googlemail.com) Authentication-Results: mx1.freebsd.org; dkim=none; arc=pass ("google.com:s=arc-20240605:i=1"); dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of wschnr@googlemail.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=wschnr@googlemail.com Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-436309f1ad7so496317f8f.3 for ; Thu, 26 Feb 2026 01:40:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1772098827; cv=none; d=google.com; s=arc-20240605; b=jniXDDtXEegLIMSvEMmEyxRkkt4oFKaCDbTIUFpKvUsah83ukxXjo6T1sAWOSNSMiz OR3rmT69ojA2K8MyDx1uNIy3eiV4jNZwRdgU6ctCZoKZOXpJD5WFK2Qt3VuAJ86b8viW EzeVN/sNK/ewM9R1yrck6gsDRnCTYL5d7qrcBNCtiLi/aAdGq+SSI7PO2BHewag8YFtd U4NiNuAoY5kfd/4bHpcUu+2IbcdvLb2sbKSsfhGhPkPumxIh6JIvgp0r0XeGDypFPgoR 2k5+1JK83N3j7d2KLif75xeY0dzKoP72v2FcE/W4JAbpWaIMAOfnFOpg2lGknEkgGawN bC6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version; bh=w4IYNYzBIIRacx/0OXveM8T8csEYIR98ppiaoc/WohQ=; fh=UPbTjevVy+lOpSIi1lIk9sJtf/s77bfZUgUg2/5u/dA=; b=f/0ciWzSep5qS5jMPp91GKUKsgf0F9sOZkO61pBQ4fx/nfwVfaXNxQzT7Wdhjq0CFw VfaY993tVc0pjeaArpH28dzAxoE1bQnN/wYfISaalK6Gfzrfwo//QXAgXMNhVF5mwB5m XAjUZpTXywzRRmqh1tY7p4bXqB2MDw9AxHiKf3ADRlYFXfJiLEbl8piLTxpwHJXL5/Nr BzaBTOPmtWy78fRdZGT4FREHKjouGT/e99VDggOppX3UpBVT20ARZWwC35GtAAjpGwiZ Im9VyGAlYCUoDZUBM2XO0Dh0dnOeew0fJyp4ZSDydjknfagUVMoNa/Ro5B5rsEwOCAYq WQeQ==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772098827; x=1772703627; 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=w4IYNYzBIIRacx/0OXveM8T8csEYIR98ppiaoc/WohQ=; b=EIZtsMOzpSeiOHTZ6a+JxabUyotcfPH4kr02lOeQoJ3D5lPtn0e110X9egyzHJOZG+ OS+vCwyTMBfF6r34fLME3vMfKlCIjj4HqeTMGm5Pk35LrscNJ/wU3JnDliuGiuLLeSQr DroqMx14C6ZxinHxPJ2AKiRFeB0T3KK9JHCroBCM7hswtFAzSBn4gCpv0ebcQppGQNrb IZMHFvPExOHpDsgqYOSfKl971SYphqgkq3CH5i42XavQNSFUIbnbXSjXtcMSzDTInhRF 5EGEwONggHiKXEhJs+rn+OijiBsqXm/oQ32vj39/tUyo2gTfMnyCq/i/sgHS1+wITn1o ilFA== X-Forwarded-Encrypted: i=1; AJvYcCVAu6FkqXub/Bh0ArhDrswfupHCLGBjUTwTdMN/SkODJUJr61apMVvsaDTa/T5+IMB//fcmM85UpjX4uA7OV22RDoY/ew==@freebsd.org X-Gm-Message-State: AOJu0Ywe4Ba2L6+pGyjY2DqaWjYu42Uhg4xvHF8CBPkUHuriYtUfqGeQ NNTKgDDGPnHW5oybzENvBQcFNn6YOIzViKaglS+hI9IhSRs0DXx4axlwG2ek4PhRfyHJV8zHQS4 UHHfVKzdjn/Mff/l+wUEKyynHXa6jbic= X-Gm-Gg: ATEYQzzBvtQQ//C39I+CF0fyH0SkKvTkNk9o9XmPZsyvu5XNj/En7Uk69Ib+8jiXAeI 6ealSLG44HjIdZYu8e/UBDUJaYbg0p9uDa0jDLhHFdpcbhO3ZnBV4TSQCB+/r+WBU8HEuzriq/r 1wXaESvXWGlG2HVvisVsR5/yTh1dQOWMCKle92p3JFhZFmFxmqM/FaW0UdzFrE7Hn1s9yrEKFjU E92EYIkqFVA7OT0O/fg/eY3m6CChRLzWkIk5TIKBBHSIwjMszDwOjSWHYmKVsIRhTiZhurAFK0d 3aLBxidSzmRmbZtBoYBjBDZHVqNZWr5Q/oKUS/H4AKarj9OCWV7fBklheEJp X-Received: by 2002:a05:6000:4024:b0:439:872f:b489 with SMTP id ffacd0b85a97d-4399429cbc5mr6709958f8f.10.1772098826324; Thu, 26 Feb 2026 01:40:26 -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: <69792b5c.37509.d3cf068@gitrepo.freebsd.org> In-Reply-To: <69792b5c.37509.d3cf068@gitrepo.freebsd.org> From: Wolfram Schneider Date: Thu, 26 Feb 2026 10:40:15 +0100 X-Gm-Features: AaiRm51k0yigBkfKTrWnaNNw2YC6LFiHhd2CgKFpibiXnWhTfJCjPElHjsbQ2uo Message-ID: Subject: Re: git: 8a9508563542 - main - tests/kern: make ssl_sendfile:truncate and ssl_sendfile:grow less flaky To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [0.60 / 15.00]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_SPAM_LONG(0.98)[0.980]; NEURAL_SPAM_MEDIUM(0.83)[0.827]; NEURAL_HAM_SHORT(-0.30)[-0.304]; FORGED_SENDER(0.30)[wosch@freebsd.org,wschnr@googlemail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FREEMAIL_ENVFROM(0.00)[googlemail.com]; RCVD_COUNT_ONE(0.00)[1]; MISSING_XM_UA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_NEQ_ENVFROM(0.00)[wosch@freebsd.org,wschnr@googlemail.com]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.50:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.50:from] X-Rspamd-Queue-Id: 4fM5zc1jN2z40j2 X-Spamd-Bar: / On Tue, 27 Jan 2026 at 22:18, Gleb Smirnoff wrote: > > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8a9508563542d709b1a42a065e6e99e004a8b3fe > > commit 8a9508563542d709b1a42a065e6e99e004a8b3fe > Author: Gleb Smirnoff > AuthorDate: 2026-01-27 21:13:11 +0000 > Commit: Gleb Smirnoff > CommitDate: 2026-01-27 21:17:08 +0000 > > tests/kern: make ssl_sendfile:truncate and ssl_sendfile:grow less flaky > > First problem is a trivial race that the client thread doesn't see updated > c.sbytes. Second problem applies only to the truncate test. On a machine > with huge default buffer sizes, there is a chance that sendfile(2) will > fill both buffers with amount of data that is larger than the size we plan > to truncate. To minimise chances for this scenario, increase file size > and truncate it less aggressively, also try to decrease buffer sizes. > --- > tests/sys/kern/ssl_sendfile.c | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) This test fails if I run `make buildworld' with MK_OPENSSL=no IMHO this test needs to be disabled in tests/sys/kern/Makefile for MK_OPENSSL=no -Wolfram --- ssl_sendfile --- /home/wosch/projects/freebsd-src/tests/sys/kern/ssl_sendfile.c:38:10: fatal error: 'openssl/ssl.h' file not found 38 | #include | ^~~~~~~~~~~~~~~ 1 error generated. *** [ssl_sendfile.pieo] Error code 1 make[6]: stopped making "all" in /home/wosch/projects/freebsd-src/tests/sys/kern make[6]: 1 error -- Wolfram Schneider https://wolfram.schneider.org From nobody Thu Feb 26 12:35:24 2026 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 4fM9sS4wDwz6TYPP for ; Thu, 26 Feb 2026 12:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fM9sS4B7Fz4Hv7 for ; Thu, 26 Feb 2026 12:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772109324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ns1eWDPB5MiI7+ql/xHIVjT0uyxvAWl3YxUCErToqOs=; b=FGJ/WSHnLm+0w6tbtrUH5Jmrz48czNCx8p9sV7tc2uN219xH2/G6pT9/woYnlINdIFij7z qZJ+PDSa5MCAP2VKfMpjBhQInJxYe9Vpn47AhJlwJ3yJcbUDN/LdjE8UtyGI9okO9qWCF0 BQUJRlmE7cPNEOpsmpWDUdAYWD6veeLPo8y5E/KlTuwevpDxKLKokfzVR2e7kRqXsCsSRd FEI/qNUUgDP129pMkgnaFQE1bs+fL7k7BpPo13N3kBDmxO2UPmK6rXyw0XRkeaFYkKSwbU 4jayiVkMS6ijy2GWsWqfI3WHDVnOlISmM1sLc7Q9b2du743+d39ZkWWPvM/Mvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772109324; a=rsa-sha256; cv=none; b=h0+lG96tUMrWRtNoZavpYfYU8u5bg4xCCwHqLmHV3oZQPr7NM0ykTeix6mOdWw1eUhkR5N EoF4P2T55IsG4Lz89H/sL7UUet0+z47TLEa1h7tu3ZwHFiWhzbXp4qsW/ivyTTv0ERacGK 2DZBA99Foy0sONYETs1FnLcVFa1fwcXoxE8SudRHyk0cXzFT2SS+wFpSt5lwHY6BtxbkuG R8NNlF/tQ/9doy9XX8rQ0VK+E1oeee/7nVvaVkKOBNvNjfDiq4f3k8XWi2Q8dRktdeq57g og8Nlj8IyrnBGfRTi843f8lPGOWOaQZNvNLV26o0uR/3C5kOLHMDrKcILqLOow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772109324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ns1eWDPB5MiI7+ql/xHIVjT0uyxvAWl3YxUCErToqOs=; b=g3r+ephfFBvVQLAq9SNInxnoizSD4PERHZIZL39pyYPzfvMa7hHJYchYjhuR6M2VlUyfeS 2nL6C1uNbkpeYgYn+hdIvnAAH/i9KKFjMbI/G5AIbGX+bTop2XUHdRG4DO688ksx6WJbus CitNSPAs9sFIrssBcHle38/9YIegKJ48T2pOSXO9djvNAxSTMTP088RGl8VyrjV7bvQOwh wwNe25ZvIgDbb2mrczhAHj/j4eJSdZEZzY/FHUcfO39s4s3YeCERwHSyGYP7tiXDTcsXDg P3VJ2Q38gMUsipi1/MOCBTUmq9t65FwXImoF2N7twId04hB9bLzU7Sk3qcBtXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM9sS3lgdzYP9 for ; Thu, 26 Feb 2026 12:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19468 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 12:35:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: ff6d1faa65a1 - main - rtnetlink: Add support for nexthop expiration in new/get route 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff6d1faa65a1a77d04746b43023feb457cfa27b8 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 12:35:24 +0000 Message-Id: <69a03e0c.19468.6b3899bb@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=ff6d1faa65a1a77d04746b43023feb457cfa27b8 commit ff6d1faa65a1a77d04746b43023feb457cfa27b8 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-22 17:46:12 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-26 09:37:14 +0000 rtnetlink: Add support for nexthop expiration in new/get route Before this change, netlink only shows nexthop expire value if route is not multipath. Now it can set expire time during route creation. Also, show expire time of multipath nexthops. Reviewed by: glebius MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D55442 --- sys/netlink/netlink_snl_route_parsers.h | 2 ++ sys/netlink/route/rt.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index 6b7a8188180d..70a12ad3ad74 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -53,6 +53,7 @@ struct rta_mpath_nh { uint8_t rtnh_weight; uint32_t rtax_mtu; uint32_t rta_rtflags; + uint32_t rta_expire; }; #define _IN(_field) offsetof(struct rtnexthop, _field) @@ -67,6 +68,7 @@ static const struct snl_attr_parser _nla_p_mp_nh[] = { { .type = NL_RTA_METRICS, .arg = &_metrics_mp_nh_parser, .cb = snl_attr_get_nested }, { .type = NL_RTA_RTFLAGS, .off = _OUT(rta_rtflags), .cb = snl_attr_get_uint32 }, { .type = NL_RTA_VIA, .off = _OUT(gw), .cb = snl_attr_get_ipvia }, + { .type = NL_RTA_EXPIRES, .off = _OUT(rta_expire), .cb = snl_attr_get_uint32 }, }; static const struct snl_field_parser _fp_p_mp_nh[] = { diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index dcd19b43105c..4d7f676d2aec 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -179,7 +179,7 @@ static void dump_rc_nhg(struct nl_writer *nw, const struct nhgrp_object *nhg, struct rtmsg *rtm) { uint32_t uidx = nhgrp_get_uidx(nhg); - uint32_t num_nhops; + uint32_t num_nhops, nh_expire; const struct weightened_nhop *wn = nhgrp_get_nhops(nhg, &num_nhops); uint32_t base_rtflags = nhop_get_rtflags(wn[0].nh); @@ -206,6 +206,9 @@ dump_rc_nhg(struct nl_writer *nw, const struct nhgrp_object *nhg, struct rtmsg * nlattr_add_u32(nw, NL_RTA_RTFLAGS, rtflags); if (rtflags & RTF_FIXEDMTU) dump_rc_nhop_mtu(nw, wn[i].nh); + nh_expire = nhop_get_expire(wn[i].nh); + if (nh_expire > 0) + nlattr_add_u32(nw, NL_RTA_EXPIRES, nh_expire - time_uptime); rtnh = nlattr_restore_offset(nw, nh_off, struct rtnexthop); /* * nlattr_add() allocates 4-byte aligned storage, no need to aligh @@ -487,6 +490,7 @@ struct nl_parsed_route { uint32_t rta_rtflags; uint32_t rta_nh_id; uint32_t rta_weight; + uint32_t rta_expire; uint32_t rtax_mtu; uint8_t rtm_table; uint8_t rtm_family; @@ -513,6 +517,7 @@ static const struct nlattr_parser nla_p_rtmsg[] = { { .type = NL_RTA_RTFLAGS, .off = _OUT(rta_rtflags), .cb = nlattr_get_uint32 }, { .type = NL_RTA_TABLE, .off = _OUT(rta_table), .cb = nlattr_get_uint32 }, { .type = NL_RTA_VIA, .off = _OUT(rta_gw), .cb = nlattr_get_ipvia }, + { .type = NL_RTA_EXPIRES, .off = _OUT(rta_expire), .cb = nlattr_get_uint32 }, { .type = NL_RTA_NH_ID, .off = _OUT(rta_nh_id), .cb = nlattr_get_uint32 }, }; @@ -851,6 +856,7 @@ create_nexthop_from_attrs(struct nl_parsed_route *attrs, { struct nhop_object *nh = NULL; int error = 0; + uint32_t nh_expire = 0; if (attrs->rta_multipath != NULL) { #ifdef ROUTE_MPATH @@ -907,6 +913,10 @@ create_nexthop_from_attrs(struct nl_parsed_route *attrs, nhop_set_transmit_ifp(nh, attrs->rta_oif); if (attrs->rtax_mtu != 0) nhop_set_mtu(nh, attrs->rtax_mtu, true); + if (attrs->rta_expire > 0) { + nh_expire = attrs->rta_expire - time_second + time_uptime; + nhop_set_expire(nh, nh_expire); + } if (attrs->rta_rtflags & RTF_BROADCAST) nhop_set_broadcast(nh, true); if (attrs->rtm_protocol > RTPROT_STATIC) From nobody Thu Feb 26 12:35:25 2026 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 4fM9sV1zPZz6TYB0 for ; Thu, 26 Feb 2026 12:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fM9sT5Xvwz4JD1 for ; Thu, 26 Feb 2026 12:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772109325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kBoaMqzp81CuGFhbrAr1nXs7UZ69Y8+g4sWPezuBQ5o=; b=gCGkHXutwnFFZy+Ina3PQTN9m0KCe7VCQZkFSVKqfYre3nj2dTNxwj2nq4FmVWIgvxce09 qnqGBVdYjjloulZFyIzutwpmenwN7JSLedy2IiE5aOpKnHH9mIbePa8XXzvo4KNJBa/YIf 6a0FBHs0mlKciqGrZNrQyGBWVqbtqspW/BSoVyMqjMlKW4ktNjPslFeaEyRf42TyDX9YAg ubjR3dFBV0SekwDJGAjl9RMHvk37HZb74YqDp8sbbaECDGCKhyHGbMYc3urwHJ0s+Annc8 tslPwsBtxtrmCur1ph5dAwYBt+GGGWVQmrE4blIUWzIgzu1xhJDm3MERk9W25Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772109325; a=rsa-sha256; cv=none; b=xGizXHstEoeawb5kvfvAMAiuTmWoPbCVOkKp3EMP1qKAS/afhPwfcTbOeXEB2VD8oWPf1g uN/NirQ6yRy0bnD/HQUqT0JiGPHdbscEBfONwUpDvFpAaPe+uKVQ/ri9ckDhu8JP19BndP l5nnqBNy484Lloios7IhkJzd0H3/3SuyM8yrLs3pPCBv5pPmz3djoq2KFcULVSLr4O7390 PHpJ8Gl5ItdfZw26dqS1GWRYtldWv1DEVpq1FS8VsXPL1+PM3fSiT0uIHbnR4GSDsSBHsU tCEqrRzL6aK8SidWyk3d3iyMZZIKVCKameapFcNZ7aXOdiisVReeFVr9U9SCPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772109325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kBoaMqzp81CuGFhbrAr1nXs7UZ69Y8+g4sWPezuBQ5o=; b=W8fvS0EN5Olu8gLg/iVnK7hLLoyAIoKC9D7O0O+sm5uGXLuzUyk01eCN1gSyVbQNLgsArL CHdlYT7wvvKedTsbr3Wq/wDthzMy8Khw5X4oTzgDrVOkwYbrYEdGNib9gbbM5wA9MmEXvT x8wFzbZpL1pZMseU6xDgetMqcmrWSC15DS5hRYFqes3rtfFxQPOQWPUidSomvBmQobKxj8 tqIkopy2BgBf3lYTovDCwG4euio6jR0Woyxho1lVnAAiID0BpgxDZXfcJdnQlhJsmTj2Py YSY7FMCnljxQfa0Fnwg7ASFHXtsCVQSN4l7tyOSKcyszDqBQegEcNkOiWIsPUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM9sT4b01zYPC for ; Thu, 26 Feb 2026 12:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19718 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 12:35:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 2f7cfeebcc43 - main - netstat(1): Fix expire column in -r flag using netlink 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f7cfeebcc4356d3bb85e953900ba5d3f75831ff Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 12:35:25 +0000 Message-Id: <69a03e0d.19718.7418763e@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=2f7cfeebcc4356d3bb85e953900ba5d3f75831ff commit 2f7cfeebcc4356d3bb85e953900ba5d3f75831ff Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-22 16:35:23 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-26 09:48:09 +0000 netstat(1): Fix expire column in -r flag using netlink Reviewed by: glebius MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D55440 --- usr.bin/netstat/route_netlink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/netstat/route_netlink.c b/usr.bin/netstat/route_netlink.c index e7b2a1964602..2c4b7a5c6b00 100644 --- a/usr.bin/netstat/route_netlink.c +++ b/usr.bin/netstat/route_netlink.c @@ -218,8 +218,8 @@ p_path(struct snl_parsed_route *rt, bool is_mpath) else xo_emit("{t:interface-name/%*.*s}", wid.iface, wid.iface, prettyname); - if (rt->rta_expires > 0) { - xo_emit(" {:expire-time/%*u}", wid.expire, rt->rta_expires); + if (rt->rta_expire > 0) { + xo_emit(" {:expire-time/%*u}", wid.expire, rt->rta_expire); } } @@ -244,6 +244,7 @@ p_rtentry_netlink(struct snl_state *ss, const char *name, struct nlmsghdr *hdr) rt.rtax_weight = nhop->rtnh_weight; rt.rta_rtflags = nhop->rta_rtflags ? nhop->rta_rtflags : orig_rtflags; rt.rtax_mtu = nhop->rtax_mtu ? nhop->rtax_mtu : orig_mtu; + rt.rta_expire = nhop->rta_expire; xo_open_instance(name); p_path(&rt, true); From nobody Thu Feb 26 12:35:26 2026 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 4fM9sW1Kwjz6TY3b for ; Thu, 26 Feb 2026 12:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fM9sV67SNz4Hp2 for ; Thu, 26 Feb 2026 12:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772109326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XoimmNYlzNV/o0kUX/vqzdLWAdxqpsX1WZV4I9hTLGg=; b=J5NC3y7CFEd/y5BlqhFfVfJ4lRWwxztMSR9oGIo4I+TeLgupTXjZuEiMK5LMvkw5Z5ZXE4 g9G9zB8Ob8yI8kmUYyccyUALfv1DnzR9963vy1xEXjJYUldyQ709ufd9BajCp5nTrZTCJx BeIGEweq8avegqu0CCp/Z8hGRB6oqhPTwmzeQWgjcvffdwyJ6SJCChgoTnnxGn29c6/rLw 6mXgMvl6joXy0pGVNgwewwl3AKK/ogWj1hZkvGsuW4agWJzF08K5zP3fKCdo108qQeYNwb pdi4emaVLkE3OJbItmi/Pi/hAd8PYo3F1C8riRvVfLWME2BIoqmqxB3ocKlOMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772109326; a=rsa-sha256; cv=none; b=KQPfOYENcx9THas17ejyznAkSCYbcvcGiGs1epNV7qpi37b+C4G4eG/snr2a841+GVwbZ5 3m/wq+0gXZQV2Fe0FC1MN9HsiWhVJsRtDQZ3ZqP6EOjNCyH7IvVNU7hZAhTA+cqVSC3+3s fcup75VQK/dlJUPjuHLdZ/6lsQY4DrLzTE5z6l8oYHinIIyyZ7+lcltLrhcuRKIYjDFfgJ 76dgXbnxmLYCDjmwN1kQuwquG7uRKOY0zKlrHb+AX1KKOLcn3KusBFTxHlzfmV1cVLyd+M YzRoytbo5lj9VxhK0Bk78/cPhpoV4j/vlNKAw1PaU4hNBgSiDcRZ4ugDED67jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772109326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XoimmNYlzNV/o0kUX/vqzdLWAdxqpsX1WZV4I9hTLGg=; b=cZJmY34rwbKAvmHLezxnIiXbozYdThGb3z2eOkaczSaYHzSzGE1upGUkiKvWuoZaxN02z9 5L0+4rQjkns8B+jlcqB8V29XlLO7JzbfFmf/gDGDvEDC/PtvHP6OyVmZF4wyZy9tQlthld a9q4BvKu1p3CzKkfnmTKnLVlC35IRjBoqPWogZqsMH/rmqKbLqCdIvPJQ64Sg2r1vvpiAG BVAS9ALVHMgww/EQ1nxdg4llbCCRTAGv9hZaL48LR22VmScc8Dqa1AKcNW87aFOpffZLHY X6CadDhL0v+KHXscusi7SAc+Hg2GTwRqU5pPypIpowDOTxwGzdLmSQx/OEHrNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM9sV5PqTzYPD for ; Thu, 26 Feb 2026 12:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eed8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 12:35:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 8230cf1aa18d - main - route(8): Fix -expire argument when using netlink 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8230cf1aa18d9215ee17fec743fc7c7c8fa2da13 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 12:35:26 +0000 Message-Id: <69a03e0e.3eed8.1a2b1f6d@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=8230cf1aa18d9215ee17fec743fc7c7c8fa2da13 commit 8230cf1aa18d9215ee17fec743fc7c7c8fa2da13 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-22 18:41:31 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-26 09:49:01 +0000 route(8): Fix -expire argument when using netlink Also fixes nexthop expire value on route get using netlink. Reviewed by: glebius MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D55444 --- sbin/route/route_netlink.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index ba22a2ec1e22..5dde7501d6b4 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -263,6 +263,9 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, int rtm_addrs snl_end_attr_nested(&nw, off); } + if (rt_metrics->rmx_expire > 0) + snl_add_msg_attr_u32(&nw, NL_RTA_EXPIRES, rt_metrics->rmx_expire); + if (rt_metrics->rmx_weight > 0) snl_add_msg_attr_u32(&nw, NL_RTA_WEIGHT, rt_metrics->rmx_weight); @@ -343,7 +346,6 @@ static void print_getmsg(struct nl_helper *h, struct nlmsghdr *hdr, struct sockaddr *dst) { struct snl_state *ss = &h->ss_cmd; - struct timespec ts; struct snl_parsed_route r = { .rtax_weight = RT_DEFAULT_WEIGHT }; if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_route_parser, &r)) @@ -385,11 +387,7 @@ print_getmsg(struct nl_helper *h, struct nlmsghdr *hdr, struct sockaddr *dst) printf("%8lu ", 0UL); printf("%8lu ", rmx.rmx_mtu); printf("%8lu ", rmx.rmx_weight); - if (rmx.rmx_expire > 0) - clock_gettime(CLOCK_REALTIME_FAST, &ts); - else - ts.tv_sec = 0; - printf("%8ld \n", (long)(rmx.rmx_expire - ts.tv_sec)); + printf("%8ld \n", rmx.rmx_expire); } static void From nobody Thu Feb 26 12:35:27 2026 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 4fM9sX10Xlz6TYJc for ; Thu, 26 Feb 2026 12:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fM9sX01jfz4JPZ for ; Thu, 26 Feb 2026 12:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772109328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EhavhlUZ153lDHYQcVPbFpAQfxg4VfPz/3aWT54PRjw=; b=mBKvDL0AHpd+wZs6WMPGTPUaMfAaaKUN4hlBGkvGuJAedNNEjd8meGjVjWhCp0PBv9Zmq0 riGs1rscPsPp+pfTKpobC7EVmA+6BzjZIJjrCCkWL3D4u2h2wsI28becnmm1djzenm9jZh iVGT+EfbXnLWye45w+MS24BX4qNyFzHM4tzwCmxJbV/uMkUBjyBFaEuzdQlCcKqrWgXaai U4LBEjacDc62cUzM91zouEPsrGOoLBW/DAJlHINru2DPCWlInqiP5nPSQadZQN2iRqhCu8 cUKnd0r+q55iDUKz2oUQWGjiVV/VXfSAs86iMS6RwsVuLLuhoFUs1Lds2xp3iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772109328; a=rsa-sha256; cv=none; b=NmF8mBVqD7xiIWT0ZC6zbRTJU70UbfPtfovJBphmfYdyftFz85WWEMl9psOmRYtjY44OoG 6clQsZFPTGfBI8bMWW+llBDqPkKwpgbosQ5AftP9DPXadK0nKGGtlMZ/26lXQ4w/0vXfIT RUFbaqBq7Z6CgbRGbJWzpnttIpRyDI3jpJZXL8frmrHpU0j8Ts8GzFT0mSR1Szhs+VKwky Z28vVv0+BhwbnAtWMyUZf5E4chdsmi8sWc4xBukJazH1xCHSI8DPwSwftVqTQYsNXW1Dd5 3T+2IFu+DzalUx1NFZmwZNZcLRrOa3dKk1M+qa9aAGOv3byVpSyGc+I6XthLgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772109328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EhavhlUZ153lDHYQcVPbFpAQfxg4VfPz/3aWT54PRjw=; b=odX+9u/LnJo6EtJzOlBzAlh7our6gS+hYhE/SEfExgMSs0LasUfpRYqTxUdjQQrgOPvmy3 bnGVYqqaHh7qukLk85s9QWJKViu8D9X/c/xsrn/IVbUj18kwzTxzrKuv/h/r/7hvIBEMqs gKA1RpucJ8eyLknqmMwt4XHzBOX5PNBbL4DagF/Ki1Cf5l4xnekN7AyAKSCKS2HFQjTX1F ukR5XBe+H6dJK9gePIlYOCMqF5jw/sDFETdWb9YAsSp/o/iFBhhNvXz6n0VZCVBcKJbej0 GXl3u44dFozp8PI3YChfa11JqC6GOQI/Xt7wTR8RtAHqJWUe7gjHCLlyl0fIWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM9sW6M7GzXWB for ; Thu, 26 Feb 2026 12:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f3fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 12:35:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: b5366f8e138e - main - route(8): show expire time of each nexthop in monitor 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5366f8e138e223d85d7c9b71f0a0384f5d55f29 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 12:35:27 +0000 Message-Id: <69a03e0f.3f3fe.5651a349@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=b5366f8e138e223d85d7c9b71f0a0384f5d55f29 commit b5366f8e138e223d85d7c9b71f0a0384f5d55f29 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-25 16:45:36 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-26 09:49:09 +0000 route(8): show expire time of each nexthop in monitor Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D55514 --- sbin/route/route_netlink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index 5dde7501d6b4..e3ddbf81e62c 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -488,6 +488,8 @@ print_nlmsg_route_nhop(struct nl_helper *h, struct snl_parsed_route *r, printf("iface %s ", link.ifla_ifname); if (nh->rtax_mtu != 0) printf("mtu %d ", nh->rtax_mtu); + if (nh->rta_expire > 0) + printf("expire %u ", nh->rta_expire); } if (first) { From nobody Thu Feb 26 13:47:36 2026 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 4fMCSp1nW2z6TgwV; Thu, 26 Feb 2026 13:47:38 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMCSp0zb9z4QkD; Thu, 26 Feb 2026 13:47:38 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772113658; 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=iSMK2nQjmgLp7CgX9vY2KBeZ2NPFwhNNML+iC0TuCEQ=; b=WJWkjr4b1QZzq/JW6VjrXbOSx4JvAaLnutNAwNl6fZIg8iELd6AXO6RlJpJJQgZjKTfJAM m7oezWhRDf3aS9kN5IXrZirFKW3TzwNer8e92w8jp9um8VIsDJy3BK6NNY8ZqSdKo+8rjm Uv+1bMAWf/qGl9lnUWReX85Aajm7+za13NPmBbHdNQ+YXunK1+4mzi0knATG7+r5ArRwdf rKNka5OyGn5wAkz1HDtAbMIj1qFOMNnkXnsOrylbIPadviAuvkNwx/7C0vt/B3Jh8gr8KL 2nf/HQPmiHSpTCiEw8ujzhMls/zserX7BH8ViSK0DuHHoNpmF/sS+GxP9KNE7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772113658; a=rsa-sha256; cv=none; b=rR42l8Y6z9pnui3sQSpRRyU59WoWBWyR6cgspdT1/JXogrgt3xWfzFuq7k/201tBmGrLFt dx+di2bEondpgwHLjeo2Bbvg244LOSMzqNcvL/fySQ4ojIbms2BUDG5ucqHjB6fhxZ01uz 6bQc+O/K94qbpauB530lg3DTpPgyga50+7IfdXGzkkgg4vGDwDqktoghdeNJ+d09qTfGQL izp1d9iGWCLlmWYcfWdws3Jk3DhAX2rZHTlIXOdg97on2ePvcq42hcicmYuB+2809ezsZY jHHzmyhZbnv9MD52C5EvF/0ixBoBxIiQ+Rn4b3FD2BdDYA8yQdKXkisQO785Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772113658; 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=iSMK2nQjmgLp7CgX9vY2KBeZ2NPFwhNNML+iC0TuCEQ=; b=jx+im9SmbWFVss/gJRDl9WY2mmJAHARRAPKOnlLiVm7mOLsGQj2Hc/Jin6DlmiaOPnuPUc wijtT/3hzcq1o8oYy44+n+Si+z89mcEISnDvWV1WuE9tXZBcxl5kpg9WA+tXWBuxY2QJxw 9f9ZiyKCMZhSPT4erFE/fRMkA/7hrPEoh6tTuJ/p1nZFCiEhKqoaPmXhp6kPuQLu5Fl3bi erB2qnbdFaGgD+tynxQvPg7SqiUXLsVro6gbBlnusavGqsRNzMjMo54r0IcHoNx+4HI/4c Px3/YWy++U9iVYxz6hhWp2f1kbe77s5RdOoMYIKaKdDLdA/kc3hznEzvBFcIIQ== Received: from ltc.des.dev (2a01cb0585090500922e16fffef1acef.ipv6.abo.wanadoo.fr [IPv6:2a01:cb05:8509:500:922e:16ff:fef1:acef]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fMCSn6TVdzsxh; Thu, 26 Feb 2026 13:47:37 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id B9B9FF7348; Thu, 26 Feb 2026 14:47:36 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Enji Cooper Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: f224591746bd - main - Add ASMC_DEBUG make option In-Reply-To: <695c68c6.3ff5d.593fc2c7@gitrepo.freebsd.org> (Enji Cooper's message of "Tue, 06 Jan 2026 01:43:34 +0000") References: <695c68c6.3ff5d.593fc2c7@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Thu, 26 Feb 2026 14:47:36 +0100 Message-ID: <86342nr4zr.fsf@ltc.des.dev> 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 Enji Cooper writes: > commit f224591746bdaf14ad5f63de4738a3146cc2f55f > Author: Enji Cooper > AuthorDate: 2026-01-04 08:27:57 +0000 > Commit: Enji Cooper > CommitDate: 2026-01-06 01:43:04 +0000 > > Add ASMC_DEBUG make option >=20=20=20=20=20 > This allows folks to enable debug statements in asmc(4) using kernel > configs via the `options ASMC_DEBUG` directive. >=20=20=20=20=20 > While here, remove a duplicate `device vt_efifb` directive in `NOTES` > as it's already handled in the `GENERIC` config >=20=20=20=20=20 > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D54511 > --- > sys/amd64/conf/NOTES | 7 ++++--- > sys/conf/options.amd64 | 3 +++ > sys/dev/asmc/asmc.c | 20 +++++++++++--------- > sys/modules/asmc/Makefile | 2 +- > 4 files changed, 19 insertions(+), 13 deletions(-) This added asmc to amd64 NOTES even though it's already in x86 NOTES. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Thu Feb 26 13:48:11 2026 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 4fMCTV37DLz6Th6x; Thu, 26 Feb 2026 13:48:14 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMCTV2f6Bz3C3V; Thu, 26 Feb 2026 13:48:14 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772113694; 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=4jKqF9rHYNJaqDlul3FDuid0ar/ts7yTKXPy5csCVAw=; b=sngsqV0SctITELA/el61MmJ30XUocfLGfBECtZegMEtwFMKrbrhicnWbGJs33QWoCxCi6v ejzgbDFNJ0u6npEhOWWq/RovsU+pzS1ZKFPyuDIE7DHht792ftm6OLw5NlfY+Okvmh7fDf OUqOy9lpzHpss8xIif17LQaAIxWwZOB/Cdkr+7ii1ngbXcvIFJ9WKY69vGmdDK3VOiEFdJ 52ZQ/CTabXTJz4S3k/7FcpIcp+XXAiew9SJS8+HB8WRmJWxmAYn4SbkMZHWiNXfZOR1GcM Jyz9oRMFTHoFNNHrxgNOO8xeoosboTWLHfWytzAPUwFvnxW4gWAwnOOVbq76PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772113694; a=rsa-sha256; cv=none; b=DgXzR17TL4clKX2YBb7d60H14Zz/GkzOY82Z9wQNFyB5QEY547MjTNtkSxruMLsKSCAqA7 +Eq9DIcu+IkkzkNQp1m/QchOcKhjQCSonZ0FRHBNECgIs1Fq1T2pXirxN6+9ZUk4gIP7IO wxdrSLVLtrSUquMMW/+4KZUXsMIlDB1gFtMRKEU6c5OlmmPi26iRH5M90guDhjGqAm152W rPLrgZ42Ie0hLxklatyzChMURlL6MORZe0gCQo7FJ5DHEzcCamKp/J2iLVx8g0dD5IjPBv RH/D7Ax03N7gtNsB25FZdWrkaRuRYO8tA+4R2IyGh/6tgOLILMuA1odHvdr4ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772113694; 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=4jKqF9rHYNJaqDlul3FDuid0ar/ts7yTKXPy5csCVAw=; b=eZRpKbmu1BFkE/doy3zeHv7+7bvO7d178gs3Xc0ttxA+UqmI/kg6b+hFIw7jGJWVY44vPj xvSg9PmCtz1YK2YHF5sunEphjuR1EQ4IcoS8UqR6yjD135aTzZbf2vtEutR2lpqbvYpmi0 mssqtAoGt3m57lfYBhx9NqWAzZPvEYwIOa9BS/MWNvplFNLV3zz7uaplTBd/FDtsD+6rjL Gq7r9dAlMP15B9A1URrzuitpibLKeFLtUAyg2GbuhLRtFsI1GYZzc6Z5K7ixS13PSrr+F2 CYpsPWIYVoBw21e4q568ArzafisruiLc/2dxFHCSWqvKkU6+VE+M5XR+ZFtXAQ== Received: from ltc.des.dev (lfbn-nan-1-698-103.w86-236.abo.wanadoo.fr [86.236.35.103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fMCTV1Vf2ztgv; Thu, 26 Feb 2026 13:48:14 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id E5EEF110909; Thu, 26 Feb 2026 14:48:11 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Olivier Certner Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8342d9f7b5f1 - main - asmc(4): Stop building it on i386, as it supports only 64-bit chipsets In-Reply-To: <6964e659.38c48.63bb6fee@gitrepo.freebsd.org> (Olivier Certner's message of "Mon, 12 Jan 2026 12:17:29 +0000") References: <6964e659.38c48.63bb6fee@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Thu, 26 Feb 2026 14:48:11 +0100 Message-ID: <86v7fjpqec.fsf@ltc.des.dev> 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 Olivier Certner writes: > commit 8342d9f7b5f13d0623861cb8b88caf10a15571f6 > Author: Olivier Certner > AuthorDate: 2026-01-12 09:37:24 +0000 > Commit: Olivier Certner > CommitDate: 2026-01-12 12:16:38 +0000 > > asmc(4): Stop building it on i386, as it supports only 64-bit chipsets >=20=20=20=20=20 > Reported by: ngie > Fixes: fde9fe18219f ("i386: Fix kernel compilation after int= roduction of ASMC_DEBUG option") > Sponsored by: The FreeBSD Foundation > --- > sys/conf/files.amd64 | 1 + > sys/conf/files.x86 | 1 - > sys/conf/options.i386 | 3 --- > sys/modules/Makefile | 2 +- > 4 files changed, 2 insertions(+), 5 deletions(-) This broke i386 NOTES. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Thu Feb 26 14:41:40 2026 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 4fMDg85bkGz6SYj7 for ; Thu, 26 Feb 2026 14:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMDg84TNBz3JQ0 for ; Thu, 26 Feb 2026 14:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772116900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wgutcRhlV6myUGAbM7MKhV16ScFk0T/hee8btMO+uNs=; b=WhCq3qq+FSbLCCdHThSUqdCb0xeBjncHG+bk8lU7gqrzcjjzzLXCqSYmBNQlZd98gLSqo+ j1A1NuxEZWgrpwRafyKjrD+O34eGhEcPLN4yPlDuyxYKyRsNAvWLn66O7lxNBQ41XShLL3 BSubkElIL3iksH+4gKnOIOStEyBgZoSEdJMqccvnUsA/vjIZ9/bRlXfxjJbgZuDKaGg5EN Ofvwdw+d8IVzvggifK0T1CECVrbBIZWNBuOO2nCgMuYiJ4AT/yiLqqHE1rs6Bhm9vB/mt7 slnFqd2FYXw/z0rS3tTqJF1wSo3vWjinwXrUvOpLbY3GKS6VcI2YUw8oATnrgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772116900; a=rsa-sha256; cv=none; b=j6Idlf9qHch0tI++V2VYhIoDGX7eoblmHCg3HmnHoevImXjLajj3Xwy+YlWQMxG55usvMh AIyGY1Wx1KZDAGa5kjJEm87ueQg19vKZjOZsObTHfnJP86z2o0NlwXm2r4k/P/Yxcuj1Q1 8z9wLwPrG2Y54dylP6locytqm+6/qleSb0y1u08Rcun4WX6c2WSUCocei4VwHe26RI/bs5 1+IS3Hwu39TyWH+aa8ptlGGx9Ch+PgvNE7jCDCBijW1tVqlFNoDuA5WrnicQ1UKqx9n+sq B9nc8zlUtxCgriIkX63436mLOPneY+FZ+qcwNbENcUtxeUzRWBxGxmLJ7b9fsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772116900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wgutcRhlV6myUGAbM7MKhV16ScFk0T/hee8btMO+uNs=; b=iCpn5g2JRijCXwafjp0yRF71899C2gBqEol58MRzrs5pu4eoeb2j0euHgZXftb5OcTouyQ yh/pubUZn66otf7GaZo/50sqWIs4G4BTuMmHagz5Y1sdS2X0R4RBbWMnH1ZYzghyvjhfC4 cTX3oHKEZ4QmEGsLBXLSIN5kGyKfuOh6ONMFWSZglWff4NfhNheE8KjDMJTub9pJLx9YO5 mmw0Fop8JivVOl5NvcY+umytWizWJ9TmQMwURuHIZRG8RclDbnQk/XkagXmKuHOpfMr0aC kSDNYm9sAMeA+ZbEt2/Kb8IEFX/KVXb0tbhQgKtcLCmX6GtRP+33t9cbp3WbMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMDg83s83zc6D for ; Thu, 26 Feb 2026 14:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25d5b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 14:41:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d971bc5220f7 - main - elf_common.h: Add AArch64 Memtag ABI constants 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: d971bc5220f7adb8a2bdfadc8e3ca7ffcf9ca843 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 14:41:40 +0000 Message-Id: <69a05ba4.25d5b.4f9d2194@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d971bc5220f7adb8a2bdfadc8e3ca7ffcf9ca843 commit d971bc5220f7adb8a2bdfadc8e3ca7ffcf9ca843 Author: Ed Maste AuthorDate: 2026-02-23 21:23:49 +0000 Commit: Ed Maste CommitDate: 2026-02-26 14:28:19 +0000 elf_common.h: Add AArch64 Memtag ABI constants Obtained from the Memtag ABI Extension to ELF for the Arm® 64-bit Architecture (AArch64) [1] [1] https://github.com/ARM-software/abi-aa/blob/main/memtagabielf64/memtagabielf64.rst#dynamic-section Reviewed by: andrew Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55486 --- sys/sys/elf_common.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 42252d2e21af..b1ddbaaf39ab 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -471,6 +471,9 @@ typedef struct { #define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ #define SHT_LOPROC 0x70000000 /* reserved range for processor */ +#define SHT_AARCH64_MEMTAG_GLOBALS_STATIC 0x70000007 +#define SHT_AARCH64_MEMTAG_GLOBALS_DYNAMIC 0x70000008 + #define SHT_ARM_EXIDX 0x70000001 /* Exception index table. */ #define SHT_ARM_PREEMPTMAP 0x70000002 /* BPABI DLL dynamic linking pre-emption map. */ @@ -705,6 +708,11 @@ typedef struct { #define DT_AARCH64_BTI_PLT 0x70000001 #define DT_AARCH64_PAC_PLT 0x70000003 #define DT_AARCH64_VARIANT_PCS 0x70000005 +#define DT_AARCH64_MEMTAG_MODE 0x70000009 +#define DT_AARCH64_MEMTAG_HEAP 0x7000000b +#define DT_AARCH64_MEMTAG_STACK 0x7000000c +#define DT_AARCH64_MEMTAG_GLOBALS 0x7000000d +#define DT_AARCH64_MEMTAG_GLOBALSSZ 0x7000000f #define DT_ARM_SYMTABSZ 0x70000001 #define DT_ARM_PREEMPTMAP 0x70000002 From nobody Thu Feb 26 20:26:17 2026 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 4fMNJt3hpHz6TLF1 for ; Thu, 26 Feb 2026 20:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMNJt1QYFz47mR for ; Thu, 26 Feb 2026 20:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772137582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YbnIaa4baEadhUPKtEIP2XtSzWGc1nzBUxHAUqEH30I=; b=TC7NzSz7AweQr+LgK8gd7BdvLUsbgfr87G7N1YFSAtvfKbpOY/xihY9CP10uFUOgmL2RYN DHXZp7829NHWgWGKdbT8Vdn1zQhty1MQyDIeixA9WXEdKp+YrGE2qUbLI00xzBp0T51yRU 6nvIrA1FCmOh684BUjXXvcmtBVtD0kAxeP6U0PDLR9Whrs1dZ1a7S0oSo5QvzlIIMj9UrL ZfRDgI6C6O5/vaa+ySH3TTfGZYZGky6NdFNgazDY6z0pxZN91lOP5m/Er+JS4VM6hSCqTU q/kT2e9HRaD1efefmHXk/Rc1Kw0fF47EFWVYOQkGSkrN+rqyIIH2pYNAQ+uswQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772137582; a=rsa-sha256; cv=none; b=go7TkfqNTwzkUri/PrWUjXZvMEGRiwygqbtP2x5SxJOyIgA12H/Il8vUrw93LpmnYQ9/M0 3FoTeaUtiySKxMmvT4oSrjp2/+KQMesw8CTgnoUT41JT0HbzWbhFz7TXkUodHlzRtST3gU CaPvGQ32SvEOBOc/QMw5JEJFBGYyoV4vhinoBNPBUFIsLqXTTr8T24/+68NeXM3pGgAU42 rfk8eUKS696ZJdgLdHQ383yxIT5B10lbgdNKWWSOp2VVNOtI+TxzhAUch3176Uup1Njeyx SkPqrHW1aAWzrDrwcJvMOY4/an1LDWZaFPkvW5tyP8DJ+yoUiDppizqXhWikuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772137582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YbnIaa4baEadhUPKtEIP2XtSzWGc1nzBUxHAUqEH30I=; b=g5GQ/olATy+feXjlg1R1mnBBV/PfNTVVrwVfWpZZJ9XbeUQoEhoPxteg59jumRxzZ2AwDY MhGxOFz9inHOLPjwblMJLmSUwlB0T/sXdE3xoIM8UMLErhVT6x5KGd3PeMf5b6slpmK+Gi BmoavnvQWn5mCFoFmby/qH9cMfpaK+Z6sfoDWZwzzOHpmZBbZsh3rdIBd1q5QsRPhjKA3z frLCBo0hCV0ynjy13RcKLWPHY15XoWJrIF86B/WqpUzhMrDofZoJEhRry0T8lOhPhal8SY pKVizA3u5RAWJpl9WNx7nML9v2CvEkzAXUHox4AEAkXk6H+81bcfmdU73ip+pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMNJt0XsPzmmC for ; Thu, 26 Feb 2026 20:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2360d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 20:26:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5547a7bb39ac - main - divert: Use a better source identifier for netisr_queue_src() calls 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: 5547a7bb39accd8f151b53e90b41d13b55f84c95 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 20:26:17 +0000 Message-Id: <69a0ac69.2360d.f48d28@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5547a7bb39accd8f151b53e90b41d13b55f84c95 commit 5547a7bb39accd8f151b53e90b41d13b55f84c95 Author: Mark Johnston AuthorDate: 2026-02-26 20:25:35 +0000 Commit: Mark Johnston CommitDate: 2026-02-26 20:25:35 +0000 divert: Use a better source identifier for netisr_queue_src() calls These opaque IDs are used by netisr to distribute work among threads. The mapping function is simply SourceID % numthreads, so using socket addresses as source IDs isn't going to distribute packets well due to alignment. Use the divert socket's generation number instead, as that suits this purpose much better. Reviewed by: zlei, glebius MFC after: 1 week Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55537 --- sys/netinet/ip_divert.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 9f1d862a0531..2b85bd4a50bb 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -502,8 +502,10 @@ static int div_output_inbound(int family, struct socket *so, struct mbuf *m, struct sockaddr_in *sin) { + struct divcb *dcb; struct ifaddr *ifa; + dcb = so->so_pcb; if (m->m_pkthdr.rcvif == NULL) { /* * No luck with the name, check by IP address. @@ -540,14 +542,14 @@ div_output_inbound(int family, struct socket *so, struct mbuf *m, m->m_flags |= M_MCAST; else if (in_ifnet_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) m->m_flags |= M_BCAST; - netisr_queue_src(NETISR_IP, (uintptr_t)so, m); + netisr_queue_src(NETISR_IP, (uintptr_t)dcb->dcb_gencnt, m); DIVSTAT_INC(inbound); break; } #endif #ifdef INET6 case AF_INET6: - netisr_queue_src(NETISR_IPV6, (uintptr_t)so, m); + netisr_queue_src(NETISR_IPV6, (uintptr_t)dcb->dcb_gencnt, m); DIVSTAT_INC(inbound); break; #endif From nobody Thu Feb 26 20:31:19 2026 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 4fMNQb6FpLz6TLrP for ; Thu, 26 Feb 2026 20:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMNQb5RnJz48bR for ; Thu, 26 Feb 2026 20:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772137879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Az7p8FqhI+4+KxgwZAu/I1CH13upcuUhQ46l0zpBPjU=; b=Vb7D+DSErTp0duc9y44Hv/htqs2Jo/tGr7K8bK6GrrhtXQwP3iHFmewLrBVdBxsGCHzNYh IUUCIwC6gFtG3t9CaIuY3lShRo/s8GVT/jORIK8dfpTYKkF/W9UKIPIS5a8+pZQevUMY+o 1JADy/VABhJO2RL5u7mxHoQtudK+3Df3XkU1xBU/I0ThblYu8ND8dGWMVcSTx8hEKCMeHK J6V91MZYYaDTZ0VKrZA2dk4x8BkO592HDgbU5N7lRSIQ/uDVIzxWx6sincHX6PBLjhrIbJ htgquJUmHsu5oMk1kCvJlwZkqMKm4GiFJWLtiNamer0wb9Zfm0yC9yb5pdt1PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772137879; a=rsa-sha256; cv=none; b=EPMRHUaCujCjBuD3jalLcTdfYtwjCLLzeDPqK8ep1V37QiOzktPWAwEeBYNXkPvmbUdHsQ 2O9YGw4FFxPeOzudoBFUL2pNDaNlVBMFgJaA14QUYN4/EsyzYxGCmg6UrOVdXFjs9pRoTE JlJ6oSOmum6fOZG+6FZkPS76MXF/p8M2jjvh8MdJem1CH6wkY9BQGK7XsoVjzujBSJZPlV C5BmXg9lkBZkRFwXa9ViH2n2lxhnDqEJdakW55W+2ixyz3JiQKAgWpopGRR05mQpXKWcL5 rH3D51S9so1U2sOrleWmpjU/SJSPzyZQqw/9jDkB4e+qV8A2eMPHECaGNq7Vcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772137879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Az7p8FqhI+4+KxgwZAu/I1CH13upcuUhQ46l0zpBPjU=; b=rK3xcYXIf14reSbJ2spaFwd2zZEH564FlPZVgEKeFibNlWQUi8eA4MOIc1qgDbGTn/IWSZ NCAmK6UbuDxPBFpIfiJx/SxrYDocx2mvtxXcwXzesThF6NDPJDTsWws/RBzUqpxd6ITnDI w7/Ybqhv7SF6C+SEgYVhDZNPBQmOTqDkTn53edUH6IkZK9iGXssrEAnFi5EWNdGFfscTMu pIbH2bOKAzl405M64+I6BT2iJ0AwIZINKde02R3cladFHMl//6OgrW4Kcvb6AhxEXBIxMc r6hNrcTWusJrHXCj9sj6nCvNjAWBkh8mKHWnPPQVehOz5HPa8exhI8SJ69c04A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMNQb4rL2znC8 for ; Thu, 26 Feb 2026 20:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 223c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 20:31:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 73d9153fc57b - main - tests/kern: put ssl_sendfile under MK_OPENSSL != no 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: 73d9153fc57bcfb665a4867cb1adc8fa0a8aaa84 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 20:31:19 +0000 Message-Id: <69a0ad97.223c4.55b13331@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=73d9153fc57bcfb665a4867cb1adc8fa0a8aaa84 commit 73d9153fc57bcfb665a4867cb1adc8fa0a8aaa84 Author: Gleb Smirnoff AuthorDate: 2026-02-26 20:30:18 +0000 Commit: Gleb Smirnoff CommitDate: 2026-02-26 20:30:18 +0000 tests/kern: put ssl_sendfile under MK_OPENSSL != no Reported by: wosch --- tests/sys/kern/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 7dfa62ebb229..6d59a752bb4f 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -25,6 +25,7 @@ ATF_TESTS_C+= inotify_test ATF_TESTS_C+= kill_zombie .if ${MK_OPENSSL} != "no" ATF_TESTS_C+= ktls_test +ATF_TESTS_C+= ssl_sendfile .endif ATF_TESTS_C+= ktrace_test ATF_TESTS_C+= listener_wakeup @@ -50,7 +51,6 @@ TEST_METADATA.sigwait+= is_exclusive="true" ATF_TESTS_C+= subr_physmem_test .endif PLAIN_TESTS_C+= subr_unit_test -ATF_TESTS_C+= ssl_sendfile ATF_TESTS_C+= sysctl_kern_proc ATF_TESTS_C+= sys_getrandom ATF_TESTS_C+= tty_pts From nobody Thu Feb 26 21:20:10 2026 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 4fMPWK1Rz3z6TRb1 for ; Thu, 26 Feb 2026 21:20:29 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) (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 4fMPWJ5q4wz3H5d for ; Thu, 26 Feb 2026 21:20:28 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-3567e2b4159so665171a91.0 for ; Thu, 26 Feb 2026 13:20:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772140822; x=1772745622; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=bLKtSa7wqwoglG1jLkoCpt+m0Y4pKCmx8DkE2+ieQO8=; b=h3ZPoXIvU0vve7v00a9EMndPC581Gzs0Ufw3vFTcUuZyrdz4ZGnYcWttUWvTHOTmLO DtFMU4UuQyRL7K+WzQvyFXvUm8pwvDgTdG5vBt6aXSvTSW7Ss0zds/l3k9wLNhcw1FOZ C9PAyr09iR6+lAP+zjEJHxFsnGsHwkSFw9k8WqBGachmXvjg283QiRfrp9FbBBvizbl0 kh6bR3of1rCcMXSMfpMu60PgLkwQvfESXsqLZsIULDnxoKA/ckJUYjKWystvklhpwZGd gbpFQU1QlAdxY5xqZ3EJFJs25/iDDJtoijkd+wVJNxAQvkIxXbS0lPEzfDMA8LmhAR5X MhTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772140822; x=1772745622; h=to:references:message-id: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=bLKtSa7wqwoglG1jLkoCpt+m0Y4pKCmx8DkE2+ieQO8=; b=ihBwX7VLzMvZOx9HccfpTmXXGrRUurEoFTcOy6A6tn7ix+DBx7katB/m8+TTzRNcBy qo8N38dwAvP9mAYDPSzLq8h45x4rYaCHU5Dn/f6zN/oGriMolUuiQw3iL2kx5V7kr4BJ JpSjqZifjpxVW71l9tWIV/eZf4dk+mr9lWdi3hBICRl9b9olYckmctrjHabC8h7ldj56 WqwL9nr5HjtIv5I/juQzLOEAglbmDZqJOmZ1M+K23FPrKXkkCbb+mfRrT/YthktaDG48 2fFzRJCPi1foh7s4Rvp0Zu1pRprrcnRL2ZjUsj4/Q4203Ldkt9A5BAr5aObQywAweJqK mn/Q== X-Forwarded-Encrypted: i=1; AJvYcCXsrx0McG1MgFLihrddu+q79QmF9pdoajL02VIckEo1+4IkHod/eiimtSZZstf+ndJezQylXxPC9klEDJIZ43KXOsWUnw==@freebsd.org X-Gm-Message-State: AOJu0YwM9pKEhGWmK1VFvGIJQL13giu8Pe2sJFiCZ4v7HA1uaBDZL9AX pCmi78KSVrtPhzCp2wK9syXerWJR+sjgDwoA7kv7mymJaCq+hY7xGpTq X-Gm-Gg: ATEYQzyfjRFekC7xGYBo9v0JblTsHF2FUzxqCNxoscCUy/Jno7WuuLm82DtZuxwgaZ/ wWlSByGndJOMNKWKRCxzHvBZeAAD+wh5bBJo4OghO+/LRlH1BejPBIZAIizld5xvWzdb7ej7vnj mx8DO13qPHIYwueCTb1C3jZENt+pUPRsJ5IcaIV6bsFdfuOWU76H+DJEx1pnwBDEYO2CZ+NgO3M C7V7WOXcFOyEzWT8cZqAI8ZwxSoaXRlDynmzSxNk0u/DyBhHyMedOuRREb0wb4E/yhM/Ng2Q5fA fFnmNPPdi1nnwnnjrrpkFUoxGuw37VeRDFfGkBwDmgJbZsis9md21f7p5pjWaB3ceI/giRiuvpZ AX4hH+35jthEFeBwDOj9tqgr/oH7Ure7srdciSLPqHwPUa6u1oTJQnzPSR9XcmtVIO/dmx3RDZD NBGH7zBZ0WHc73DwJrw5VdIMpuA0Oc/D/ifLuWEqRjSg== X-Received: by 2002:a17:90b:2d43:b0:340:66f9:381 with SMTP id 98e67ed59e1d1-35965c4e541mr457218a91.10.1772140822354; Thu, 26 Feb 2026 13:20:22 -0800 (PST) Received: from smtpclient.apple ([185.153.179.83]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359037af167sm6821859a91.15.2026.02.26.13.20.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2026 13:20:21 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_EBD7356F-7BF2-4953-A96B-712F9385A840"; protocol="application/pgp-signature"; micalg=pgp-sha256 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.1.3\)) Subject: Re: git: f224591746bd - main - Add ASMC_DEBUG make option From: "Enji Cooper (yaneurabeya)" In-Reply-To: <86342nr4zr.fsf@ltc.des.dev> Date: Thu, 26 Feb 2026 13:20:10 -0800 Cc: Enji Cooper , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: <9949840A-8EB7-4ECC-A4AE-7774AC63DC42@gmail.com> References: <695c68c6.3ff5d.593fc2c7@gitrepo.freebsd.org> <86342nr4zr.fsf@ltc.des.dev> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fMPWJ5q4wz3H5d X-Spamd-Bar: ---- --Apple-Mail=_EBD7356F-7BF2-4953-A96B-712F9385A840 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 26, 2026, at 5:47=E2=80=AFAM, Dag-Erling Sm=C3=B8rgrav = wrote: >=20 > Enji Cooper writes: >> commit f224591746bdaf14ad5f63de4738a3146cc2f55f >> Author: Enji Cooper >> AuthorDate: 2026-01-04 08:27:57 +0000 >> Commit: Enji Cooper >> CommitDate: 2026-01-06 01:43:04 +0000 >>=20 >> Add ASMC_DEBUG make option >>=20 >> This allows folks to enable debug statements in asmc(4) using = kernel >> configs via the `options ASMC_DEBUG` directive. >>=20 >> While here, remove a duplicate `device vt_efifb` directive in = `NOTES` >> as it's already handled in the `GENERIC` config >>=20 >> MFC after: 1 week >> Differential Revision: https://reviews.freebsd.org/D54511 >> --- >> sys/amd64/conf/NOTES | 7 ++++--- >> sys/conf/options.amd64 | 3 +++ >> sys/dev/asmc/asmc.c | 20 +++++++++++--------- >> sys/modules/asmc/Makefile | 2 +- >> 4 files changed, 19 insertions(+), 13 deletions(-) >=20 > This added asmc to amd64 NOTES even though it's already in x86 NOTES. I appreciate the reminder! I=E2=80=99ll send out a differential for this = soon (I removed that entry on one of my git branches). Thanks, -Enji= --Apple-Mail=_EBD7356F-7BF2-4953-A96B-712F9385A840 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmguQoACgkQGpE5DjPs NJirnxAAnQ+wIgInrO9zwshdbvL8F0LyfTcJ/rvGAA0pkMO1t4bANrlnm5bojniJ D/dWidKyWIah/zwjuO88TVFS+/N13UeCcNtv/E+QrtmSRIwl2H8Ba6cnb1PuhCuo cSMWEa2qVPKrFDs05ZUAmQwJq6uBoOmIlgZtyYNefZo4V+Uym9weR3ghGxQCAcjA 0Jm99I0TscO/S8A8+ckm4WSgWPftC3JEohjzgejYnG2WMGCuUCiJx8PIQohCJOkT rMo1nppdjt7qsD3u9ekfUlQql5y0RHDuLWig4rGDl/swqFVhrfIAML3bOXZ3oDyu A6EzIWPT3+4jDT3N/a/snl19s3945JuNcvsiX0BVMgG+TB0cnrtMrxKbR9XULa3Y 8rEQ4nw7EgbysGd6JPiDunO3rem2raznEgM9KrrjEKtEV4kqbhXfQauJXXSC9y9r 5h6rAcqsXVsyqjURYBkM6q1NIkOZEmKYuPE+ZplEMvhzmtEhipnb+8atauehwyS/ EYdXCLt3VG+6ry+sgeDXtJcEJJ6hAkzaJl9z7qSXsXj8qc9/uuKC8nW9p3ejRPZk jARgZBxV0h5KTwJP9i/h3Pxjpyr4w0DpIYaVpQWhDUZBvLlrKHmhoVCGa79+ABh5 yBiJwrAI4rLZltiKQ6CVC2byJ+FEg7uKzZxo4s/96OcODMyZQG8= =bQO/ -----END PGP SIGNATURE----- --Apple-Mail=_EBD7356F-7BF2-4953-A96B-712F9385A840-- From nobody Thu Feb 26 21:26:58 2026 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 4fMPg547Srz6TSQ5 for ; Thu, 26 Feb 2026 21:27:13 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) (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 4fMPg457cCz3HmS for ; Thu, 26 Feb 2026 21:27:12 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=OsLw9gWE; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::1031 as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-35928defcd0so792187a91.0 for ; Thu, 26 Feb 2026 13:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772141230; x=1772746030; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=B4N0LnPOJpdAGTcJLhV4Ckgdg5ubCPqXshXchRRwo5o=; b=OsLw9gWEQtpgkguYQnnwHklOYXT8VW0pzJOYJZPh/Qg4y57TFMaUhoEMBCWQD44PCA jb/Woe0l51OqYi1ln1wBQURWzVx75e1AU8PmBALsa3CWF/qeKxqaFp2vQGGKbLX4bqBo Y2E/j9keqB8TT8U1Eo/Py84UFsLlngrVlkfvd6V6q+8LyuOa3a6UA42HI4nmatdlBQhT UF28R07IJNhtjC5ryGPM+PP2DTYpBDtWXV99/SjglVW6U70nAC2yoI9U8HFV37bhzhhW 1KHLnSaF9qtytzlB/fTNu5NkMr7wfcpyYxxt190bzKLNCfDP2nAcMlYCZXjt+QdVsnYs Jm1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772141230; x=1772746030; h=to:references:message-id: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=B4N0LnPOJpdAGTcJLhV4Ckgdg5ubCPqXshXchRRwo5o=; b=kjxK5oNfj1zATXE9ogIakOh2ChVYsJ1ZAnF2glTugTpBFTa+Z6xAVNVcjylXm0uDsU n0lS4cmEtDELxEKLtV+YR4BbKaoYhxvAZY1O/5vBOsO/yz+0hFQezhDsI/gVj5OyG85Z L9KC4fu+06yzacELD8cIefKN3QQfzQK2F3eSG1yCAgjQpaJeyWoYuo1wsUbI41PPTSA5 XO7G/PhWu01nTDZGvhoKL8uShsOBjBCNzxcdEVbTrmfn7wzBl3oZ0sJ1fW0GAXq8Qn4a EvkmLdU+47XrCpnY0pVA/fh0RrbDMMp1c5XN2Rv56J8l3jP/+bx4M63NkN6w8yM2b/4q 5LMQ== X-Forwarded-Encrypted: i=1; AJvYcCUQqTjduVrG8tpLDGhQq9GSsYOmrgZE1u3GK1uxamEbioHww0vyR759ijoOgXVAmm+w2NBgN2zxNRqdCqTriHAzg/NiwQ==@freebsd.org X-Gm-Message-State: AOJu0Yy0u/Zx7xIomFTwhq5tHdxuDZ6C3ILDKlIT1cB0YAG5f4FuRmSY BgreWKtD9M/jE2dUHBhAe1987amnnZdpzm6ZIU0XQm/tyGLfes0fmF3dXCgHRb28 X-Gm-Gg: ATEYQzwMQPLj1w5gH7e8DVXr0WPT6acQiZ26omPkqe9pNsHLxSAl2fZZl2j9248pCrn LsFXUozsLvKaDvNGlnotlxYnJJtcbkz2B52dsKCBOykQHLxo0DFE1/QQup4rhb3IAxqB9flr+MI tAi4zWAbmBudWmll/5BO2Jf1AMNL/Q5yGJ3mjVL7Ph2SgFWfnNg03pIYOti2FcRdukWjpx6shlK +MUZnvbFz5zsNVYaCiXWDfeAZKGHzKr+bF+kUskyRO+0WPLu0SAkZ+qG6h0oD3/C1bhUBqRpKwn KzWB4N7FnatZyKl5XGdAa/N1Fqw7oBQ8QxcABPmsua5HYJ4N0Zg7/gNnvXS9bKA0Rx14Dy8qHWj yB4aUNX5x2HLJZtW7hmlFlTno7t26ZyEHfpqwEMKO2KlPh4u19rW75qfZCeBQT30kw47OBg4PdD juwxadd9jl0EiGbdbJiXxB70kfC04PmCqgGvxaAj8C/Q== X-Received: by 2002:a17:90a:d403:b0:34a:8e4b:5b52 with SMTP id 98e67ed59e1d1-35965c3b05bmr504222a91.8.1772141229742; Thu, 26 Feb 2026 13:27:09 -0800 (PST) Received: from smtpclient.apple ([185.153.179.83]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3593ddd737fsm4693988a91.13.2026.02.26.13.27.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2026 13:27:09 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_5974DC08-12B8-4313-AFBE-B25BCA1912DB"; protocol="application/pgp-signature"; micalg=pgp-sha256 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.1.3\)) Subject: Re: git: f224591746bd - main - Add ASMC_DEBUG make option From: "Enji Cooper (yaneurabeya)" In-Reply-To: <9949840A-8EB7-4ECC-A4AE-7774AC63DC42@gmail.com> Date: Thu, 26 Feb 2026 13:26:58 -0800 Cc: Enji Cooper , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: <2B612FD6-212D-481E-B6CB-92AC5E861903@gmail.com> References: <695c68c6.3ff5d.593fc2c7@gitrepo.freebsd.org> <86342nr4zr.fsf@ltc.des.dev> <9949840A-8EB7-4ECC-A4AE-7774AC63DC42@gmail.com> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Spamd-Result: default: False [-5.59 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.994]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; RCVD_TLS_LAST(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::1031:from]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; HAS_ATTACHMENT(0.00)[]; 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]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4fMPg457cCz3HmS X-Spamd-Bar: ----- --Apple-Mail=_5974DC08-12B8-4313-AFBE-B25BCA1912DB Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 26, 2026, at 1:20=E2=80=AFPM, Enji Cooper (yaneurabeya) = wrote: >=20 >> On Feb 26, 2026, at 5:47=E2=80=AFAM, Dag-Erling Sm=C3=B8rgrav = wrote: >>=20 >> Enji Cooper writes: >>> commit f224591746bdaf14ad5f63de4738a3146cc2f55f >>> Author: Enji Cooper >>> AuthorDate: 2026-01-04 08:27:57 +0000 >>> Commit: Enji Cooper >>> CommitDate: 2026-01-06 01:43:04 +0000 >>>=20 >>> Add ASMC_DEBUG make option >>>=20 >>> This allows folks to enable debug statements in asmc(4) using = kernel >>> configs via the `options ASMC_DEBUG` directive. >>>=20 >>> While here, remove a duplicate `device vt_efifb` directive in = `NOTES` >>> as it's already handled in the `GENERIC` config >>>=20 >>> MFC after: 1 week >>> Differential Revision: https://reviews.freebsd.org/D54511 >>> --- >>> sys/amd64/conf/NOTES | 7 ++++--- >>> sys/conf/options.amd64 | 3 +++ >>> sys/dev/asmc/asmc.c | 20 +++++++++++--------- >>> sys/modules/asmc/Makefile | 2 +- >>> 4 files changed, 19 insertions(+), 13 deletions(-) >>=20 >> This added asmc to amd64 NOTES even though it's already in x86 NOTES. >=20 > I appreciate the reminder! I=E2=80=99ll send out a differential for = this soon (I removed that entry on one of my git branches). Et voil=C3=A0: https://reviews.freebsd.org/D55544 != --Apple-Mail=_5974DC08-12B8-4313-AFBE-B25BCA1912DB Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmguqIACgkQGpE5DjPs NJhrSQ/+LjGgQ2PG+g2fOlc++v7KSXI3kQ4TgtwaFfoS6bm24MtD7wnEEwaBohe3 TJOSIwNM30PswIUxf4yKT+mxR2bSCX/cX0zmhF4FKFynuNGfu5jSPqy3CEKT6pQW pMFt2JmTcLIlH2J8FXJvyRe8lq3Be8tjD3xzUBAj2qucbXXBeyxJU/DF4P+0mY31 6R86+HeEeAvJR+WHl6VyEVEMvwRfP4xGg7RMFz4xNJftt7BFnIRIdjkV4TQ48V/9 1YES/U9JIlVC3y1nUS7mOaMuB+VkgjFoOHOhRiR9NiNWgeAr7AaYxhrzexSR5ZLm CLx0IJdAqu1xzyvDeDRjQKh3dauUqxDG2ThHpXuGQpU/NDj67iUqbRIJMQx5Cw7Y 8wKGmXfV6VBwDDYrcmvTBtc7bRw9r3EAVcgGr4LmHLCju/iGNGLpGURvCmJL93pA ltHmsCvy09h49FdfkyICLejgptjwO+/A2EnifFuxyWCgjkVz2lGP6c+90afaqKm6 tTPvJdfdWX/tOtSZnouzQU9U9BpAv6ltlDTUTBlrybXb/Etw+cRDEkFdRr79QMYX m+U79r9ryhz2Fa5QwaS77rMbuZeViw6XErmhmSI/JevKdBVg7pS523PVnMjW34iT alo/tjHODHf3j2ODQElc7FAkWrrrGaQ1tEWBH37HaSvgisJYXfc= =rGgJ -----END PGP SIGNATURE----- --Apple-Mail=_5974DC08-12B8-4313-AFBE-B25BCA1912DB-- From nobody Thu Feb 26 22:47:36 2026 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 4fMRRr1H24z6TdKS for ; Thu, 26 Feb 2026 22:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMRRr0m9cz3V5x for ; Thu, 26 Feb 2026 22:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772146056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W8Dw/CPJefLk6suKaeuu5TWu4TbtJekujy05PqViMEM=; b=Snno5BESBLMWKffQzP0b5tiNZ8hCoulEPkX4FgATElyAQ0UG3LyBAABpoRSsWPZnwhcHL+ nAOSWi6KRgNdibbHCED05HJfj0/9TtNeoDNwNUsdzu7HB9yxGhkb5Yy++xpWQJ8rbgkGBC 1TwvvEa6tfi09S+7+K2wADKYleoLeCQvO8bwqAChaDSnL+YasWU+Dvh17cl68Hhkb9ZID5 WsFQ2lEFSJQePYI/Igs7S2asoG+0XXSHWBN5FqzgOy7nNwviX1QGYXWixALypsMuROO5ba UOwrYZ3O6ATfOrqhDQgmpaeOSZK3jjfsACcnIcHlr3AhrgcHKA9agVgd5y8gXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772146056; a=rsa-sha256; cv=none; b=Kb6Bta8RUsmt4tOoBlvFRcEOPJfomPeZyQrERd3JSlh4y96eLzGK8Djj411wVarr6z2g6R 7XsDdY4icJOSRcDsR9EWsR3Rboq+a8QDSEN4w1EL0ZHO6Pr5/9kjI/hsA7ChThX0HMszVx xo89PyfkAQrg9kQlWKl81gHhL89L3euylHIi0aSil6FDBop8ZB0GgO/QtoG9rXq/vsLeuM QM1g8q01eLekntUiy6CD8VhMREOg3yeAiq2PJLq7EnnrzokWCBbzaYSk4C8aNLXr++VhNy 5fuc6yOEMJtkcRhXBsXXBn3wG3cpqi50+tRj1K8QZgCIebW/1O2iLprneuT0ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772146056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W8Dw/CPJefLk6suKaeuu5TWu4TbtJekujy05PqViMEM=; b=linKG0hX1L42Kw+aA0LRXKC2ryuCjvPh9ZnhhYkGlrugpiwKg1lICXi1k4InamKiZNME6h jZnvK+mAM31HOwcEAo4pdMk5aLd9nMg4q+5N850PAWnn1QxEpbMGVw+CsxsgUA/JCQqtv1 XxvZ+/8VocTTiIqMrIT3JqRMyi9nl+lF8anHmNXY8AkwqJ9w5vBs7U7dnZXQt0U37v2hkT NroZMCnaiwmiHJZ8LEmOJoRkxyj9ZkljyP+C0vlLb8TGRmw5shDADXWrAOcI7qdTkLKY2K dwGEEMBD3qZhI2i3Qh69RfXOPP5FSNHJ0Ti0AaX8oqUVqLk7pGwkFb9RcNspfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMRRr05Rzzs1d for ; Thu, 26 Feb 2026 22:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a979 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 22:47:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c944960a5bd7 - main - LinuxKPI: remove dumm header now in common 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: c944960a5bd7725e4d5e6805ec1e55b7de147c35 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 22:47:36 +0000 Message-Id: <69a0cd88.3a979.34ca3578@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c944960a5bd7725e4d5e6805ec1e55b7de147c35 commit c944960a5bd7725e4d5e6805ec1e55b7de147c35 Author: Bjoern A. Zeeb AuthorDate: 2026-02-26 22:46:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 22:46:08 +0000 LinuxKPI: remove dumm header now in common page_pool/helpers.h does exist in common/include/net/page_pool/helpers.h so we can remove the dummy header file. Sponosred by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/dummy/include/net/page_pool/helpers.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/sys/compat/linuxkpi/dummy/include/net/page_pool/helpers.h b/sys/compat/linuxkpi/dummy/include/net/page_pool/helpers.h deleted file mode 100644 index e69de29bb2d1..000000000000 From nobody Fri Feb 27 00:36:30 2026 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 4fMTsc3B0Nz6Ssqn for ; Fri, 27 Feb 2026 00:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMTsb69dtz3jt2 for ; Fri, 27 Feb 2026 00:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772152595; 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=hwtb/T4hwEd0DW7cWiifLAcLFGVHtrAkDqn4uurCdkU=; b=qUF4Sj++5xWOniHCNy+WCcif2Jq69mafXL+QY7nh5wm0VOOmUOBFjIY57njk1Kw5bJ1prO VezRTtmKFI9+FM1EZ1Rq2uX3FhCTyvTnA1r0VzuJA38f0Nn5/vg9MW4wVHDO684yTO+Izr Fq2V6mGVfcNk2REpniVh7OEghDr4YMsp0seunNDrGoV5YvVnCj4jT34U8ZvR7YgvIZIJ5K qgU4VzCN8PzgszKmxXta3jGxt59aCGEyRM5eLuJQtkdbPRIBs+7MSSWa+xili8P5ZAwNWy mVwhTy9xExz1KZxnlXAR8X5/yN4QxaBPZdWAjMyRjZ3/J49J5YQ/9oyq2hIzrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772152595; a=rsa-sha256; cv=none; b=Th3+3CxUBwEhT6H0S//2ZPjbgavUr+CAoPVKybUgaj9z+5uYt0Efpe32z/ykaxpXDnMWwM +8Rcff0u+enkKiQchGii2FFS/pfU+GCOOArZF6+xuX5o7cmK2oapTEJWXEDZsj7D/QPWGV 7Z3bq4i2wMWaz291OQuc7TOOGTmBSBl2SCwxd2SLl+qZfAoOwmAkzhY4kWdLagAYMhAEyX jOevmPlJu2lI5+Kehe/Cef5RV5Ii6rMYHlMxNkG+qJRbMYILDngcQNqDLH3Ltd4eNX3wSG zz8/9Sw/5GNrEjGf7xlpWyw3r8fzTNaA/SedANnuSALNN/wzg9eH8Pum29q3OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772152595; 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=hwtb/T4hwEd0DW7cWiifLAcLFGVHtrAkDqn4uurCdkU=; b=lxf2wlrHosNMf+ShInnURIhHcTBPj9HRZSpobErAmaf5jmF/DetL1HJsmFJVCRV9K8fIpA 7/ai1oFIUgAFLZTe0AdVmLOi4tjKI1bxYF4tgrk5T1lYlT4DEB1Xab8soTAa/LYtucDNwJ ba95JvjvcoFC7F8eddq1PkAV4EQ9A+8WljLA/L2n/Puoy+DOZ7FCNy/YM8P3F2lMnVjIPE 9GI1LJLyfBPMHNn1GHafxPjo03E2aeL/Nr7weyiy4ebbxXvxxPace5+gR5vwHK734GHOoU IXcibrG5Fkr2ZvaZMV7x6qNQBHLnGoPIG7gttYbm8AsqZjF94zjnTuBnygJocQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMTsb5mNbzvdT for ; Fri, 27 Feb 2026 00:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43edc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 00:36:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Pat Maddox From: Alexander Ziaee Subject: git: 77dc773ecfcf - main - rc.8: Add rc.suspend as an alias 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: 77dc773ecfcfd177c26dde4e858feb9a35fd970f Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 00:36:30 +0000 Message-Id: <69a0e70e.43edc.68157459@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=77dc773ecfcfd177c26dde4e858feb9a35fd970f commit 77dc773ecfcfd177c26dde4e858feb9a35fd970f Author: Pat Maddox AuthorDate: 2026-02-24 20:25:15 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-27 00:35:32 +0000 rc.8: Add rc.suspend as an alias Make it consistent with the other lifecycle scripts, thus making it more findable. Reviewed by: ziaee Signed-off-by: Pat Maddox Closes: https://github.com/freebsd/freebsd-src/pull/2047 --- share/man/man8/Makefile | 3 ++- share/man/man8/rc.8 | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index c408f1b65a80..de06f5b67900 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -25,7 +25,8 @@ RCLINKS= rc.8 rc.d.8 \ rc.8 rc.pccard.8 \ rc.8 rc.resume.8 \ rc.8 rc.serial.8 \ - rc.8 rc.shutdown.8 + rc.8 rc.shutdown.8 \ + rc.8 rc.suspend.8 RCPACKAGE= rc .if ${MK_NIS} != "no" diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8 index b7bd7b2de1f0..a68878f0a10a 100644 --- a/share/man/man8/rc.8 +++ b/share/man/man8/rc.8 @@ -44,6 +44,7 @@ .Nm rc.resume .Nm rc.shutdown .Nm rc.subr +.Nm rc.suspend .Sh DESCRIPTION The .Nm From nobody Fri Feb 27 00:40:46 2026 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 4fMTyR2vQ2z6StPY for ; Fri, 27 Feb 2026 00:40: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMTyQ5x04z3lBT for ; Fri, 27 Feb 2026 00:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772152846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjo2JbayUIIx5WCV+MZoWJRq7D8nUE50ZGF+BkKdABI=; b=pGTLiZD8kdXW0AJLqKOo1eErnW+sP9wfBHinUasKPH15B4hnVZwNKtUcOS9V8pWWLa+j2C syGYrN1HLVRAW1ypPkFsVSraQMesQ/TpMg5kh2vTbsHLW7QJHOGbZMEBVgmoWtnkutSZsl GRZkSLCqjcuovP4ft4zgWaFW+LfiMmHNiiFRREFK1ehSPRZ867gIYfnc9sYvBRHbHAHyIB yIsg9VX+AKV4yO4BOfFTQTQ1G2Ps6yuOQKoNdMvvQkwPY4UqPqtxXRXf86iCNPaSX/NiVl DF+dd58s9KSuDjvVZdUlgz3eYR8ZPCvP9NL4D1fzrSBxg3cl05SIL/Sl+yXUhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772152846; a=rsa-sha256; cv=none; b=kvRCj5iExrND3CxNVfJHqlgLeJt4m4OMpncLzBDLEDny50h2WBg4A8CrBqirW99t/UKkLR HU/ugAgvHxAMnJ/N2rFEfwHxWeSpGlz8zQFv0B81cMXzngGBorgvUzpV9/lR6gdxFSKfJg InN0FiK4LR1xrWeUC6anCilRWQB4HSiQxJxieI7s272ssUcTCkMa9iLJHbsEeUiE4yXVRj yHMzKOQCCUgrIGnbULbyaqHTcFkGAW4SQ/vCYIerSVuavYWPW8F6tctpOLr7vs3SIBiYbk ictIwbWvOO1G6VqdcCXm1bwsFcdGn6v4ZrYYEOyHrWrKincQBVFsSaQkmyGcbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772152846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjo2JbayUIIx5WCV+MZoWJRq7D8nUE50ZGF+BkKdABI=; b=sUulQDQwc3tX6oFukyTMAog0s8GvIvYyrFJFpqsBeF6E74ddfDdKOj6htwW6SEi6Hl6y8k /qNelZwthshzsovVNWFfaF7xXJOh7M3ZgiDg3pEyNR8Ds5+hmX88CzBolOrPrJkvmct4c4 TZnhDPNcZUV53ihQgpouU5VK7pc7exbmMgqjRFOQz4/1RbsNhxBbW7zJcIp8WYCaKb4Zod ap3YZhkfKqbpH6hA7CzY45F1SMrKuxRf9esW3ki5zjG/jYZyQjovIRo+ZafbbJcD800C7h zc7CFQGAQjcA9B0V3rwqQyUbIH/9SWi+Z8zZsWAe52fpjH1NeFYVEGRoaGB3gQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMTyQ572qzvrD for ; Fri, 27 Feb 2026 00:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 463d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 00:40:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7951411672fa - main - sanitize.lua: A tool to extract interfaces from files 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: 7951411672fab14367d9e785bfc6fe7d9a29668c Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 00:40:46 +0000 Message-Id: <69a0e80e.463d2.1099fb1d@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7951411672fab14367d9e785bfc6fe7d9a29668c commit 7951411672fab14367d9e785bfc6fe7d9a29668c Author: Warner Losh AuthorDate: 2026-02-27 00:40:10 +0000 Commit: Warner Losh CommitDate: 2026-02-27 00:40:32 +0000 sanitize.lua: A tool to extract interfaces from files This is a simple too to remove all comments, extra whitespace and other unnecessary things that may have creative content. What remains can be just the minimal interface described by the header file. When used with care, this can mechanically sanitize files, like some device tree bindings file, that are only #defines that are meant to be used in multiple context (the dts files and in C code to interpret the resulting dtb). Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55087 --- tools/tools/git/sanitize.lua | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/tools/tools/git/sanitize.lua b/tools/tools/git/sanitize.lua new file mode 100644 index 000000000000..a1c9317f3727 --- /dev/null +++ b/tools/tools/git/sanitize.lua @@ -0,0 +1,53 @@ +-- SPDX-License-Identifier: BSD-2-Clause +-- Copyright 2026 Warner Losh + +-- +-- Removes all comments, blank lines and extra whitespace from a C header file +-- and inserts a generated from comment at the top. Generally, this extracts the +-- smallest subset of the file that describes the interface that is necessary to +-- interoperate with that software. The user of this program should check the +-- results, however, to ensure the result minimally describes the public +-- interface. +-- +-- When applied to device-tree binding files, this will result in the #defines +-- being extracted, which are needed to generate the .dtb files, as well as for +-- code to interpret the .dtb files. The device-tree files must be written this +-- way to be used for this dual purpose. Other header files may not be so +-- constrained, which makes review necessary for those context. +-- + +-- +-- Useage lua sanitize.lua fn description +-- +-- fn will be read in, sanitized and the results printed on stdout. +-- The description will be all remaining args and will be inserted +-- in the first line comment to describe where the source file was +-- obtained from. +-- + +-- Open the file from the command line +local fn = arg[1] +if not fn then + print("Usage: sanitize fn") + os.exit(1) +end + +-- read it all in +local f = assert(io.open(fn)) +local content = f:read("*all") +f:close() + +-- Transform +content = content:gsub("/%*.-%*/", "") -- Remove block comments, .- is lazy, not greed, match +content = content:gsub("//[^\n]*", "") -- Remove single line comments +content = content:gsub("%s*\n", "\n") -- Remove trailing white space +content = content:gsub("\t+", " ") -- Convert blocks of tabs to a space +content = content:gsub("\n+", "\n") -- Remove blank lines +content = content:gsub("\n+$", "") -- Strip blank lines at the end (print adds one) +content = content:gsub("^\n+", "") -- Strip leading blank lines + +print("/* @" .. "generated from the interface found in " .. fn .. " -- result is in public domain */") +if arg[2] then + print("/* from " .. table.concat(table.pack(table.unpack(arg, 2)), ' ') .. " */") +end +print(content) From nobody Fri Feb 27 00:57:37 2026 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 4fMVKy50vRz6SwKB for ; Fri, 27 Feb 2026 00:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMVKy3yB4z3mQs for ; Fri, 27 Feb 2026 00:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772153862; 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=u8KwWVKkkJVzNRGvG+o7shEhcHAPLo/e+HeQO83IkBc=; b=kn4K2PR9AB9GbbqzS5H6+V4YrxLrs8h2Dcy0mGnNqSZ8gw22uyFc6xZYYL5JTOrgePhkSK GDsaXcLt5deiPVEXmYBkH/sqkBuctdIS1yaqk4ubQhqcjoRuy0ai3NEnOP4GNh9rtScwZW JHMYYQqaTWyOGVHRMjGCAJ14r6Cy2NUm7hKcmbyjK+MwolBSwZMy6dx4Nv+ifMYUM2/gAu EO32jneUzNL+AbSaWlcfAlCzznH8A+Xm2aWnDvnSrsox/AkTTkiTM3C2Wb/OnBdsxKHOO0 ag2OcxVQ3gzKLsb/srzZeWWXR6ZsiCb+H/+InMgKtrDTwafBvrBcbBVgpOKWbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772153862; a=rsa-sha256; cv=none; b=gpWpYok02hI8LsXiCx3VubSd3h+I7IEj2wUwIB04UHVM/qSeTQlhc1NNQvrw250exLfj7Z 0Zop9RX8rs4W+3iffuyBDoCF7/EAI9H1mrY0aPAnLHjbRi0CkxP0ln6xds+r4o2MYzXyRS v815TIj9Jb/E48pVTbTUlv2nHe91VGgmBlCIqMR0C91kwKQu0K/M3teN5xpb/uFw3xRJbW 8rePiEYMhABCXTg5jCLydsHhibLXs9qhS91mTr9DwXVCFAyOOuVj+N46sUZ19CBe405eOe x3s/NsHhYFdGCEEsN/vdbzVQPyF+IAav+YEpgyQ0LGL4ZDCUFyS1XUObY7KTNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772153862; 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=u8KwWVKkkJVzNRGvG+o7shEhcHAPLo/e+HeQO83IkBc=; b=GRSiR2gBJ0sVvBYlt5K/R13XPKDrChRwXGXgXbp8BMsGKteU1YK5NsBE42t/wUrqSIUZTK bELZRUV6Qz+KhFUgMMldt7gRUlTuZce6XqhgKJfAix/tlydvlU16ccJD0bXI2SgICUGauB DmCV49+KitzH3tGU0VgVnDv7zYmiG1qEHpcATbiEqZp57mjSlmIibO/2TZlVxllMBP9C0z kh9WGbwiyNSmq34H+jk8mMN+Vk/uSkcwOtRZYtbXSPUDINxrLKMUURjGZvVS1O/F1PbG+7 DpXuMbPMFgdilcp0AmAna5PAM+oIVSc+d1Ru1sX0n0Y/62/jUZ3eTFg4StbtLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMVKy3Yhczw1D for ; Fri, 27 Feb 2026 00:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46367 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 00:57:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Felix Johnson From: Alexander Ziaee Subject: git: 86dc5dd0b2a8 - main - newgrp.1: Provide examples 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: 86dc5dd0b2a861cf9d8cad18fc17c17dbbfc4465 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 00:57:37 +0000 Message-Id: <69a0ec01.46367.9c02401@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=86dc5dd0b2a861cf9d8cad18fc17c17dbbfc4465 commit 86dc5dd0b2a861cf9d8cad18fc17c17dbbfc4465 Author: Felix Johnson AuthorDate: 2026-02-27 00:45:03 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-27 00:57:20 +0000 newgrp.1: Provide examples "These examples appear to be originally noted thirteen years ago by Mark Saad, contributed by eadler, put into a patch by Felix Johnson, and made into mdoc by myself. Finally, put this bug to rest." ~ziaee PR: 167742 Co-authored-by: eadler, ziaee, Mark Saad Differential Revision: https://reviews.freebsd.org/D48877 --- usr.bin/newgrp/newgrp.1 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/usr.bin/newgrp/newgrp.1 b/usr.bin/newgrp/newgrp.1 index d9701feef0d7..032aeb72616d 100644 --- a/usr.bin/newgrp/newgrp.1 +++ b/usr.bin/newgrp/newgrp.1 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 8, 2013 +.Dd February 6, 2025 .Dt NEWGRP 1 .Os .Sh NAME @@ -67,6 +67,21 @@ exits >0. Otherwise, the exit status of .Nm is the exit status of the shell. +.Sh EXAMPLES +Create a new group, +.Ar foo , +with +.Xr pw 8 : +.Pp +.Dl pw group add foo +.Pp +Set the group password: +.Pp +.Dl pw group mod foo -h 0 +.Pp +As a non-root user, switch to the group: +.Pp +.Dl newgrp foo .Sh SEE ALSO .Xr csh 1 , .Xr groups 1 , From nobody Fri Feb 27 01:01:54 2026 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 4fMVQp3zzyz6Swgt for ; Fri, 27 Feb 2026 01:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMVQp3Fbwz3p83 for ; Fri, 27 Feb 2026 01:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772154114; 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=L53YHYAEB14kUwTTswOkmmvh2dAfCHRo0J/VLKcMDGY=; b=f8K28iaW1kw5TmHs0TCTXcTewp4wewlpHUKiga0uHX21LruHIaw+T8HgkXW59xg5VGxh+d drUi76hY1Bs8YCzlsKT3qYhQKk3dV1Sg/Wc3C0Nte9L9Tl+T9G/bO2R3yhxwuI/HzcVR4H uCcbNnVTRhTnLKKvfxamLMdJiaoqPxLIDp04Ed7DLOaBQXa7cUTlBwUzTfRxkzZzSVmHrx k7chDEzJ4DSK6PdHRnrl9pO811AMYrZaScUDGkFAihNJvfaWTgFyN1Kwpe92YtKF338Qdd Un0S1jJdrEcOt943cqnLpUURpOm31v64oUq80r/Cxiu+5PRyiI5ci9U/P/U/sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772154114; a=rsa-sha256; cv=none; b=FWOUSCfU+RS7Ef1vxFsitScee5D2+gefy5kfAIXP4kqxGrRYKynvbcgUs4ODkx3bK5TmxA T/2O1HFvg0vXzYcT86QmdB2p4S/EzKWrE+qdJEACnTLyVLrLgLGo/fb5NF4QFA8Xm3iaGW SWxPqMXhZNz9ZotOWHTz2vkateB217fD0Pt35pmF9uxp2tyqiwkwbByZ1ZsDsgDh7zHcom qxD2LUwcayzt2PFFU/mkvLYgAQxQhAxeAmun3XODimsNu9TQIbNZyrRXBM6DAnDmrqQNOI nJAKaouSqVeHYeOkLD0qzUF5zRZ/PK7MjTZMagNiQFoFfow+dHnLAEoS0snmfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772154114; 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=L53YHYAEB14kUwTTswOkmmvh2dAfCHRo0J/VLKcMDGY=; b=OU9/tkvk7Uz3ayw28cN23BY2SKYKdMkQDRehzVj+DwWRdQvtZFptCQFbyApFbftEl2JfPz 0NQbPgxxisducLmlE3gMAjyCZTe5I8JycCaZj5bUWyEvcW+Jlgfuopr/sPoxlM+oZ1ZI5V SI6rdEoGKjZFOvxlE9zSQ3JsbqnUmpfv/a/eoZnt7+bpM/xsh5/VZcpmZp8TubUDK04roJ yLKVo7ROpp2tby/4iD5xeo7MsOwNTZSAXLJE9OFt8fh89o7SJa6PKunczioGbxK3a/y3qt ZnDKI9GvfCY7wSs9eF0eQMwOH7+hCyZfVYZgi20Q6E4qwrl+4IWXFgoyMAg1VQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMVQp2nFvzwd9 for ; Fri, 27 Feb 2026 01:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47d7a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 01:01:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Gleb Smirnoff From: Warner Losh Subject: git: d69fc3a9dc71 - main - loader.efi: try all ZFS pools found by efi_zfs_probe() 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: d69fc3a9dc71768e125e83d35274f0820063e42d Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 01:01:54 +0000 Message-Id: <69a0ed02.47d7a.427b6404@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d69fc3a9dc71768e125e83d35274f0820063e42d commit d69fc3a9dc71768e125e83d35274f0820063e42d Author: Gleb Smirnoff AuthorDate: 2026-02-27 00:57:26 +0000 Commit: Warner Losh CommitDate: 2026-02-27 01:01:36 +0000 loader.efi: try all ZFS pools found by efi_zfs_probe() Remove global uint64_t pool_guid and instead iterate over all pools that efizfs_get_zfsinfo_list() provides. The global pool_guid used to mark that we have constructed a ZFS pool and the pool label that was used for that was stored on a partition that is the EFI image device handle. First problem here is that it is too restrictive. If the very first device to probe is a spare member of a pool, it will be used to instantiate a pool but (pd->pd_handle == boot_img->DeviceHandle) won't be true, thus global pool_guid won't be populated and ZFS boot won't be tried. Second problem is that potentially we may find several pools, and all should be tried to boot. Note that the code for that is already here - efizfs_get_zfsinfo_list() is imported by efizfs.h but was not used until now. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55094 --- stand/efi/include/efizfs.h | 2 -- stand/efi/libefi/efizfs.c | 9 +-------- stand/efi/loader/main.c | 9 ++++++--- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/stand/efi/include/efizfs.h b/stand/efi/include/efizfs.h index 45c2ca1c94aa..5f50b7740a55 100644 --- a/stand/efi/include/efizfs.h +++ b/stand/efi/include/efizfs.h @@ -49,8 +49,6 @@ typedef struct zfsinfo uint64_t zi_pool_guid; } zfsinfo_t; -extern uint64_t pool_guid; - void efi_zfs_probe(void); EFI_HANDLE efizfs_get_handle_by_guid(uint64_t); bool efizfs_get_guid_by_handle(EFI_HANDLE, uint64_t *); diff --git a/stand/efi/libefi/efizfs.c b/stand/efi/libefi/efizfs.c index 1c80f1ae26b9..563cf841143a 100644 --- a/stand/efi/libefi/efizfs.c +++ b/stand/efi/libefi/efizfs.c @@ -40,8 +40,6 @@ #ifdef EFI_ZFS_BOOT static zfsinfo_list_t zfsinfo; -uint64_t pool_guid; - zfsinfo_list_t * efizfs_get_zfsinfo_list(void) { @@ -111,13 +109,8 @@ efi_zfs_probe(void) STAILQ_FOREACH(pd, &hd->pd_part, pd_link) { snprintf(devname, sizeof(devname), "%s%dp%d:", efipart_hddev.dv_name, hd->pd_unit, pd->pd_unit); - guid = 0; - if (zfs_probe_dev(devname, &guid, false) == 0) { + if (zfs_probe_dev(devname, &guid, false) == 0) insert_zfs(pd->pd_handle, guid); - if (pd->pd_handle == boot_img->DeviceHandle) - pool_guid = guid; - } - } } } diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 7ff2cf188509..d8508d7d91a0 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -588,6 +588,9 @@ find_currdev(bool do_bootmgr, char *boot_info, size_t boot_info_sz) } #ifdef EFI_ZFS_BOOT + zfsinfo_list_t *zfsinfo = efizfs_get_zfsinfo_list(); + zfsinfo_t *zi; + /* * Did efi_zfs_probe() detect the boot pool? If so, use the zpool * it found, if it's sane. ZFS is the only thing that looks for @@ -595,9 +598,9 @@ find_currdev(bool do_bootmgr, char *boot_info, size_t boot_info_sz) * if we allow specifying which pool to boot from via UEFI variables * rather than the bootenv stuff that FreeBSD uses today. */ - if (pool_guid != 0) { - printf("Trying ZFS pool\n"); - if (probe_zfs_currdev(pool_guid)) + STAILQ_FOREACH(zi, zfsinfo, zi_link) { + printf("Trying ZFS pool 0x%jx\n", zi->zi_pool_guid); + if (probe_zfs_currdev(zi->zi_pool_guid)) return (0); } #endif /* EFI_ZFS_BOOT */ From nobody Fri Feb 27 01:01:55 2026 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 4fMVQq5Rh9z6Swdq for ; Fri, 27 Feb 2026 01:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMVQq48sgz3pF6 for ; Fri, 27 Feb 2026 01:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772154115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0gL/w7hZzq+kWp8fg5aCthOD5jCuKmHhN9qnt4SmDIE=; b=GuEAXgsK5UQSfpETOqw/G0zmS7n93qHYM5OIky5KvzwDsmWxZ2sUriPCFPdWqOJT8vStV8 6Mp6HzeaHQXzLAYetbprDgYDZ68KlD/H3NZKuSxmC90bFZtSW1W+Q7gR2+U+TluCGEJ9Ht iQpuvI/LPOibG1XCOlgcG4xIFGtVAmeC/wLAw4btfaCWMDsN8wPD0xq2uFoHNims9UGnSf ++L7cUrT4RuIzEKroAaDw+HalI8rLjNCm+vinzXZFNjHkni9N/8dzTxYyWROemMFeNYU1V YpON6VUHjP26BIibtR+6njlbc9ZiV5dHaJUXSH2vxe0EexAqq2VC6l5m2csUww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772154115; a=rsa-sha256; cv=none; b=T3RZXcyi30P6izEJSSNPWIaYY8Hgv2Uhyni1tt7M+XNnh+R3XRubaOb2bd04FiIRq4oV9f wzuXRbMsRATRhaKXS53I0tpFUEcqsSzBLFTTbjglhZ3NQHk4zGQ0t2GbJdm7owAfjChbqj GObtVpnsqeT42nt9HOiLWXnUqEIDi6wSCsGBK2Vaze/4mJ1RvBpPdNYxv5dr11lgS7GDXu NqCvwsuRmekxW+n3Bc83K+4xVYAv5XKI6IIMLIozYKZ/2SrWcKkjcTK9lsrTey/kTwT2dl 6dOxMvhDrOuDscP7vult5YTzNJeIHJNLFCe9+MvoN/gQL6vTZVG6OvYh9FTsaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772154115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0gL/w7hZzq+kWp8fg5aCthOD5jCuKmHhN9qnt4SmDIE=; b=Su12TZdAVbMMbP/6CFwyereumYSXm2RTf3yaHqz0ug7WdKcNEW/wllrjOPweSCVkLQlnsJ 0hEHoVtPdJkBZdoYx4djSqAw1XnwS4R1/HkmA1iHrpe3AvoXAV2aBKEmJWJ0uX0mE8j0rF iZ+1QcCdqzWZz3MQYguaYVW3g7olyH4qkCTCA9z4EF6MENudT/JW/mmDt1TJ+ZKOUSM326 HXxxbNrHdNL82zV/Up6INhNiqoK0optVnPRY4iYWUTX+0i+mUCeii+gCc6BV4nKWkkbI8/ NyuOGgbITzAmXyo1/c1CIeJTntNvQ5XkUU9Gx/TmI3L9g8Vzo3f1yXUnqvwjLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMVQq3DdSzwdB for ; Fri, 27 Feb 2026 01:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45d75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 01:01:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 784150fd2535 - main - stand/efi: Allow RELAXED or STRICT boot policies 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: 784150fd25351f4a38f4d983882f4a26cc5d3272 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 01:01:55 +0000 Message-Id: <69a0ed03.45d75.2a153af5@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=784150fd25351f4a38f4d983882f4a26cc5d3272 commit 784150fd25351f4a38f4d983882f4a26cc5d3272 Author: Warner Losh AuthorDate: 2026-02-27 00:57:39 +0000 Commit: Warner Losh CommitDate: 2026-02-27 01:01:36 +0000 stand/efi: Allow RELAXED or STRICT boot policies The RELAXED boot policy will automatically search for any root filesystem (currently zfs only) on any device. STRICT policy only searches on the boot device. RELEAXED will still prefer the device we booted from, which is the smallest behavior change we should do. STRICT may be needed for releases, though. Sponsored by: Netflix Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D55107 --- stand/efi/libefi/efizfs.c | 10 +++++++--- stand/efi/loader/main.c | 40 +++++++++++++++++++++++++++++++++++----- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/stand/efi/libefi/efizfs.c b/stand/efi/libefi/efizfs.c index 563cf841143a..8ad410488b9c 100644 --- a/stand/efi/libefi/efizfs.c +++ b/stand/efi/libefi/efizfs.c @@ -76,7 +76,7 @@ efizfs_get_guid_by_handle(EFI_HANDLE handle, uint64_t *guid) } static void -insert_zfs(EFI_HANDLE handle, uint64_t guid) +insert_zfs(EFI_HANDLE handle, uint64_t guid, bool head) { zfsinfo_t *zi; @@ -84,7 +84,10 @@ insert_zfs(EFI_HANDLE handle, uint64_t guid) if (zi != NULL) { zi->zi_handle = handle; zi->zi_pool_guid = guid; - STAILQ_INSERT_TAIL(&zfsinfo, zi, zi_link); + if (head) + STAILQ_INSERT_HEAD(&zfsinfo, zi, zi_link); + else + STAILQ_INSERT_TAIL(&zfsinfo, zi, zi_link); } } @@ -110,7 +113,8 @@ efi_zfs_probe(void) snprintf(devname, sizeof(devname), "%s%dp%d:", efipart_hddev.dv_name, hd->pd_unit, pd->pd_unit); if (zfs_probe_dev(devname, &guid, false) == 0) - insert_zfs(pd->pd_handle, guid); + insert_zfs(pd->pd_handle, guid, + pd->pd_handle == boot_img->DeviceHandle); } } } diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index d8508d7d91a0..f83db2e0668d 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -143,6 +143,16 @@ UINT16 boot_current; */ EFI_LOADED_IMAGE *boot_img; +enum boot_policies { + STRICT, + RELAXED, +} boot_policy = RELAXED; + +const char *policy_map[] = { + [STRICT] = "strict", + [RELAXED] = "relaxed", +}; + static bool has_keyboard(void) { @@ -592,13 +602,14 @@ find_currdev(bool do_bootmgr, char *boot_info, size_t boot_info_sz) zfsinfo_t *zi; /* - * Did efi_zfs_probe() detect the boot pool? If so, use the zpool - * it found, if it's sane. ZFS is the only thing that looks for - * disks and pools to boot. This may change in the future, however, - * if we allow specifying which pool to boot from via UEFI variables - * rather than the bootenv stuff that FreeBSD uses today. + * First try the zfs pool(s) that were on the boot device, then + * try any other pool if we have a relaxed policy. zfsinfo has + * the pools that had elements on the boot device first. */ STAILQ_FOREACH(zi, zfsinfo, zi_link) { + if (boot_policy == STRICT && + zi->zi_handle != boot_img->DeviceHandle) + continue; printf("Trying ZFS pool 0x%jx\n", zi->zi_pool_guid); if (probe_zfs_currdev(zi->zi_pool_guid)) return (0); @@ -1189,6 +1200,23 @@ efi_smbios_detect(void) (void)smbios_detect(smbios_v2_ptr); } +static void +set_boot_policy(void) +{ + const char *policy; + + if ((policy = getenv("boot_policy")) == NULL) + return; + for (int i = 0; i < nitems(policy_map); i++) { + if (strcmp(policy, policy_map[i]) == 0) { + boot_policy = i; + return; + } + } + printf("Unknown boot_policy '%s', defaulting to %s\n", + policy, policy_map[boot_policy]); +} + EFI_STATUS main(int argc, CHAR16 *argv[]) { @@ -1287,6 +1315,8 @@ main(int argc, CHAR16 *argv[]) read_loader_env("LoaderEnv", "/efi/freebsd/loader.env", false); read_loader_env("NextLoaderEnv", NULL, true); + set_boot_policy(); + /* * We now have two notions of console. howto should be viewed as * overrides. If console is already set, don't set it again. From nobody Fri Feb 27 03:46:09 2026 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 4fMZ4f1LZVz6TJNC for ; Fri, 27 Feb 2026 03:46:26 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) (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 4fMZ4d3Dz7z3VdW for ; Fri, 27 Feb 2026 03:46:25 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=XSdzPSlJ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::52e as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-c70378ddaafso1040900a12.3 for ; Thu, 26 Feb 2026 19:46:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772163983; x=1772768783; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=YWeVfPKsu+S6YKhKpcR7kYS6j+apMhjUx03MFLHZOIg=; b=XSdzPSlJlRm22j970iSipr3tmrDzLM9FxHU9R2IxJwE3IKaF8O/xNmnH4SKT1TNlzV 90LhB5VRE6iWtydewKgoBnYubaSZczdceITeMH440t5qdr8DS6oIbNMI8B5mfIuZufNC SYXJO0tfut0j3cGO3Jr7+sZAi1HjUbZpzcDvG9NZp/+OT9iOGIsi46eFAIWva6uXLJff g6sLFi4dyqzmvz1e4IwwYPU8CklItYEdrgCGCLEiiWYn+T/yDL7GrsQeywE27LwOIz1j T2keuoFJqk8ahPbKbuYSr58b2rQEDLeL8KlBY6t29B2TCyl2YZakRTqPhwIFnamwtRoy Pe/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772163983; x=1772768783; h=to:references:message-id: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=YWeVfPKsu+S6YKhKpcR7kYS6j+apMhjUx03MFLHZOIg=; b=RmdvnzJCFWDag+jBEEYlPhyNDw1r6NlgyI861aQuSLUUDlXEopuQnoc7kOSkpiiRAt /hN7Vl/whhINyXx0Kqd0A/mEIPoGYEdTBj77BFS9t2Xr/Lr1903grvvtXIMpd95CK7dQ kdtrmHl+bGeELn7/IIQkT6CVDtCswHn364IpHYzLyYd39ac8pHcTZLNjRLVsvqdjEnxA sf+YN+DEIMxb9QTusaj8ZEg/fGxLDRvsCJeJzibCU+dbajc1HqqbLtzFacjm564abQtZ PJPdyeW6g4Vse2PCMi2/o6RM0QwC9bzDMsnhzs3NK00x0EV4rE/oOMSpBh6M1EAcGais K3nQ== X-Forwarded-Encrypted: i=1; AJvYcCVZVDKO+FpCm1+raQDyErWmvVb/WEG7rCpP2WFstNwwlP+DQcyFTwEOSAW7nEjOEp81W48wQbqPRxSKZFQr1TjjK3/fOA==@freebsd.org X-Gm-Message-State: AOJu0Yz9NuzEhiFRnWrRLVM+1/vx41S8XXwXYf2qLN9MuJv2ET6auVjl SQ7aib+f4oDUH9ouztEB/5HfLDntzgoX+bwW0GpUZgtLJVf71r9AaVXN X-Gm-Gg: ATEYQzxat2OjVq+iQI95lpC1usJI0agHoApvpTsI7WtTyHLWPIVxrQJGKSXT/OFGrBH 4Yf2GmeLxLv8zbOLjAcD3zBzHVpTHPoRzb2YvT2TiZw3z0pGSAu2arOHCfhLaU/wKQP2A/OsxfG SAyAFkwleyE2VDpN9nL/kxpEoXXmw2lbnPQvW9OuLnQW3wpBCuZCHxq4pHx8pe5dZYMeocBl20p NqwIM+TuaRGyYZrBaepQkzdi5FFDtyghOnJk3mM2mlN8gsAZ3d7KlFO1o8P7QcUSniul9B4gtqB NOV9RE93XwkoOY688JuqUciY4BCqav9NktflniurdNxd+VvBc/uT1m+ZfDx0a4iLuYrF6nCYpWz c7qlC83LW8noHIMo5A++7ARz9ob+6jHckOSwk/+XYf0MdZVHaF6e4ufsyTjxaf7xk6F9dDo95lk cfnyMC8MSneJ9x9H+z1T+SS7mvyqqFLpyuGQt2NfNwCdpNI6HoYkoQ X-Received: by 2002:a05:6a20:c6c1:b0:35d:d477:a7e6 with SMTP id adf61e73a8af0-395c3a0c9acmr1595592637.13.1772163983110; Thu, 26 Feb 2026 19:46:23 -0800 (PST) Received: from smtpclient.apple ([185.153.179.83]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c70fa82cf71sm3192208a12.26.2026.02.26.19.46.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Feb 2026 19:46:22 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_8A8090E3-199B-4755-A595-B278A317342D"; protocol="application/pgp-signature"; micalg=pgp-sha256 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.1.3\)) Subject: Re: git: 454212b9718b - main - sctp: fix so_proto when peeling off a socket From: "Enji Cooper (yaneurabeya)" In-Reply-To: <699ef25d.42e41.7579887f@gitrepo.freebsd.org> Date: Thu, 26 Feb 2026 19:46:09 -0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <699ef25d.42e41.7579887f@gitrepo.freebsd.org> To: Michael Tuexen X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Spamd-Result: default: False [-5.59 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.988]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MV_CASE(0.50)[]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; RCVD_TLS_LAST(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; HAS_ATTACHMENT(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; 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]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::52e:from] X-Rspamd-Queue-Id: 4fMZ4d3Dz7z3VdW X-Spamd-Bar: ----- --Apple-Mail=_8A8090E3-199B-4755-A595-B278A317342D Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Hi Michael! > On Feb 25, 2026, at 5:00=E2=80=AFAM, Michael Tuexen = wrote: >=20 > The branch main has been updated by tuexen: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D454212b9718b55b43781f81bef252658= e20e0fd3 =E2=80=A6 > @@ -171,7 +173,7 @@ sys_sctp_peeloff(struct thread *td, struct = sctp_peeloff_args *uap) > td->td_retval[0] =3D fd; >=20 > CURVNET_SET(head->so_vnet); > - so =3D sopeeloff(head); > + so =3D sopeeloff(head, &sctp_stream_protosw); This part of the change broke LINT-NOINET because sctp_stream_protosw is = only defined in the INET case. I didn=E2=80=99t dig into the SCTP = syscalls too far, but I think that the right protocol needs to be picked = per the address family, right? Thanks! -Enji= --Apple-Mail=_8A8090E3-199B-4755-A595-B278A317342D Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmhE4EACgkQGpE5DjPs NJiDNxAAk7DpomOwPWW6ag5cb5943La5OLtCEX+BNUiOgDf1mw6Ysxl3W310V6rH eKQdS3cPgjlQkgeMib+Epxbl3lPmVyVoPLBJKsG+k0iBqhPp3bnRhZ9h7hue7xPc HubfQ2qIePJG/q0lthxMH7352zFT0C8GqtRTjAEOELQnmdV2FIYI+19mFF3mnfCh kVF3AGa8KADuQxPGCpGHlm1CCe4u8qxZLdYQLwemknxAXvwaOVq7AGiZnBGO8EdU yibvNqaCZkd0QdBW5h96zCXUaI4eKo5QPnsUnDIvsC1K/QnpA0LRSly26D7NixeF EB9hG+w0heGG2Al00/vICRVFI/FG7kohJ2sf++p0SvcO/T7ROppEr8A/zdvulzDq QVy5FLG/a5xLW9iTcEepf8wEyaMMarvSfUiA1//e48eFjw4VqCihbF3ozqQfcHZX UJnf7U1TU+N3RPSZTl0ZDeJ3B2RWTklcyfb4l9pmbgiDVgSz210A3mfafGCjwrsv 1OzCwaq62sC8Sx9WBuUIkQDyISLm43lpKAQHGx/odmvXRrf6IVz+ykyv0YYN7hbV aoMC+br29TkOCKLjvaDO55cSc0E2OJs5LzVFOSJ0RFujNwJb3u1bznMVC01KrG+L pKFFEqpn3tU/Xh4u8BnGrWU28DiehLlSA6MInnhQodbhxka5BJY= =haaJ -----END PGP SIGNATURE----- --Apple-Mail=_8A8090E3-199B-4755-A595-B278A317342D-- From nobody Fri Feb 27 04:50:25 2026 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 4fMbVW0jM8z6TS3X for ; Fri, 27 Feb 2026 04:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMbVV1VH6z3ZrZ for ; Fri, 27 Feb 2026 04:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772167826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NpsS+YghLQh44yxvQ0AuJWpuQ5KtdW2GGKRh6rJODAw=; b=ukinmUNNBpp/Cib/HJYdhkrrCuGMmjOMeSbAEkiBbmcLqpa2jnbaVyRCA4RWOxc0vD2m3u WPCK2esZpqeWtBN6GQwkZmzQJpxesjBECGOBRz96/6nX3mWCtQXdd82NsW0s7ftKHSJpC5 gqiTLyvaFcrT4E0Uvafj0nVkZFoGbjUBnFqGAsgxpf+IiHbRulpVOt3GCknPAsuV4EkW+1 3MaIyWaE9uWW/J7GkaPyskza2GZxZHTedhN0SR2v5sUPPxDBU3QMbA2ht2QFY0nbrBksHe 6L0zHIK2Mb36ZxeyOHEUjx8Jf3eyPMTIr95DtDCGFq6hoLUZBdjUsvWzegxu5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772167826; a=rsa-sha256; cv=none; b=FlmQx1bYLJsn3XW7DDHs6kK+x1Vig2/FqN0uU+ZFCMo+vOIX6tdOI+wkp9CnuO3WDu64J9 KEsM1LmLbVxUvEwXBALQRdC5isUW+FmKTbngmycAAbcoQyYY4hKJmeub0X3+ZQbBCeBs/H wmZAHieNI8htD/m9zmonlgWF9S1WZ6KL6IOE0l5Lpk2e81J9fwaGDzTc1Ue3USOO3F5q5K LIJ1pTsvoz1MZTs5TtIjD9NUbOxwrfuDsRrtRhpJl62zewif/cTEqu51EFnnBWqR1oymE2 X63bdQN5TygPcehmM8/eA7MCty8cIjfmTY7x9nhql3SGVJYwqcFUL4838sbTHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772167826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NpsS+YghLQh44yxvQ0AuJWpuQ5KtdW2GGKRh6rJODAw=; b=atbfy4Me1Wm+Bqb0nEHlFXapyTkQu5stw62oAoc8AMxsT5sgC7vbhUmOUH0v1liqHNF5Yf rAYT+HQw2LtqE2sKPix4ZvA/7bFweFvPAOwXFOXctTTgF5xrGrPPutFpgkK/81fZO6lMal x7ecup658hv+eifjHTJopy3e/RuQdYAtde5o0moGKrakoyLDPaX40nsYszKN0O0dGSefu/ Bnrq1xBB/XxbS/0F+oBxE70MmnSpzwZ3J0iQLMdWTW8ryiUw/X1wWeDS3he497HBshqf8Y 3Mg74wH3EdGNgoGlEN58cCNKFfp2lP644aO6uX/XwS+njNDzEsDj31iVAa+U7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMbVT72zXz12wr for ; Fri, 27 Feb 2026 04:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39386 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 04:50:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: bd758ebac327 - main - divert: unbreak the LINT-NOIP 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd758ebac3272f720c051570e043e4bc653dcd48 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 04:50:25 +0000 Message-Id: <69a12291.39386.6f086258@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=bd758ebac3272f720c051570e043e4bc653dcd48 commit bd758ebac3272f720c051570e043e4bc653dcd48 Author: Enji Cooper AuthorDate: 2026-02-26 23:06:36 +0000 Commit: Enji Cooper CommitDate: 2026-02-27 04:50:05 +0000 divert: unbreak the LINT-NOIP build Only expose `dcb` when either `INET` or `INET6` is defined. Reported by: clang (`-Wunused`) MFC after: 1 week Fixes 5547a7bb39 ("divert: Use a better source identifier...") Differential Revision: https://reviews.freebsd.org/D55548 --- sys/netinet/ip_divert.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 2b85bd4a50bb..39bc9de6ec9f 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -502,10 +502,11 @@ static int div_output_inbound(int family, struct socket *so, struct mbuf *m, struct sockaddr_in *sin) { - struct divcb *dcb; +#if defined(INET) || defined(INET6) + struct divcb *dcb = so->so_pcb; +#endif struct ifaddr *ifa; - dcb = so->so_pcb; if (m->m_pkthdr.rcvif == NULL) { /* * No luck with the name, check by IP address. From nobody Fri Feb 27 07:11:39 2026 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 4fMfdW2PBJz6Tksh; Fri, 27 Feb 2026 07:11:43 +0000 (UTC) (envelope-from tuexen@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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMfdV5kHwz3ny9; Fri, 27 Feb 2026 07:11:42 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772176302; 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=rkLaJ7yMollD/mtdApJhzuTky9/ZW5wCH3hir0Ctg5Q=; b=s4mvKkooOLpxW2IARMNvkfbrzUq4OMYOf4+Fky/cO9SdCTHzYeDB79Br67LQ4lxzNKWHzF Cr+s85NdKg8DHY0LTKDc2efnPiyOhmzsqIp1cV/kZKn0QooV3yAcI2WtyJVmgMGw2AO9K6 K+0LnuhM2zcqE0brKnqO+BR5bn2DUi3Z6L7P7wB2kaX/mdw2JviWdzSqNfZDkbFuW8+AG5 EsnkLEbsLrrfXbyxiM1whiAxcwnxT9v22Uj2AXFEBQDpM5GFBx0uitl7ZDaYeujRCyI6QA NR8yZGJLvp8ycbvgOD5QwYjBJBEL5u0y18lFtVWqb1sV9/XGBSUW1w1G01EzCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772176302; a=rsa-sha256; cv=none; b=tUo78I6HR8qxfFptnhiDL2Hj6U4cPP2iSURDYIegcWbSkrSaSNZ8U+iBaNABCbPs8Fv7oO 75Oxn7jwGWNZhc8xqJj9ME67dghY0FqC+voiSYNk/i8iEwdcK2H+2ztFAvn1k64SdfeOvY I6gNO+rKw8mjnQ2iP/xdhzDqGpOuDoEAW8Q+jFbUqTzGqCKLMAn6UzuhXGURYC2J5O0BLM d7xLncbym4QfwT4oM66tPy/0fKlF86sajZCjlaFThea4VJ+4y4VyjXFQh9hP6utWVzS9cj kQenI6vg5hnP4IiOukmAjsIwdUnFRdg+IRdz0xAXFLZ3gX4qMsB6cDtJJQQYTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772176302; 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=rkLaJ7yMollD/mtdApJhzuTky9/ZW5wCH3hir0Ctg5Q=; b=tLIMUd7UT2CbOVlq8yB2QkzN7Fkbrub/93swy66dY1cFIwXU3XcoBRI26xpPIALvE4GC2p H9LmyrjeL43kA2GZJtgedknOOgmpfAT3ihIfIvczG/NTYDMsvfrUQTqletG/ArO+9tTBzn AAXqlcKD0HPFPqwrrGFDE13pUV0+14q3dR/9SRojpWxMWX1hYBJXpV6kk2+PcbW5j+qp49 YCTkhKBBsCxq6AoqUvUOMhfbazvZY/k2qHOlY95eT51zu9qGQQNu1Y41xKj/fwzdTvK0vu eZSqhZjz/DQvrZBagkwgKaAgW+T3NmeFAo8lgU0wnPbtmhwhsR0otoqOQJ/N/g== Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1101:be00:3cd2:796a:add9:aa81]) (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 4fMfdV0RzMz1JY; Fri, 27 Feb 2026 07:11:41 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) 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.400.21\)) Subject: Re: git: 454212b9718b - main - sctp: fix so_proto when peeling off a socket From: Michael Tuexen In-Reply-To: Date: Fri, 27 Feb 2026 08:11:39 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <699ef25d.42e41.7579887f@gitrepo.freebsd.org> To: "Enji Cooper (yaneurabeya)" X-Mailer: Apple Mail (2.3864.400.21) > On 27. Feb 2026, at 04:46, Enji Cooper (yaneurabeya) = wrote: >=20 > Hi Michael! >=20 >> On Feb 25, 2026, at 5:00=E2=80=AFAM, Michael Tuexen = wrote: >>=20 >> The branch main has been updated by tuexen: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D454212b9718b55b43781f81bef252658= e20e0fd3 >=20 > =E2=80=A6 >=20 >> @@ -171,7 +173,7 @@ sys_sctp_peeloff(struct thread *td, struct = sctp_peeloff_args *uap) >> td->td_retval[0] =3D fd; >>=20 >> CURVNET_SET(head->so_vnet); >> - so =3D sopeeloff(head); >> + so =3D sopeeloff(head, &sctp_stream_protosw); >=20 >=20 > This part of the change broke LINT-NOINET because sctp_stream_protosw = is only defined in the INET case. I didn=E2=80=99t dig into the SCTP = syscalls too far, but I think that the right protocol needs to be picked = per the address family, right? Correct. Let me fix that. Thanks for reporting! Best regards Michael > Thanks! > -Enji From nobody Fri Feb 27 07:41:43 2026 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 4fMgJ8195Lz6Tnwr for ; Fri, 27 Feb 2026 07:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMgJ74j2Tz3skw for ; Fri, 27 Feb 2026 07:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772178103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RAXTbJt980PohUt1fEKe+AHY2WQTL4IefzWoT4KS1D4=; b=Kd7vb3+P+gyOC3mxlsxEMAD9yQLpAtCprXTzi6+XBJkispkOkLzMDVW9wvZSX8yLs2mVml Z2hOSFrlPDGzbcTmCTbVyWNHMK00TGZD7z2aQsujRLN7HKcWBacyvWk2bfmuvJR4jpcLxs EgwJ24N/gqOSMbENTZpAOZMx9Udq3hOSBVqfNors+Zv1DRR6RNCA8nDCxtWmPV2oxAlqxL 98bvlaoj/wf33rnMsl7lGZShu4WbEMDgy1w5x2L3wHs7aipkIX0idIP9UPBIy4PB0z4Dka JQdwDuvhyri+COpgfrgXXgrBJUPUQGd6jJOnbca/TWZ1Ysr8Rs79mn60a4bJXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772178103; a=rsa-sha256; cv=none; b=QeKyJtheVraQxWbopsPESq0Sy40tG3yyejFzx776E+9YyrWi6Cikkxgni82Zobn08CrEFm X34EMQOrIAZbnLEg7lCiprO5U+pxXrL5bm1HMgyFkum+N3feNF4PAnEe5nGbD95ouBgmuK 9WddFfnYi1gQXfu4mc3B9FJL2mdX3ddOQNlawqAP0D+DEiWYYnOkoKr+SUgaTA9CNtg7Kt kdx3rrx7ry5WIunKFmvCDtzuVU+8U4ZTZKL52PC1+N3ADdZOTHZhGGO2A+OpsDGkVoyvs4 Fp6SagM0stv8ZWC7JbCOPaVkZFDHovOfkKZSpczDReucUv77rY1qtzg+29EI7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772178103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RAXTbJt980PohUt1fEKe+AHY2WQTL4IefzWoT4KS1D4=; b=JXTgXJEX1S2Gm8Gc60IZ7ntn7TeXU2lzmaFzyWPIjMTP8bgy1v68WVWMCkYx5DWw1bICbn pJqtso/X/havia1OE+skhvdPL4H+MAAVlwX+mIkj3u9D6IxOjgA/ThGQXXlpcTS3b15qgm X7sSjo1g4Gjjw4t3ER57svTCln+zSF8Uglowj6BktsMF+mmng7PW2iZzx+154vydZY8FVT 54Y6YT/8iSXMcy1kjQL8lIUMCyBpDQSC2fJJpSIxHNOewTBXWFgdzcfhG0cxxJslGzuB9I UoMTbBtrqlLgfv+CGSITebNhaQNxylrK0ctu/CtuDrBNVjHK61yrmFrHvHcHIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMgJ73jz4z17LP for ; Fri, 27 Feb 2026 07:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1972b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 07:41:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: db16856110cb - main - xen/acpi: implement hook to notify Xen about entering sleep state 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db16856110cbdbdfdc3c8d44edae1b3a7463198e Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 07:41:43 +0000 Message-Id: <69a14ab7.1972b.1bbdd8ef@gitrepo.freebsd.org> The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=db16856110cbdbdfdc3c8d44edae1b3a7463198e commit db16856110cbdbdfdc3c8d44edae1b3a7463198e Author: Roger Pau Monné AuthorDate: 2026-02-24 20:23:08 +0000 Commit: Roger Pau Monné CommitDate: 2026-02-27 07:39:11 +0000 xen/acpi: implement hook to notify Xen about entering sleep state This is required so that ACPI power-off (entering S5) works as expected, as the ACPI PM1a and PM1b blocks might not be accessible by dom0 directly. Additionally, Xen also needs to do cleanup before entering a sleep state, so it needs to be notified about it. With this patch FreeBSD dom0 now powers off the host correctly: acpi0: Powering system off... (XEN) [ 85.686598] arch/x86/hvm/emulate.c:415:d0v0 fixup p2m mapping for page fedc6 added (XEN) [ 85.687606] arch/x86/hvm/emulate.c:415:d0v0 fixup p2m mapping for page fbc10 added (XEN) [ 85.692357] Preparing system for ACPI S5 state. (XEN) [ 85.692702] Disabling non-boot CPUs ... (XEN) [ 85.694471] Broke affinity for IRQ9, new: {0-7} [...] (XEN) [ 85.903118] Entering ACPI S5 state. Should be a non-functional change when not running as a Xen dom0. Reviewed by: kib Sponsored by: Citrix Systems R&D MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D55504 --- sys/conf/files | 1 + sys/dev/acpica/Osd/OsdHardware.c | 13 +++++++ sys/dev/acpica/acpivar.h | 13 +++++++ sys/dev/xen/acpi/xen-acpi.c | 75 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index 4913efebf00d..632fddef2cb5 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3578,6 +3578,7 @@ dev/xdma/xdma_mbuf.c optional xdma dev/xdma/xdma_queue.c optional xdma dev/xdma/xdma_sg.c optional xdma dev/xdma/xdma_sglist.c optional xdma +dev/xen/acpi/xen-acpi.c optional xenhvm dev/xen/balloon/balloon.c optional xenhvm dev/xen/blkfront/blkfront.c optional xenhvm dev/xen/blkback/blkback.c optional xenhvm diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c index fbaf76d2a91a..4252cbc63222 100644 --- a/sys/dev/acpica/Osd/OsdHardware.c +++ b/sys/dev/acpica/Osd/OsdHardware.c @@ -37,6 +37,8 @@ extern int acpi_susp_bounce; +int (*acpi_prepare_sleep)(uint8_t state, uint32_t a, uint32_t b, bool ext); + ACPI_STATUS AcpiOsEnterSleep(UINT8 SleepState, UINT32 RegaValue, UINT32 RegbValue) { @@ -45,6 +47,17 @@ AcpiOsEnterSleep(UINT8 SleepState, UINT32 RegaValue, UINT32 RegbValue) if (acpi_susp_bounce) return (AE_CTRL_TERMINATE); + if (acpi_prepare_sleep != NULL) + { + int ret = acpi_prepare_sleep(SleepState, RegaValue, RegbValue, + ACPI_REDUCED_HARDWARE ? true : AcpiGbl_ReducedHardware); + + if (ret < 0) + return (AE_ERROR); + if (ret > 0) + return (AE_CTRL_TERMINATE); + } + return (AE_OK); } diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index aa8d5bd0971f..b86c6c1aa3c6 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -610,6 +610,19 @@ int acpi_pxm_parse(device_t dev); int acpi_map_pxm_to_vm_domainid(int pxm); bus_get_cpus_t acpi_get_cpus; +/* + * Hook for ACPI sleep routine. + */ +extern int (*acpi_prepare_sleep)(uint8_t state, uint32_t a, uint32_t b, + bool ext); + +static inline void +acpi_set_prepare_sleep( + int (*hook)(uint8_t state, uint32_t a, uint32_t b, bool ext)) +{ + acpi_prepare_sleep = hook; +} + #ifdef __aarch64__ /* * ARM specific ACPI interfaces, relating to IORT table. diff --git a/sys/dev/xen/acpi/xen-acpi.c b/sys/dev/xen/acpi/xen-acpi.c new file mode 100644 index 000000000000..1e46883e2c86 --- /dev/null +++ b/sys/dev/xen/acpi/xen-acpi.c @@ -0,0 +1,75 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Citrix Systems R&D + * 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 "opt_acpi.h" +#include +#include +#include +#include + +#include + +#include +#include + +#include + +#include + +static int prepare_sleep_state(uint8_t state, uint32_t a, uint32_t b, bool ext) +{ + struct xen_platform_op op = { + .cmd = XENPF_enter_acpi_sleep, + .interface_version = XENPF_INTERFACE_VERSION, + .u.enter_acpi_sleep.val_a = a, + .u.enter_acpi_sleep.val_b = b, + .u.enter_acpi_sleep.sleep_state = state, + .u.enter_acpi_sleep.flags = + ext ? XENPF_ACPI_SLEEP_EXTENDED : 0, + }; + int error; + + error = HYPERVISOR_platform_op(&op); + if (error) + printf("Xen notify ACPI sleep failed - " + "State %#x A %#x B %#x: %d\n", state, a, b, error); + + return (error ? error : 1); +} + +static int init_xen_acpi_sleep(void *arg) +{ + if (!xen_initial_domain()) + return (0); + + acpi_set_prepare_sleep(&prepare_sleep_state); + return (0); +} + +SYSINIT(xen_sleep, SI_SUB_CONFIGURE, SI_ORDER_ANY, init_xen_acpi_sleep, NULL); From nobody Fri Feb 27 07:56:34 2026 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 4fMgdG1SZ1z6Tqbm for ; Fri, 27 Feb 2026 07:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMgdG0rbnz3vc6 for ; Fri, 27 Feb 2026 07:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772178994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u2qR766iZo713PEfkQnX6cWnGzFTiwHsyxKeS/epWDc=; b=RLdXLRi40JJCrUGE7iLaRh4cUE2SDUdafQSZwrX+PBiKiyfOpWv/zL7s+GzbaQCtzwaoql V88+Nt3BLBWPfP25biSlyehgc6rUwYkCJafO3qjqe6g56UUjbHrTJwEZCFPzTmfD3QwVjl rchCcBd7R+WQIcckb7Ln2qJxrKIw2XXtWH+xGuFoTDs/t1V3/B7EX17ZwlSig06qAa4JHP dr8OFnU3kBgq9bPbwoG/N3Elinu317FLnc5yTqs6F4NtB/NlBLRAUtN+gbQaoMXB2kTOom XxFWeQJpQLvY0lxihEIZSrJbFktJ4LAVHpJvQ+d1UZyfXuKrduAuohbTtvAD5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772178994; a=rsa-sha256; cv=none; b=q0Pcp+RPh9W6JapyXHZhWOUHvtUdAgfXvxSXSL9YZVOlcfEy90pDn+LArdEucUT2cBRgWK IAMf9e4PFIwH8VIDuVEnnZ1V8KqrVGUDeBIwrPbhyNahQlP94uhVT3Au0mUTw9eiwB2hVK rlw0Yp5fXADe0pjOtSTkpefa2eEfmQeS1e9xa4VhyHJtaCTb1TXmcyK+m4DnzAM8Cur1Yx k2m5qlzFdXdhIVnZei9FtknJtaf1y6wTys5YB5UWCF+FHUZcwJcZJv1p5C+WVlqt0Y10SW v4q/UhX5X4sdjIHmMiQt2wGmZwF8X+ko6GCRGU5FNBYzHNcTIBkMNkuhNVDEdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772178994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u2qR766iZo713PEfkQnX6cWnGzFTiwHsyxKeS/epWDc=; b=u+B//JuKIDIdtoKlS0513k+5IqN+5eXhbc1VwPoZNuyZmLdMWopRz6pvWT4LP3NPhu8Vlb NPV+K83tUysSrVtbeAmR/xxYEVZ5Wf4KOeofUwgtuHSslhKCXNjTMmPcxbM+drWXO2BE4l UxqxCqRRLzNrbm4HNSaDMtddStGXq9n59MbMYMBRXvrrY8ok5qk35hPrPFXAHF4a6I0wDN 5frMeIUs2/FsoEhEXxNGQr7Ckyt0He1qBfyI4ZNzMV2j9bVcOFh3NS19XOawbwK5RapOIf Zn+AsR87wNkkesXv1PuKI4+8wfqDgr5ONWs2/7djUzFEKAYKI10t5Derd9W0uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMgdG0FmMz185G for ; Fri, 27 Feb 2026 07:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19f22 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 07:56:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 6bd97e9e01ff - main - sctp: fix NOINET 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bd97e9e01ff159eef49b2521fdbe67d5db10d95 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 07:56:34 +0000 Message-Id: <69a14e32.19f22.11b1a73c@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6bd97e9e01ff159eef49b2521fdbe67d5db10d95 commit 6bd97e9e01ff159eef49b2521fdbe67d5db10d95 Author: Michael Tuexen AuthorDate: 2026-02-27 07:51:29 +0000 Commit: Michael Tuexen CommitDate: 2026-02-27 07:56:01 +0000 sctp: fix NOINET build Reported by: ngie Fixes: 454212b9718b ("sctp: fix so_proto when peeling off a socket") MFC after: 3 days --- sys/netinet/sctp_syscalls.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index 01f241d29637..4837925fdfd7 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -29,6 +29,8 @@ */ #include "opt_capsicum.h" +#include "opt_inet.h" +#include "opt_inet6.h" #include "opt_sctp.h" #include "opt_ktrace.h" @@ -77,6 +79,9 @@ #include #include #include +#ifdef INET6 +#include +#endif #include #include @@ -173,7 +178,21 @@ sys_sctp_peeloff(struct thread *td, struct sctp_peeloff_args *uap) td->td_retval[0] = fd; CURVNET_SET(head->so_vnet); - so = sopeeloff(head, &sctp_stream_protosw); + switch (head->so_proto->pr_domain->dom_family) { +#ifdef INET + case AF_INET: + so = sopeeloff(head, &sctp_stream_protosw); + break; +#endif +#ifdef INET6 + case AF_INET6: + so = sopeeloff(head, &sctp6_stream_protosw); + break; +#endif + default: + error = EOPNOTSUPP; + goto noconnection; + } if (so == NULL) { error = ENOMEM; goto noconnection; From nobody Fri Feb 27 07:57:48 2026 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 4fMgfl1lnHz6TqdV; Fri, 27 Feb 2026 07:57:51 +0000 (UTC) (envelope-from tuexen@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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMgfl19yjz3w5L; Fri, 27 Feb 2026 07:57:51 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772179071; 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=dH+N9p2UJ+1xipaIBUgcLwMCrCj8TdjNIcZ8lHEdp0A=; b=KR7M5pDhvMZNkXIKWbWxWTw/FZuOha28z/nGvdaax1D54GTNAZ1lEt7eqFI3mnULijthrU ygJK9mZKpQX1ei2sCkIzmDtrs1R/QetemvZQZGS7+Xb0/1Nh3qAajFWjZ/Zd5riwo+EmCk njsW/OdIUKWjx8TZZ9y4i9xqGVsExTdaK8+UqvZTG25n6FydqYB577zmmxmvnMYNi1MyxR 1UViCtcpvGq8vHlElDEClB+ayQtUYwuxJWKRDfwA2hzR2GfvCo4lCg8meDU5fA2FoXkfAZ 6ROJaL1EbJ+aeCV1Ai924OpMRc+pFOX1y7043I2XJMrwqNegVOAcR4jO07puyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772179071; a=rsa-sha256; cv=none; b=ixJrmN16l0c1zEzxJ4oO81cc3WfoXY3nKr/ApsZeyAzJ8xzxlatBsRUbMOPR3+2GimUjbL iS9EI+kNrQEdL8t2/YszU8gv+nuJpv2tKGmTbDToUoGVe8OQR8dFa+B5WXo6dlUXi9DHA3 RJ+SgMvPe6R+oinECxSwlXRGCT+7IMNlAp7fn4/Oxee9E8+2tIgZoG3BQpM0T8N4dDXgkL WkA7wBXe6FFV+09yRv97R/p/zXecUrgVl6xSOf5v+J0jSe6UFCF1pR/G0XCTivYuBUhkwv voVx0ErikCSecknI/vIhc6j0dFVseNrL4UBOymOUhZtt0j2T4DbDYF3Xbnm04Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772179071; 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=dH+N9p2UJ+1xipaIBUgcLwMCrCj8TdjNIcZ8lHEdp0A=; b=xjL+et7z2v765OC1JPNuqpkpl0sGjyoBL83oD1/863rJ0vOwbKOMWtYfMd8mV0r+e/Yakm OwnQvOx6huqdJHSPN960gLxoF9L6Rc0JVPrYi+cBFWBsLDi6eIaCcmK3W49aUxWVqQFgqK JCFpCh+ZwnI4WpEr8oOwBwAU7Xd9m7vUzBDf3TdEctTI3Mcvn4iQ60zdXB5cFDz6GUFsMg 9mahge9CO0ZBGhb0buoPBMKXY3yZD3IwvjGXXEtyE9M7q6/IQyPscY3UyQSXfQ4kv0BvVs /sHs275eEgS6vWzOXRGkg//fJZgm8vVFmJxtYP1DTHqdCGzCxS4cZo8H16hKqw== Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1101:be00:3cd2:796a:add9:aa81]) (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 4fMgfk3K6rz3Tj; Fri, 27 Feb 2026 07:57:50 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) 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.400.21\)) Subject: Re: git: 454212b9718b - main - sctp: fix so_proto when peeling off a socket From: Michael Tuexen In-Reply-To: Date: Fri, 27 Feb 2026 08:57:48 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <320FFBF5-040E-4EA7-A960-8DC3A632744B@FreeBSD.org> References: <699ef25d.42e41.7579887f@gitrepo.freebsd.org> To: "Enji Cooper (yaneurabeya)" X-Mailer: Apple Mail (2.3864.400.21) > On 27. Feb 2026, at 04:46, Enji Cooper (yaneurabeya) = wrote: >=20 > Hi Michael! >=20 >> On Feb 25, 2026, at 5:00=E2=80=AFAM, Michael Tuexen = wrote: >>=20 >> The branch main has been updated by tuexen: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D454212b9718b55b43781f81bef252658= e20e0fd3 >=20 > =E2=80=A6 >=20 >> @@ -171,7 +173,7 @@ sys_sctp_peeloff(struct thread *td, struct = sctp_peeloff_args *uap) >> td->td_retval[0] =3D fd; >>=20 >> CURVNET_SET(head->so_vnet); >> - so =3D sopeeloff(head); >> + so =3D sopeeloff(head, &sctp_stream_protosw); >=20 >=20 > This part of the change broke LINT-NOINET because sctp_stream_protosw = is only defined in the INET case. I didn=E2=80=99t dig into the SCTP = syscalls too far, but I think that the right protocol needs to be picked = per the address family, right? Fixed in = https://cgit.FreeBSD.org/src/commit/?id=3D6bd97e9e01ff159eef49b2521fdbe67d= 5db10d95 = Thanks again for reporting and sorry for breaking the build. Best regards Michael > Thanks! > -Enji From nobody Fri Feb 27 08:07:52 2026 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 4fMgtJ2vz9z6TrRZ for ; Fri, 27 Feb 2026 08:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMgtJ1lr0z3xF8 for ; Fri, 27 Feb 2026 08:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772179672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+wmCrmr/t1D76wTbZx6Znc5Y3K1+ejkLno3MAhH6bJo=; b=NtKSYqtf3IY0LEDXCeKS6OkXrWmk+UnxDrkfrvO40pPOKeM5cn2ScTgSXjZknqmHrdDAxo WhBBBrkHPJG3gl4oH/i0k/gKpSj+vFQ9SpWFg98o8ZwFlLpL/7fXK/Clu+WCue4diIsYOa Q3G17HPTx4/KJMowbUYbxhk5AvPvUDL/qK+eSTrgzOMg5OYWbLBMtUnFRwFsRWOEPkuqO+ 86mpMgWk4mKvjMQDS4KHBPq2E7yS6PhkJpnixI14jcHRY4dfTCUxvFmtXgWogVgyYS02zj DMqj4ELzW8FLD0sxC9B523U337u+jtY2s70kftjFGJMcE+XcbuHewMmXdIC0pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772179672; a=rsa-sha256; cv=none; b=fbtnBjiMy1vI9kCw14R5/qoO6v6TFa6L4sP6x5VybBbwgYQrdtLV8sg1KOZa9ptUtVuqaF wrL9oavbhAvB5x1pJfJuyfPLmiGRSZeqVtqBm/0/GzlVwVnuwLaoYI+UUxVpKkk8pXmRlE g/bZXy35MH0Jkaw92wraZjd6nJ0MeWWRoW0veu5VWjkQoIJR7bP0crRq48dqRDHJsxqToc heXNFBTahgLFOqB5gsUCMuvl0ptVEv1d7D4hfcQT6DL+s//2FyqkCjlQ6/Al5DVPwS6q6I 0qTq/hl/EPPPMNoCrrjteiO/IgsIhWuCZLRPRjsXTopGIDSgWAobpZsqO3vjOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772179672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+wmCrmr/t1D76wTbZx6Znc5Y3K1+ejkLno3MAhH6bJo=; b=x9R7d7uM521l8HCU+ynIIw+IZFXAD6OpukpxfVfAmkR5T2NajQcVxtBKYxqsN6ahSiVvXS 7AE395U3TvzoZk7O/a1kNuXvjxRC2/x67J7VFzO4yrQ+GERODIp/NtjS0QFN9/TATBPf5S eiuJA0Xj/xR4cMVpSsqqTKQJEQvpQBo2IcMxv2GWRG005E74c3NFz07d5gsWYh3YVLa4Wb EVc3ADPvWHxvs1ic4f4PGxlvr0WZFerVl/tmAdDLfA4zx0/yo42eahvl4x77jXRxwbLZaC ++sSVr+xv2/iEyq2oNfnmLo9/3ffdinxTkm2keHg7iK6dJZ26YjID4l6x8UD7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMgtJ0tWdz185h for ; Fri, 27 Feb 2026 08:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cc26 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 08:07:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c3577fcf3fd0 - main - dpaa2: improve error messages and log requested cluster 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3577fcf3fd0494cc992021d4debbca09241a49e Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 08:07:52 +0000 Message-Id: <69a150d8.1cc26.47aab394@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c3577fcf3fd0494cc992021d4debbca09241a49e commit c3577fcf3fd0494cc992021d4debbca09241a49e Author: Bjoern A. Zeeb AuthorDate: 2025-08-20 21:04:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-27 08:07:26 +0000 dpaa2: improve error messages and log requested cluster size If m_getjcl() fails we want to know the size we requested in order to have a chance to evaluate the problem better. MFC after: 3 days Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D55555 --- sys/dev/dpaa2/dpaa2_buf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/dpaa2/dpaa2_buf.c b/sys/dev/dpaa2/dpaa2_buf.c index 7739eda5d8de..8505b074fe4f 100644 --- a/sys/dev/dpaa2/dpaa2_buf.c +++ b/sys/dev/dpaa2/dpaa2_buf.c @@ -154,7 +154,8 @@ dpaa2_buf_seed_rxb(device_t dev, struct dpaa2_buf *buf, int size, if (__predict_true(buf->m == NULL)) { buf->m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, size); if (__predict_false(buf->m == NULL)) { - device_printf(dev, "%s: m_getjcl() failed\n", __func__); + device_printf(dev, "%s: m_getjcl(%d) failed\n", + __func__, size); error = ENOMEM; goto fail_mbuf_alloc; } From nobody Fri Feb 27 17:27:44 2026 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 4fMwJL0nsKz6SnFD; Fri, 27 Feb 2026 17:27:46 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMwJL0DHkz45bc; Fri, 27 Feb 2026 17:27:46 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772213266; 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=c5/E9LrUYy1kLVkdI7YZG4Um67LBCFZsEQ5XiRopeTA=; b=Oc6XSQoZ9Lidbn6p/XmF8ORpFH5kpq+5+hx8QPj+lH61DuoBU5wQGtD88zlFz9zGZImuUD RaSnO57EB2/BbPHMOnqPNduFcvYoFmAqB/Qe17VdQo9QXid+z/Q8oA9YkcuYSN9K17q0Tg Vueuy0eI6UVl2YcZZs/UEdXqtRiGrCmVxGjXahOMZhnuWUeRwG6i5D6XUQ9sqqtlwwrM0s qPsPXckUj7c/x5r7SjKdqYesSbrgEF0Zmu5FruNo1zGpbwqvq4+JscntOdYfjGfU0+B6Kp cuL0TMN6nPsbzbLxY3Z/eY9DL3KHlKDvNJ43Zr4TCtphHSuy75GlTC6AOT8rDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772213266; a=rsa-sha256; cv=none; b=ebrNDjnhIRN/nTrzUPJvK4Iq7Mp1nyiIo3qg6N+VPlIuGjWNOmiS4mdM+IhZGYLfPIGFX4 w/gVNVNHHwbIUyr/tIt9qchLwE4cUWRI3j8EKUz9xKJZLpzfNiroAcycAGn67ct76DdqoS 0Xp/HIeFDFkqKt0uqesWueXROCppNmGP7fu/pAIeWOoz150oOR52DBaVnDO/y+hadxFmGa yXtG0IBY+gPLggW//kowVPk+detCvVjDrLnF4v8G2/Y5A9QKEQdTwUOKmDZkMZJIOaC/qc B0r0OcU+BumKOjFX9wKu+geMv79NbaMsAdHX8z9tt36T+nNDNXzNrjkEuqdDvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772213266; 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=c5/E9LrUYy1kLVkdI7YZG4Um67LBCFZsEQ5XiRopeTA=; b=RXDfy3KpRpvv+MRdpfPHOpFaIg6a+Cn+tCOeUOvI8TD2DIv6aFRD42wBwM0xhKWnKjcT+t ImkTmbDWK5mlGE5LCjbyWcyRWQs4ZddTMtZR0miRAGVVXd6RyMpDs/h3vRK7ckBALtDz4v nGY6O4PQj2Y7YNN7cd2w0XVJlPh0HQKR9gc6w8HbHugiMqY36mnI8NLKUWq76p0MaMqCyl 404ufyHzTvxzd5pAcFErNUI1s3Lv01dBPIQZFKBUs0O1Jc1sP0MzPMS/bM59Cs5S1OJZK8 /4tKRxQ4TxxDY23cySD+C90GJ96qMYmmjcVhHKPboXX5HsPCvPgajGjCuZeVWA== Received: from [IPV6:2601:5c0:4202:5670:f561:a422:8150:b740] (unknown [IPv6:2601:5c0:4202:5670:f561:a422:8150:b740]) (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 4fMwJK4LgpzGcC; Fri, 27 Feb 2026 17:27:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <23acebb1-f71c-46e6-9eea-3fa44316335d@FreeBSD.org> Date: Fri, 27 Feb 2026 12:27:44 -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: ee73475119ff - main - llvm: Link private LLVM libraries against compiler_rt for aarch64 Content-Language: en-US From: John Baldwin To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Andrew Turner References: <698a0b1e.1d294.40e36519@gitrepo.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2/9/26 11:47, John Baldwin wrote: > On 2/9/26 11:40, Jessica Clarke wrote: >> On 9 Feb 2026, at 16:28, John Baldwin wrote: >>> >>> The branch main has been updated by jhb: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=ee73475119ff7aa98bd11828625d524f6ab87f06 >>> >>> commit ee73475119ff7aa98bd11828625d524f6ab87f06 >>> Author: John Baldwin >>> AuthorDate: 2026-02-09 16:26:52 +0000 >>> Commit: John Baldwin >>> CommitDate: 2026-02-09 16:26:52 +0000 >>> >>> llvm: Link private LLVM libraries against compiler_rt for aarch64 >>> >>> This is required for GCC which uses libcalls for outlined atomics. >> >> This doesn’t seem right, they’re provided by libgcc.a, so why aren’t >> they being pulled in? libcompiler_rt.a doesn’t even have the symbols. > > My guess is that we don't link libraries against libgcc by default, only > binaries (maybe this is a GCC feature/bug vs clang)? I have another review > open for a couple of google test libraries which similarly fail to link. So after some more digging (along with Jessica), it seems that GCC only uses -lgcc_s (and not -lgcc) for C++ (but not C) on both Linux and FreeBSD. clang's FreeBSD toolchain driver is supposed to mimic GCC but doesn't, it applies the C rules even for C++ linking, so clang is implicitly adding both -lgcc and -lgcc_s for C++. On Linux, libgcc.so is a linker script that includes both the dynamic library and -lgcc which is how the static libgcc (including outline atomics for aarch64) is effectively linked into C++ shared libraries on Linux. (Note: libgcc.so is a linker script on seemingly all arches on Linux, not just aarch64) So I think we have a couple of choices here. I can patch the devel/freebsd-gccN ports to stop passing -shared-libgcc to cc1plus which will cause GCC to follow the same rules as clang on FreeBSD (passing -lgcc -as-needed -lgcc_s -no-as-needed instead of -lgcc_s), or we could change libgcc.so to be a linker script to match Linux (and then eventually fix the FreeBSD driver in clang to only pass -lgcc_s for C++ linking) (I think Andrew already has a review to make libgcc.so a linker script). I can see arguments both ways. Using a linker script seems kind of dumb given all the hoops GCC goes to internally to decide whether or not to link only shared or static or both. (Esp given libgcc is in theory part of the compiler, so the compiler should know that libgcc_s should depend on libgcc and be able to encode that in the default drivers.) OTOH, the linker script approach would mean we would more closely align with Linux. I think Jess favors patching GCC. Does anyone else have any strong opinions? -- John Baldwin From nobody Fri Feb 27 18:43:29 2026 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 4fMxzj3xNhz6Sxsq for ; Fri, 27 Feb 2026 18:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMxzj3Nwgz3JPD for ; Fri, 27 Feb 2026 18:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772217809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JVkLcrdQZ7k5rTkcZAczvdMy2RfCAlVUb0L082+e6yQ=; b=Js2MsrfNmFl8I29+pcFGei/0WaURGZUUYSdVEVBLg1JvqCptrm+S38T9MxWiDeBCQPuS+5 pUlv1RhWU9pnchhglYx46YrBPhFVhvpVNiw4omWUSuj39w0kw5rGzn+l4YfGXrQGs6dWWt flmhUi3AnabA677GDm1X4ylhKwGey7keCQIRSrxrpxklgd/1x6Fsp+Lc6tWir68ZX+Tqqs UDFKjepjsot0hMRBSv+d/FxyF50JZECu8NLIlnRgo6TmfLE7en3YV9PYjPklJG6ZTN0dzH leIQL2AClB0cCZ9lxA5cDwrOYcvmTQDHoF3R5sPftaRqbPjpA6eNgrYoOQihpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772217809; a=rsa-sha256; cv=none; b=Xa3Ftx0VJnruTA695Yu4X20YnUcR/kR4QOQfqK+P4ENM37jdo+jRf39VbcUzL5lnkWce0z ueYRI/9+BtFW4x5H0dRsk7QIshNr/3t1nEsoFUsuDdxpchKINgWk5SGqnEch2BT8ZLMEaL H6sYoK/C7dRW6ZgR3dBpGe7kGJ8Z+xwM0xLtbLZxKz8GuXgXX9CkpgffuCkscu6+w0VjIl ofhl1sP/E1P/Y2agVO2pRD8ILu8Mx7aALzUqb1f2divxLFXghu/AL73NPG3UmnG3zwuotG O+T0j/3SEL5BiSGqwcXIdqei7unLbqJ9g+71Tf65IvtK8xkMfr5FqyOySeXxNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772217809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JVkLcrdQZ7k5rTkcZAczvdMy2RfCAlVUb0L082+e6yQ=; b=far2FyLOYODGdFEWFhRa2pEHjd51XNdmqj0HEEv4BOUpCksSSIyWmmxn9qcS15Z4f5sbB4 DPy8KGDWzgtZrmQRzMzvIvy+k2cWzEHw4FqJY8t4RVYBnaj5o7lQ5aj7g5QIfgyz5tJD8Y xmHH17+QjZsryJJceDYiUjaNm+sBQJM0Y2/y9rzkTrlmkKlkM1VSXShv14j9g3woHUYaLA i7Jb/oNy85CcpGB/vLyGrwAQQslf9OKAuuru3VmjgiO+FGsT4YmZHk8Jb347NneqTmRImu vlz1CxN8JZ2V17KalM7Wkx4mxl6mQ/soNzIGdeDBSR4v0AzK1VYBaxX07jxoPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMxzj2pdlzDWl for ; Fri, 27 Feb 2026 18:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46c4b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 18:43:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: afbfc2a617ee - main - gre: unbreak LINT-NOINET 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afbfc2a617ee16b4c3bafef869690b594f812690 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 18:43:29 +0000 Message-Id: <69a1e5d1.46c4b.27ac4081@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=afbfc2a617ee16b4c3bafef869690b594f812690 commit afbfc2a617ee16b4c3bafef869690b594f812690 Author: Enji Cooper AuthorDate: 2026-02-26 21:31:25 +0000 Commit: Enji Cooper CommitDate: 2026-02-27 18:43:20 +0000 gre: unbreak LINT-NOINET - Move some of the braces under their respective conditionals to make the statements more self-encapsulated and only define the `aliasreq` union in the event either INET or INET6 is defined. - Fix a copy-paste error: `in_gre_ioctl` should be `in6_gre_ioctl` in the INET6 case. Reported by: tinderbox Fixes: e1e18cc12e68 ("if_gre: Add netlink support with tests") Differential Revision: https://reviews.freebsd.org/D55546 --- sys/net/if_gre.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 758f25ccb859..f8036bf4446d 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -327,10 +327,10 @@ gre_clone_dump_nl(struct ifnet *ifp, struct nl_writer *nw) #endif } else if (sc->gre_family == AF_INET6) { #ifdef INET6 - if (in_gre_ioctl(sc, SIOCGIFPSRCADDR_IN6, (caddr_t)&ifr) == 0) + if (in6_gre_ioctl(sc, SIOCGIFPSRCADDR_IN6, (caddr_t)&ifr) == 0) nlattr_add_in6_addr(nw, IFLA_GRE_LOCAL, (const struct in6_addr *)&ifr.ifr_addr); - if (in_gre_ioctl(sc, SIOCGIFPDSTADDR_IN6, (caddr_t)&ifr) == 0) + if (in6_gre_ioctl(sc, SIOCGIFPDSTADDR_IN6, (caddr_t)&ifr) == 0) nlattr_add_in6_addr(nw, IFLA_GRE_LOCAL, (const struct in6_addr *)&ifr.ifr_dstaddr); #endif @@ -1041,10 +1041,16 @@ static int gre_set_addr_nl(struct gre_softc *sc, struct nl_pstate *npt, struct sockaddr *src, struct sockaddr *dst) { +#if defined(INET) || defined(INET6) union { +#ifdef INET struct in_aliasreq in; +#endif +#ifdef INET6 struct in6_aliasreq in6; +#endif } aliasreq; +#endif int error; /* XXX: this sanity check runs again in in[6]_gre_ioctl */ @@ -1057,16 +1063,18 @@ gre_set_addr_nl(struct gre_softc *sc, struct nl_pstate *npt, sx_xlock(&gre_ioctl_sx); error = in_gre_ioctl(sc, SIOCSIFPHYADDR, (caddr_t)&aliasreq.in); sx_xunlock(&gre_ioctl_sx); + } #endif #ifdef INET6 - } else if (src->sa_family == AF_INET6) { + else if (src->sa_family == AF_INET6) { memcpy(&aliasreq.in6.ifra_addr, src, sizeof(struct sockaddr_in6)); memcpy(&aliasreq.in6.ifra_dstaddr, dst, sizeof(struct sockaddr_in6)); sx_xlock(&gre_ioctl_sx); error = in6_gre_ioctl(sc, SIOCSIFPHYADDR_IN6, (caddr_t)&aliasreq.in6); sx_xunlock(&gre_ioctl_sx); + } #endif - } else + else error = EAFNOSUPPORT; if (error == EADDRNOTAVAIL) From nobody Fri Feb 27 19:11:40 2026 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 4fMycD3Ltyz6T1mm for ; Fri, 27 Feb 2026 19:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMycD2fjQz3M9T for ; Fri, 27 Feb 2026 19:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772219500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NqyULnfe+Wvjikp1R6tPQEHnNMNQ18yQnb3xWq0VdV4=; b=EhIErE+knhsmqz5TmfOq2kohnOnhoKFhX9+F/TJppZ+TMPcgy7q5JICFIiFSJS91Vc3bf3 WyCYnK3xwVnIUn3OnxaSN7kK+RV5YfyHdqkCsNNpIPFfppNJPARB6J/qzLHkgAZBYnfFmf yoMTCfup32hFlj9RATQtu4MDEMh6LeTFsaS6E24555defiPU3gWvpTprRtdVi1TwewPmQs 7nB/SMWJ8hCVOX/huFSrUI8DtF43PO/deH2epHrLA6wlsDrnWbBQ5LgQX7P/M1wgI8ekVv Gpzx2HHEnUDm1DZoiq4htJbbTMXmZ+tj80z0m6h08AnNE+0zUFXNMYBP47dzbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772219500; a=rsa-sha256; cv=none; b=vjRIWbr6JF2eB6XfJdUI5YfTLQmnm6j8yy3KxokRPuW1FOJP/sxw3CqLkKeEeg1DfmPClk LMkCAzkSzCtn4hjr1r8nV0tQ7GiLSgJKGg8tHcfDiKvyQENpd7VGFi0cdbt3+tHGdC2X7o oAAAct306+m41aVlfGHaKX3/j+HvmCcrIi1bB8PAeKKhORrflLp5C+SwLLmVaVBk6wF6WF MxdJqvmciqMduxG+YKC3FUXMm4qPj83J6qhIvCofOvaNXyyvcjlfAGx29/wwKiDZBSGyvV tEY4EpPHyA6fLZloFsvAZB+YfC2hbIKKMVFUqZdNFTt5Oh4sacZ/GpNCuhjxyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772219500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NqyULnfe+Wvjikp1R6tPQEHnNMNQ18yQnb3xWq0VdV4=; b=mTIyWeGJyVqeq/uCPU4isc4j/pIuCwwrk5Gy12D3EOROfRtbYcJCMYsN6O0ijxIgBbPedX GHbiRXuBGKRfcCXcJCKRofMRqqaG+HVdyK9mHfWbTvMlEdXf4cDZd3YgtRWdqgDVwU/j+l obe/t/Oc1f2Bd3AaArfOkcJ0Y078OH1deQHB5PLDVYLKs9c6A09zZD/ww06GFj5m2XF3/z RYHLidBCHTMGYdl8soVyFbhVh3mQIai3zTC9X9UenDNkyixwfCev0No/d875a9XKDLgcSW SvGfX/+9OvvPXNQUxQ/M6ZOumupIWc2XjYX/EDJcztOfgVkDpwqrnHVtkU2YnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMycD26f0zVbw for ; Fri, 27 Feb 2026 19:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c232 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 19:11:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 960409d66048 - main - vmimage.subr: skip -dbg sets for WITHOUT_DEBUG_FILES/WITHOUT_KERNEL_SYMBOLS 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: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 960409d660486c823615dc4cb2ff91793337ef20 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 19:11:40 +0000 Message-Id: <69a1ec6c.1c232.5547b73e@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=960409d660486c823615dc4cb2ff91793337ef20 commit 960409d660486c823615dc4cb2ff91793337ef20 Author: Navdeep Parhar AuthorDate: 2026-02-27 02:04:16 +0000 Commit: Navdeep Parhar CommitDate: 2026-02-27 19:05:14 +0000 vmimage.subr: skip -dbg sets for WITHOUT_DEBUG_FILES/WITHOUT_KERNEL_SYMBOLS This matches non-pkgbase behavior as installworld/installkernel skip the debug bits if these knobs are set. MFC after: 1 week Sponsored by: Chelsio Communications Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D55572 --- release/tools/vmimage.subr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3975e94913c9..97bf52205c93 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -72,14 +72,14 @@ vm_base_packages_list() { # Output a list of package sets equivalent to what we get from # "installworld installkernel distribution", aka. the full base # system. - for S in base kernels; do - echo FreeBSD-set-$S - echo FreeBSD-set-$S-dbg - done + echo FreeBSD-set-base + [ -z "${WITHOUT_DEBUG_FILES}" ] && echo FreeBSD-set-base-dbg + echo FreeBSD-set-kernels + [ -z "${WITHOUT_KERNEL_SYMBOLS}" ] && echo FreeBSD-set-kernels-dbg case ${TARGET_ARCH} in amd64 | aarch64 | powerpc64) echo FreeBSD-set-lib32 - echo FreeBSD-set-lib32-dbg + [ -z "${WITHOUT_DEBUG_FILES}" ] && echo FreeBSD-set-lib32-dbg esac echo FreeBSD-set-tests # Also install pkg, since systems with a packaged base system should From nobody Fri Feb 27 19:44:14 2026 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 4fMzKp6DcDz6T5ds for ; Fri, 27 Feb 2026 19:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMzKp3ptqz3TBb for ; Fri, 27 Feb 2026 19:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772221454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ADDI/Cq2/KC/ds83DdXs5saJy2KQ3u9GBkIZRgbjvVA=; b=QKncrEnFbb5ICuaR6UPCkYYFzva2aqbsJXCFaFyW9Yw+kQ9Zodfwo4Tx6oDSKKJs17zxwc 1BEbsNKyaVRkEFD2lde0TCk4V1XJPxuEvlEo3FbjB63F+DY1T3Tnj/a5QW4NFRW8BY9qJ1 BUz/KQ71xehS1e6r0y/whYeeHZ43SZdYSZLenpfc7vTFWdKUnbTM67y6lCiJjs0/udgtmA NWRtNPkI5K1f2wHQmifyY6E7oC+Ev4VnfmslNIkW3y3WbdY0r21bQhL+rWfqifXUowLX35 8XnkwiXQIA5/K5DV9krFAjtLGlVLANA/RWc6or4jEBVuW3AIttvg/LZU9VKozA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772221454; a=rsa-sha256; cv=none; b=YjqCzHCby7a9YF9l84GtJMi9NL5DYTdpPbNeALhyfI6MgXC45XjkKy11SF7YW1C75Tpt/g EhpRIY+R+TdpIN88AkUa+rItlNSUpzZRpytnJYhm3H7KSffnbQAhbhoqt2FSuPrfIlykrC Vhmu/HOvyoPPk/dd/FhbXi5ad4McjsUiEe0kZmK9SO1Htm2+kxZzi3/tpfIMbnExDzewTz LeIkDoUBPykeykZF2q1/kh4/u/GrNW15K8zobNSxP1aHC2FCPtKlw/dkyyiVHOhUj8GnOE ZDpP+jjPHnIaQwlmzxxXAbKEcsmGppM4l93koCzclUDZELMFSaoYVDG9Z2lPqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772221454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ADDI/Cq2/KC/ds83DdXs5saJy2KQ3u9GBkIZRgbjvVA=; b=HN0GxG5KReAeZwK0gDOz3eJK3RyXvRRZ/z++RftGejxtcG94o/3c8HM+av/tEGFnHgDKja +q0vAVi1RtfKzba+m2pxIEm2iRfz2eH9TI29yCc8XET89gP8wkIttHK0qgbcB+g5hYFBlm V9ul8VmvxAumhcURVfx0c1z2p0OYGHp7+Iipi95mqfUKTf3r2X1Kbm9fhBUcbRbGFyvuMw SOECH3cRqozi9ZCGxrQG7EbLEiN313pgzpxBRnuE4uex/QIHn6PRFuuFTZuiVjaNmmrG7r 6Qhz67Zc6icSWrE7WYymCOkMZPFlH0AxyogcSFr7aBn5Rbm6gw22lzYI9PNn/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMzKp16VLzX6n for ; Fri, 27 Feb 2026 19:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eb9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 19:44:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 1f2f5eba24aa - main - asmc(4): pull 32-bit support for the 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f2f5eba24aa53e180a4eb46b772410e5a782469 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 19:44:14 +0000 Message-Id: <69a1f40e.1eb9e.56768185@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=1f2f5eba24aa53e180a4eb46b772410e5a782469 commit 1f2f5eba24aa53e180a4eb46b772410e5a782469 Author: Enji Cooper AuthorDate: 2026-01-05 03:36:55 +0000 Commit: Enji Cooper CommitDate: 2026-02-27 19:44:08 +0000 asmc(4): pull 32-bit support for the driver The asmc(4) driver should work for 32-bit Intel-based Macs, in theory, if the model details were added to the detection list. That being said, 32-bit Intel Macs were only released and available to the general public for 8 months [1], so the value in maintaining i386 support in the driver is reduced due to limited hardware access. Remove 32-bit support for the driver officially to make it clear its use is not supported. This should fix building `NOTES.i386` by proxy as well. Relnotes: yes MFC after: 2 weeks Fixes: f224591746b ("Add ASMC_DEBUG make option") Fixes: 8342d9f7b5f ("asmc(4): Stop building it on i386, as...") Differential Revision: https://reviews.freebsd.org/D55544 --- sys/x86/conf/NOTES | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/x86/conf/NOTES b/sys/x86/conf/NOTES index 643105096be2..501d4159b129 100644 --- a/sys/x86/conf/NOTES +++ b/sys/x86/conf/NOTES @@ -525,7 +525,6 @@ device ntb_hw_plx # PLX NTB hardware driver # pbio: Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724) # smbios: DMI/SMBIOS entry point (requires EFIRT option) # vpd: Vital Product Data kernel interface -# asmc: Apple System Management Controller # si: Specialix International SI/XIO or SX intelligent serial card # tpm: Trusted Platform Module @@ -541,7 +540,6 @@ envvar hint.pbio.0.at="isa" envvar hint.pbio.0.port="0x360" device smbios device vpd -device asmc device tpm device rdrand_rng # Intel Bull Mountain RNG device aesni # AES-NI OpenCrypto module From nobody Fri Feb 27 20:44:34 2026 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 4fN0gh6v4xz6TCw5 for ; Fri, 27 Feb 2026 20:44:48 +0000 (UTC) (envelope-from yaneurabeya@gmail.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 4fN0gh4rLMz3b0B for ; Fri, 27 Feb 2026 20:44:48 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-8274843810cso1109639b3a.3 for ; Fri, 27 Feb 2026 12:44:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772225086; x=1772829886; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=pHhrj6GUHyFKYRprAuFlqe5aE76c6L+BjZ3IB5idvC8=; b=BLNud+ADQ/X3Y4cc6ZnA/71YAlCf/Qc9QkdIClZZxIzCLQxULm5rAtd23vYbdUpG1Q uhwZ6b8s0N6cqJqVzXVaptdcRsjSnbuTk5Qoe5MGxJvhd/FiArYb18tOlf4znMFbO80x cy4ItH6p3nOxGWK+qdktGUlhnaoihP0T0Jjqq8hlw5vAtDNdeK5Mgzkz6Vijbj8dWxph X/rHbjZyaZOyxXnLSzCqolPkA5ni1MUVaK4GhPQL7fS1ErHOOLUplQS1jfdYOtKbEs8X jZgGY0r5BBsdbx3jDKBSluRDq4Ju4t8h1aAW6rHiYulR2FPii5yM9rLa9Lzp6uMW9CnU Gr1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772225086; x=1772829886; h=to:references:message-id: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=pHhrj6GUHyFKYRprAuFlqe5aE76c6L+BjZ3IB5idvC8=; b=GQ3VhUZNlQhdV32SBbWZPcX/+LyxJTlhfWgN+u+JukIE5v/oLEJofdI6kZi4JMeq0a bsopgZ4c9prPqfi2dPWISyZ+zSoQez5SzWOJHJaNS3TcyIGBiedlwrlw5cm108ck6/9K dOY5+2+XFSocehoOtaEoOlctbOgMnGCCjd7bW5AzPHKlcF/z5eUrfc12jLsGXIDNp58T rBs/ohWxiLxT02TMvrHQqwDeEA9UDinf3VOVs7h94Z9vpBkkop+jf5JAXQD1NX5DL5VL Mq86Kqc81zi9Lxe+VrrKJu923ilH+Bm5BSIc2lycHu54rIU3dJEQXQ+dKLxxAqROyeDC h9Ew== X-Forwarded-Encrypted: i=1; AJvYcCVVaYyKzwNRoURw7lnqhajWuCdB5zoXNgsrbLEnOxuQ8oZqxnwR8smAXHLyB2+DHjq/RyHTcrxsOvmE6Uixo/9n1BjgBw==@freebsd.org X-Gm-Message-State: AOJu0YyMD+Xeu8NdeKQ+pMFpm0XCcLZzPgJd5MNmqpP5eMoaG61JS4Ao ZmNAuXTAzPx3Yn4By1G9odiAppDONVTmoBm2tJgQq5lyrfMFChvE85l7q1tS8ef1 X-Gm-Gg: ATEYQzzi/zxti3fU9ZIpCdrT8PFJJxob3KwqyFnQotOHA3boGC65VMHd87fcnpcJ2by lBMtOzSmpiXFtZ5adIug6oO5HZIOa+UlLkhs3hRrmy1f2r1OCi91U7KdShdsJBaiv99xGD1hloV jGTu6KPszcS+DaJWrG/c1YkJcUvAgZJytlzTz+M+BjNfzOTnZscedMa/NIFXGgEJs5Am9YNJOyL xA3dIUZlwZ1Ih64BChWURUR69/K9fjVkCeSgKnxdjeGkHT/ucCSQ3YoHTaMB4IsZSuG3dAO2xFU vAlKLEPALqZZ4tmXSd5UIYDSi9CLf4wBsUqT7E9zG5bjXRgdtzab0EbQfutDJXNJTkuWJLCjU47 rwfNJRRm4X4jkgtoOh6TKy/YDlzDSdKZZXM7VxGq6YM77/77UVFQus2mMgXAvslk4YKQ3shkga5 +P78RbOGohYD2HZficTLdTvDcfiUHhuG56FhxgE71Sb4Ig9fqUV6lRpA== X-Received: by 2002:a05:6a21:670f:b0:393:7f50:f3b1 with SMTP id adf61e73a8af0-395c3ac7486mr3412225637.39.1772225086067; Fri, 27 Feb 2026 12:44:46 -0800 (PST) Received: from smtpclient.apple ([185.153.179.131]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c70fa8059bcsm5574599a12.18.2026.02.27.12.44.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Feb 2026 12:44:45 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_C3F01D47-4A65-45D9-810A-0DA7EF7A7B55"; protocol="application/pgp-signature"; micalg=pgp-sha256 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.1.3\)) Subject: Re: git: 454212b9718b - main - sctp: fix so_proto when peeling off a socket From: "Enji Cooper (yaneurabeya)" In-Reply-To: <320FFBF5-040E-4EA7-A960-8DC3A632744B@FreeBSD.org> Date: Fri, 27 Feb 2026 12:44:34 -0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <699ef25d.42e41.7579887f@gitrepo.freebsd.org> <320FFBF5-040E-4EA7-A960-8DC3A632744B@FreeBSD.org> To: Michael Tuexen X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fN0gh4rLMz3b0B X-Spamd-Bar: ---- --Apple-Mail=_C3F01D47-4A65-45D9-810A-0DA7EF7A7B55 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 26, 2026, at 11:57=E2=80=AFPM, Michael Tuexen = wrote: >=20 >> On 27. Feb 2026, at 04:46, Enji Cooper (yaneurabeya) = wrote: >>=20 >> Hi Michael! >>=20 >>> On Feb 25, 2026, at 5:00=E2=80=AFAM, Michael Tuexen = wrote: >>>=20 >>> The branch main has been updated by tuexen: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D454212b9718b55b43781f81bef252658= e20e0fd3 >>=20 >> =E2=80=A6 >>=20 >>> @@ -171,7 +173,7 @@ sys_sctp_peeloff(struct thread *td, struct = sctp_peeloff_args *uap) >>> td->td_retval[0] =3D fd; >>>=20 >>> CURVNET_SET(head->so_vnet); >>> - so =3D sopeeloff(head); >>> + so =3D sopeeloff(head, &sctp_stream_protosw); >>=20 >>=20 >> This part of the change broke LINT-NOINET because sctp_stream_protosw = is only defined in the INET case. I didn=E2=80=99t dig into the SCTP = syscalls too far, but I think that the right protocol needs to be picked = per the address family, right? > Fixed in > = https://cgit.FreeBSD.org/src/commit/?id=3D6bd97e9e01ff159eef49b2521fdbe67d= 5db10d95 = >=20 > Thanks again for reporting and sorry for breaking the build. No problemo! Thank you for fixing the issue so promptly :)!!! Hopefully `make tinderbox` is clean again now (on amd64/arm64 at least) = :D.. -Enji= --Apple-Mail=_C3F01D47-4A65-45D9-810A-0DA7EF7A7B55 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmiAjIACgkQGpE5DjPs NJiBTg/+PhtLgpUnJedbK+kWQr/McI/XKz8Ua5k9nAFQ+5mCJhM8xIQW33SZBq5f Ad51yfoyjfnDuTpU7i4QaOGfGZTwcPW2TCeqNlxLpUsWTf5Fn5WwIZMe4nkkIibG ua8+3N+8rWYMvR0XNEaGhLSqfQUXo62unuR7dM7dnRBAhlrFtemaEsP/gSDgtUwJ RuUc0wxPpR3NqBa6+6rWgRI9DR1ERLPfBPedGFA5OfiAX/sILLsqqo5WbunBIbym Duqr99PWcBW1VeOu9XcQpjaEcH5P6Sg6H65HBokXkNwAAaQIdsH4miT9YEZ/2b0T vtpAxVq4g9Srz8tOpfUTrlFwzjczm3cZ8KL3TNUfdp0E9nJuKQ9sCR6kJGn8kqiq vwS8BMv1n3rd+4jsiOPGooL0PpOi2oXya8UD/vtA6vv+m3NFWbpt4ZNBNwZXYcOb CY4FMxm23O4tGyp6U6bTHKhjYfST93rCEYJmxpKHBhwD13p6Ma+iKED8gPOy2+B2 lZPjnUVfTo+nT4JT3WZbgR4hLKU/YUisppbb1LHMflzELc0u+FWIl+cKjtQp6/Ny 8TQznn/pBi5q+Ql2DL/TvplQRSXFTgdb/q5XQiDBJH9R+zLQlgbWe3KAVmvVmItu 5RsFXfznDlWsq8ZZezON5t9TB0YbpTyi4QtveUSqH6drRLdtQuI= =zNhk -----END PGP SIGNATURE----- --Apple-Mail=_C3F01D47-4A65-45D9-810A-0DA7EF7A7B55-- From nobody Fri Feb 27 20:46:47 2026 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 4fN0jz6MYMz6TDTN for ; Fri, 27 Feb 2026 20:46: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fN0jz3Ymkz3b4v for ; Fri, 27 Feb 2026 20:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772225207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=14dbfPCueqdbOn2WpPiPZJsEvIJTm8JbETMoB84IiuE=; b=LjT/oY4S6+/DO304/fXC7HfNlthCoBjIYViuuwkV7RVt0dGqwTczAYXJXV0en1KGFz36B1 Bpg+ywG3Gsg/EF/SR/9EEKlU8jltovsW+Nr2yV6cdhkSBjmSqKmRxNM3DJ1dAcJw62dLkp TS8+D95QS2PcXGJ3DCFVrWBts+ywoVSHnT1ns6oOFMXpzdeokPNfVtUEVv1r5pbT9mcvpx /TnfL1rvLtKn+p+QApv6h1Vo3ONKZ1ZMzXtOpgg9f+2yUmHDJKGVL85RYd4n5K8k8g3sot 9IcEcSFb3JrAuhFI6QJzUsjt/QKE1hjISq928wlH2TgV0LIx9TfXiyzCQ+xE4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772225207; a=rsa-sha256; cv=none; b=Zavu7TSCUmBFrXPrKJdPM/UcsQBV20hjOlzEIGV88LV6qvjf7T15PLRs8aIgXB0EULEkjA DzmLt87o6sYbtAptKCLP3bWYZxkdiPrSC4qyHX80yxDer6iSb4l/S/hM1mvebCSLRh5u4B lP1C1G+fYGJdZ+Yrc+lQDsZGluoQSVxiVT2yyG1+F4qAvqeZyTozp+eH6ee2t+jAcnnVeQ 87KtDHO64Jv3dBUm1/5XZJuyYNVE0RGi1nv5fpbOfDjl3BVtsrK36eq4QxvqN666WS2Cdg Soa33T7hU+7YkuJV/YNlbe5HdcFdwB/KQnRJsyKk+MVsavudmbsWvgKyCU4RCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772225207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=14dbfPCueqdbOn2WpPiPZJsEvIJTm8JbETMoB84IiuE=; b=s3GW21AqI8LD9EENUS0KT7ceME1WkFtAaqJPiyv8ZRT2j7IUyVZa20fX27Sa8Gd/MwI5xA EjJdVoIlhn5cMms3yQ9krQlSD1dX8CyRonNX+zC/qt8KF14xpiHFUC2skjfWuFLZ/qa6/0 MQ4GGDVs1Nf+/kvA3xhm8/ZerukJd2aiW8JN4UKjuanoG2qhFOuHjuEyh0IS9TgmXkcgXH b/n59lSMRfUXrqL2bnuTp/E90CebGSx2tMaSPKsc7i2Dq1o03LzmKMHwsQ0obeMrmMkqRS e+nCjWdNOYQx8uUrsV7pLF4MRKpu0xswC8+yFrOH70iJAvozPtYWjXvFpu4QUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fN0jz2WfhzZWS for ; Fri, 27 Feb 2026 20:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 248cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 20:46:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 82069fae3ff9 - main - snl: Remove duplicate rta_expires member in route parser 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82069fae3ff956ecf833d239864e34a3efc3356e Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 20:46:47 +0000 Message-Id: <69a202b7.248cf.1ecf4d92@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=82069fae3ff956ecf833d239864e34a3efc3356e commit 82069fae3ff956ecf833d239864e34a3efc3356e Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-27 20:41:51 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-27 20:42:35 +0000 snl: Remove duplicate rta_expires member in route parser There is no user for `rta_expires` member and it's duplicate of `rta_expire`. Reviewed By: melifaro Differential Revision: https://reviews.freebsd.org/D55445 --- sys/netlink/netlink_snl_route_parsers.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index 70a12ad3ad74..7e5eaceb18e1 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -113,7 +113,6 @@ struct snl_parsed_route { struct sockaddr *rta_gw; struct nlattr *rta_metrics; struct rta_mpath rta_multipath; - uint32_t rta_expires; uint32_t rta_oif; uint32_t rta_expire; uint32_t rta_table; From nobody Fri Feb 27 20:55:40 2026 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 4fN0wN2fDhz6TFLS for ; Fri, 27 Feb 2026 20:55:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic305-21.consmr.mail.gq1.yahoo.com (sonic305-21.consmr.mail.gq1.yahoo.com [98.137.64.84]) (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 4fN0wM2znyz3cHW for ; Fri, 27 Feb 2026 20:55:47 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1772225742; bh=3idFX0p5l0Kmq+7QjKEevF2hm/ITNr2KdtgEV6KeDfk=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From:Subject:Reply-To; b=YBZMEd+Jt6z37JaBoD92wnl4r82osMyeIQxf1GvkmGHb8nxWjb27kgmMd+ykhmr3sRPaRWi9BDAGG6DOmyPgffRp6zjsN8q+radrVx0KSRcWQvK8apFQvEnuExy0lt+5kDYwcbM1Sadlx/X9ejEBRWGFFuKuO/uXblUqS4mTGWvrMB9qLhVx4RqGPuNa7jlQoY6z2W+zt8yhLWiO8EVLiLXTKHKsLwXZ1/g6qsG8mvZO38td66gVfmLYwDIAxkr9KTkKzwOtx8OF87lQJg7qWOKGHo4railqCXvvnHDLbbVifoeu0CpSn9RWNhlCDB9PBs0aCGABW4VMi2YZ3pWQow== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1772225742; bh=ATb/8sorAv99pZxeHqz5YebVku8YlHevxOB5d+BPQ03=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=O2zh6mqyI5QCYUYVzBhalgQM7YoIN9ezi4sMhfIYcLMq/MDd2gzVhsvcEIwp6ZkWDDgpI64ypKlupWO0qA1W5K28UAwrr9r+5QdIAnb//IXeg35zL6YCXjGwR25IUbYWvV8PKcUxyRI7YNOc9RUAEvSZ6DGliHlxbhDuej44syqAui8AsCFbgpmi+iPN11aiBSX0+ChOAJpSTm1yrZ0LADkqIf497i+t6Gff/A0puxYCyqPFM0peQl92Nz7HYoiN/Lw8ptz6Yw/Ll+0Gcmvdlok9rb6jjeTLd9Ad/0MU6hP4OER4ol9ujdJNZvcaSqFpgcjm1WdCbmpddO+X9TPYSw== X-YMail-OSG: kCtpluoVM1mx1aKBhp2wf.e1k2EsbpDo.CjcqFv3JyFCEO7NWbNlYyzFHnPBGgz aDYsyZbvDwMZ4djANy5yW_0vmhCcH_YrGqVDgz_RR_WB1KHFXCe5K4v9dA3dZvQr6GK40JS6twDf hh4iSxnAhVJ1uQL8xgdGpGjQThQDynLm0rNkgLO2aogtXgO.owOkrdQ.yhZifXfoAyT8m02s1_6T sdMfRIubynNkWUk7GCWOZ4JA_q2aIa.wGiKm71rdz2BR13bJ3F_AU5HiNiUcjaFtOf1Xmwv.BkTI 2d3r3BalprzmcF4muCQO8mhR24tXSL9FYnHB.l.lo8W536Ys6yycJgBzk0l5aOYdCRVZk4kGbvjc _Kd6Tpp.QleOYi9YfTvMfeN.qVez5FhOdx9SyOp0ebN7oxDEkU0eJ7mmY7YTPIxO.9tB9xthgsM2 34_j7JcM.6LDWOhv9XTGaA54FAUV1VGHMBb9GawF3csTPL71WajeVV42yirmKhDefUzddYT5R3ZI 7wV3nP9lOECDScned3oqmWfqn6YZoHBJ7En3dRrxKfHo7r2Rcjg8_8vYsuf7Y3ifMyxDJeP2oalx eF0AeCHeWKziTPDVVewu4p238XCbqWPCSDY6Ps4.aspOkk1KBxrtam0SnvxZwINW5sGauZMuyTKK vwc1z6gRGDIWLLMHDz.Ua4ZLu4PGAM.9aw0I5cSnJN0MdlzzaJV1E92I8rCwbYJjlWWwNoWP2C4N kc2.BDD28G10KoVzs0OiqL0JUNpVJQLuzRbYghLWWpyTdQaufbTpYtwEc3O4v9ZA2Qnqy1ozwDUf ZJtzo5iQR46lYUyNnvTXNNtto7gp5LGbMP8NlE9nWGhVMbhGye.UFNvDvQu1hEjlAleb3mW5jHY1 ll3b11j8GTTm4XKIXczqqYSCXmIsSweWXo7VMPeE5u4o8.JNkGdqgoffWyD7LFOaO_fhGWyOgryY eJkQh2K1.EvaKMTcYJ1MMBoXHm9piIQTEET..jz.gIZqX6rgsDfkBbTgo8B48ez9383GiOu0O.y7 AVw9SGdWjiVOEtnmh94854kW9ACi69uyxp251XXIXjrEW3YIUB6YTAv4cABGrW981L4wgxm1Q4Re bAj_L7DooHHiW1ugSM1w_1IlimWnEGThb58rf3Gb4qFdsXWpmnh8FJZc7vqwIsJwRClOfRkKK7mS NfE9vnXw5aX_2tT2f_9BJas3702iZSDhmPOtL3IN0nOCU3mVe1uWb7FIixiCSEY_TN6qxb0_HJ5B fXYzBvxpVkKRN.PoqzqyMujhgkG0w2GgZzXQF3dn7oBWIOGuchrcRgBHFGlEZYw3GBxHNtJ_GHOG gixBuksSXHgt3klG_eddCgpZX1c9TMHDSotZ9rc9LSrLILD05QSIWSfudL_QNC9QLjlmvxqKJPPn i6.2Pwb9mm0sm2KFM93ZN3aU.dzMQ81RkxWZxVKcVm3rTFv9XED6tFosyBKNjfqCo16KSJXVLlkL MrNYNTO3lQHvbxkG10xr5oN_J3SCdIG8_VCiE1NpsYO3qM9gUFFLEDDlbIq0i6DaU7NMm5572CJD v9uQmPRVbqAcwPOdYNDGkO1xPyOFVx6whBBvvIIzRVk24YAHbN9OgSWSs8ZNPv1QYUScot2zSUKL X9iBZXQbopXQvMFpdB3aRVggw1pImMw9Le1NCWukU5Mnmqyl38q_zkUj7XL.IKZKH28XW9jLVc9L ekz__necbAO2TUfXPVE._r.8pxRzdRGHkHnclTeXHxal3t3CRmlu6fF4jpD5mN6s9Dna5PL8oTb8 Ac.wtQsXhqF3Snuip9Hnb5WvZuwAynikyYfyaPvw.YDtDk2OUpY2AXZIubI8COrx6P4diGpg6W1A GYi_jY_23ZUMOIp9ATlzhJ1hKLgpn18edDpMpWD3iCgNXWnVb31_76._9zpeDmqUx4VEsn5sUeFa 5Hv7PskchVPJX9jCP8QeFV_V11g.Kf2.fPZwNWxPk.25w8AoPI6LcN06hKPUcWdSaxDs6Kpxi9yQ fom8PboPZzTMPwAuvO7KoYJ9XQjZ52dOlbB8NqFqQRXDXAJjN40f8N6XWRLfxAss612IyFNG.km9 yofwhhGKXd5vsTIZGkQJgrAIqaIGq2T0WJU5TV1h7.UemEePZld.SHq9dJabFJxver4_JQU6DkyJ 4fZXikH9ymbXGkorB2taAtzMLnimdOJ8JF3iie.w50P_d7zZFcNxdGkSZ9qHeV73ctGc3V68wDui zQqqfn_Zdq28jhQ_DPGhNTz_E9ilXRna4U1BvG5HGbtEktqwVgnSKmwQ.ys9WdkBio28nsJqUDMZ jLkwSx0CFnG4TwjMPPjhHHqKEggZq.qM4QlPJht7c1dBgVLxGcw-- X-Sonic-MF: X-Sonic-ID: b2e59341-e11c-4115-be40-2ae2734ee0f7 Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.gq1.yahoo.com with HTTP; Fri, 27 Feb 2026 20:55:42 +0000 Received: by hermes--production-gq1-6dfcf9f8b-w5q67 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID eda8e9d00c566dc1045b0c6471b1e65e; Fri, 27 Feb 2026 20:55:41 +0000 (UTC) Message-ID: <720e4cb6-fd13-4686-93d9-ef095ad611c2@yahoo.com> Date: Fri, 27 Feb 2026 12:55:40 -0800 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: ee73475119ff - main - llvm: Link private LLVM libraries against compiler_rt for aarch64 To: John Baldwin , Jessica Clarke Cc: "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Andrew Turner References: <698a0b1e.1d294.40e36519@gitrepo.freebsd.org> <23acebb1-f71c-46e6-9eea-3fa44316335d@FreeBSD.org> Content-Language: en-US From: Mark Millard In-Reply-To: <23acebb1-f71c-46e6-9eea-3fa44316335d@FreeBSD.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25198 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4fN0wM2znyz3cHW X-Spamd-Bar: ---- On 2/27/26 09:27, John Baldwin wrote: > On 2/9/26 11:47, John Baldwin wrote: >> On 2/9/26 11:40, Jessica Clarke wrote: >>> On 9 Feb 2026, at 16:28, John Baldwin wrote: >>>> >>>> The branch main has been updated by jhb: >>>> >>>> URL: https://cgit.FreeBSD.org/src/commit/? >>>> id=ee73475119ff7aa98bd11828625d524f6ab87f06 >>>> >>>> commit ee73475119ff7aa98bd11828625d524f6ab87f06 >>>> Author:     John Baldwin >>>> AuthorDate: 2026-02-09 16:26:52 +0000 >>>> Commit:     John Baldwin >>>> CommitDate: 2026-02-09 16:26:52 +0000 >>>> >>>>      llvm: Link private LLVM libraries against compiler_rt for aarch64 >>>> >>>>      This is required for GCC which uses libcalls for outlined atomics. >>> >>> This doesn’t seem right, they’re provided by libgcc.a, so why aren’t >>> they being pulled in? libcompiler_rt.a doesn’t even have the symbols. >> >> My guess is that we don't link libraries against libgcc by default, only >> binaries (maybe this is a GCC feature/bug vs clang)?  I have another >> review >> open for a couple of google test libraries which similarly fail to link. > > So after some more digging (along with Jessica), it seems that GCC only > uses -lgcc_s (and not -lgcc) for C++ (but not C) on both Linux and FreeBSD. > clang's FreeBSD toolchain driver is supposed to mimic GCC but doesn't, it > applies the C rules even for C++ linking, so clang is implicitly adding > both -lgcc and -lgcc_s for C++. > > On Linux, libgcc.so is a linker script that includes both the dynamic > library and -lgcc which is how the static libgcc (including outline atomics > for aarch64) is effectively linked into C++ shared libraries on Linux. > (Note: libgcc.so is a linker script on seemingly all arches on Linux, not > just aarch64) > > So I think we have a couple of choices here.  I can patch the devel/ > freebsd-gccN > ports to stop passing -shared-libgcc to cc1plus which will cause GCC to > follow > the same rules as clang on FreeBSD (passing -lgcc -as-needed -lgcc_s - > no-as-needed > instead of -lgcc_s), or we could change libgcc.so to be a linker script > to match > Linux (and then eventually fix the FreeBSD driver in clang to only pass > -lgcc_s for C++ linking) (I think Andrew already has a review to make > libgcc.so > a linker script). > > I can see arguments both ways.  Using a linker script seems kind of dumb > given > all the hoops GCC goes to internally to decide whether or not to link only > shared or static or both.  (Esp given libgcc is in theory part of the > compiler, > so the compiler should know that libgcc_s should depend on libgcc and be > able > to encode that in the default drivers.)  OTOH, the linker script > approach would > mean we would more closely align with Linux.  I think Jess favors > patching GCC. > Does anyone else have any strong opinions? > Is the question limited to devel/freebsd-gcc* ? Or does it span lang/gcc* use as well? -- === Mark Millard marklmi at yahoo.com From nobody Fri Feb 27 21:24:13 2026 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 4fN1YC5SCXz6TJ1b; Fri, 27 Feb 2026 21:24:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fN1YC4tW5z3gQf; Fri, 27 Feb 2026 21:24:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772227455; 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=rT+dRurGsTQaonuV+2cdjMiUAKADmWy3AW0XQ5icPsw=; b=vFrduwWSjU6dxtjpgCdG5ITWGuWyEz3YngOrbhMbP+elbrQz9b8mwo8WmISJv4tXTEjOIX YY3nLPkARM2BfX9OvnCMWbcyCG/e8e9g5F8+dUo8gra2ZTZRNCVrwaORSzgxegljFaYwng PuY2PZsqmaB7e6rrx/vKbaCQbd+j/JegAIkzkKhR30YudtnnWIZljODXIJ0nPFnfno7mif Fr7AFDBJb5anje/LirRzsB9TmtnyFn5Gmzoq1xfGkCC57YQQDbpWL/NDwnSc/iLncTzW3n b9HIRc6j6DjZVWPhkHs2LupIQxdwe2NukSW0mpN8WyiWxfp58Z8AGsiPg/KsNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772227455; a=rsa-sha256; cv=none; b=i+R7ZGfQcy2ToZg8ELAxdwfnFzVpNAH8jB+Qc233syA+yrN/D4ni8uKPh6DvdR7E2nZBt9 5pzQtJp4DwC/V3fUzo3/65A7Z1vgq8SEtWtGhmPVQIoV4TLgjTfLewe7LG5lDY+7pfCirB f7sIwtwv6WlD2gSmzfiuPodkeEHJUN4v5IqFJBF5b8p8h3djRX8Zf3l0P1z+HVKK3bfQ0R bNRN0ADBCgjBYiw5PeTT+cJ+W6ks39xx4BI9hxmhMPo7nCPId6+tyGgb+IB7oktBDkD53i T2Ijdt/1jbgLHUps040Nn8FweuunwYCqvc5aB3Tab1uSLuQ8cmx0PP5fFiB6rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772227455; 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=rT+dRurGsTQaonuV+2cdjMiUAKADmWy3AW0XQ5icPsw=; b=TApskIc25K5eEh/J5i/khPZsZbrcPSbZCL2O0uyBVzcrxoZBLPDx02epcXYYDEYSr31/JB rPH4PYCQmROWDq21kEia349IjbptqN6lXycfY/8V7DWWTWvl3X9khlfeYaUOlSRpZ+qbad QIDGxHYCWReK7hx+sLzwCPHgvxFiNIhrgk977RGVfugGJ4F08kAXaTxvDkwb5XynUQ+vJ4 0gW9gMz2JHOz0Dggu9szhR8NEfcUuo8KFOo+z2ZGqGaKoeQ6fkqRK2cByuvlU6lttK9NCI OhnNlYbWlDAZe7goD2AsHKOZrw2/CaYjvWFlVcL/gENoLuYjIMRZtJewI4Hy0A== Received: from [IPV6:2601:5c0:4202:5670:f561:a422:8150:b740] (unknown [IPv6:2601:5c0:4202:5670:f561:a422:8150:b740]) (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 4fN1YC228jzLpZ; Fri, 27 Feb 2026 21:24:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Fri, 27 Feb 2026 16:24:13 -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: ee73475119ff - main - llvm: Link private LLVM libraries against compiler_rt for aarch64 Content-Language: en-US To: Mark Millard , Jessica Clarke Cc: "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Andrew Turner References: <698a0b1e.1d294.40e36519@gitrepo.freebsd.org> <23acebb1-f71c-46e6-9eea-3fa44316335d@FreeBSD.org> <720e4cb6-fd13-4686-93d9-ef095ad611c2@yahoo.com> From: John Baldwin In-Reply-To: <720e4cb6-fd13-4686-93d9-ef095ad611c2@yahoo.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2/27/26 15:55, Mark Millard wrote: > On 2/27/26 09:27, John Baldwin wrote: >> On 2/9/26 11:47, John Baldwin wrote: >>> On 2/9/26 11:40, Jessica Clarke wrote: >>>> On 9 Feb 2026, at 16:28, John Baldwin wrote: >>>>> >>>>> The branch main has been updated by jhb: >>>>> >>>>> URL: https://cgit.FreeBSD.org/src/commit/? >>>>> id=ee73475119ff7aa98bd11828625d524f6ab87f06 >>>>> >>>>> commit ee73475119ff7aa98bd11828625d524f6ab87f06 >>>>> Author:     John Baldwin >>>>> AuthorDate: 2026-02-09 16:26:52 +0000 >>>>> Commit:     John Baldwin >>>>> CommitDate: 2026-02-09 16:26:52 +0000 >>>>> >>>>>      llvm: Link private LLVM libraries against compiler_rt for aarch64 >>>>> >>>>>      This is required for GCC which uses libcalls for outlined atomics. >>>> >>>> This doesn’t seem right, they’re provided by libgcc.a, so why aren’t >>>> they being pulled in? libcompiler_rt.a doesn’t even have the symbols. >>> >>> My guess is that we don't link libraries against libgcc by default, only >>> binaries (maybe this is a GCC feature/bug vs clang)?  I have another >>> review >>> open for a couple of google test libraries which similarly fail to link. >> >> So after some more digging (along with Jessica), it seems that GCC only >> uses -lgcc_s (and not -lgcc) for C++ (but not C) on both Linux and FreeBSD. >> clang's FreeBSD toolchain driver is supposed to mimic GCC but doesn't, it >> applies the C rules even for C++ linking, so clang is implicitly adding >> both -lgcc and -lgcc_s for C++. >> >> On Linux, libgcc.so is a linker script that includes both the dynamic >> library and -lgcc which is how the static libgcc (including outline atomics >> for aarch64) is effectively linked into C++ shared libraries on Linux. >> (Note: libgcc.so is a linker script on seemingly all arches on Linux, not >> just aarch64) >> >> So I think we have a couple of choices here.  I can patch the devel/ >> freebsd-gccN >> ports to stop passing -shared-libgcc to cc1plus which will cause GCC to >> follow >> the same rules as clang on FreeBSD (passing -lgcc -as-needed -lgcc_s - >> no-as-needed >> instead of -lgcc_s), or we could change libgcc.so to be a linker script >> to match >> Linux (and then eventually fix the FreeBSD driver in clang to only pass >> -lgcc_s for C++ linking) (I think Andrew already has a review to make >> libgcc.so >> a linker script). >> >> I can see arguments both ways.  Using a linker script seems kind of dumb >> given >> all the hoops GCC goes to internally to decide whether or not to link only >> shared or static or both.  (Esp given libgcc is in theory part of the >> compiler, >> so the compiler should know that libgcc_s should depend on libgcc and be >> able >> to encode that in the default drivers.)  OTOH, the linker script >> approach would >> mean we would more closely align with Linux.  I think Jess favors >> patching GCC. >> Does anyone else have any strong opinions? >> > > Is the question limited to devel/freebsd-gcc* ? Or does it span > lang/gcc* use as well? We don't really support building the base system with lang/gcc* (it's why devel/freebsd-gcc* exist) as the base system builds require various changes like kernel printf support, defaulting to libc++, etc. -- John Baldwin From nobody Fri Feb 27 21:45:03 2026 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 4fN21T24jbz6TMQr for ; Fri, 27 Feb 2026 21:45:17 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fN21S6YKZz3hh5 for ; Fri, 27 Feb 2026 21:45:16 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-436e87589e8so2457605f8f.3 for ; Fri, 27 Feb 2026 13:45:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772228715; x=1772833515; 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=2ye6tXD7zZVpPE136iNUh5Bxu4/pOGU32xkcdk0l9Gg=; b=NAH0/nfUh7ziTDF0FzoHwb/8tB9TuBjg9ebZNLziB6IzWxb3aIIcEoLzg0r/AmM7fZ CY2EJ3iLIBWk42kfoICH88OyS6cuQF8XroETJS25BO76GuLazbCMR/TUzQZ5+71sdahi tYqB6YzIeA6IPhR7P9hLLJNw5iZZgURqNWqovlnWiGHdp+2p31WKvXtOSy9osfSse9ff MI2l3aY10F/EaVsUJ4JESv1eIVD7KEpfLtWZ7a6JIV5AA6H33wXblyijGmeSN2kc6J5K Owk/YazqwgPKi4oeC/nR7lFEViTvtZ1EZeaOek6FwbtsF1DrqPRLBX2ikkxnS5BDSf2n bBmg== X-Forwarded-Encrypted: i=1; AJvYcCV9w1BgS9E2OoqzW/rM0xIMBjny8BnQIhcyQo+WvL0n1QJR069LDCkF2aswmEAQlQMyahyX1aGSp1tso/sefeuPJXjs+g==@freebsd.org X-Gm-Message-State: AOJu0YyOwU/acg+OLE2DD5vmkicTTy1PXW4McxvrsX/SONrf47hAlZ3S XmXvmafPGMj0R0bmqInAO0/7rKpUimo/mrrm/baI4lXeRMGp32uQ5OGUS9aQ8xsK9Qs= X-Gm-Gg: ATEYQzzZzue85ed2qEu76Byd7UF3ldV0NO+XE46k9IFLw7jri2bUZkpPHl7EibsCr3C y6zBAlOg5SaxguAh+xzzIkYOgWDSpB/dQksPZHgmqBB6fjBU9aZKWpywGxgghhNZzFJC/xKuEB0 R6WjkqgFt5L5ZHEzshUF6WS/oIzDVFfi0T36P41u5J8eKo673j9kSgp6VJ2tYnMYcs3tAekTNFA QYb3CbzaCjR3yK41x1d/A5vD0kdRmpaXw9drD1jSkuldFgr8hV/UbmuYNBkg5EXfxc6yaO3/Kn2 /NO1txUWPUjw3s7uqW+MxWRKyVrtyJo/1VnTVlnhbYfa1Cm9AJCdcx2fBF7hza5/Dfte2dIiXRP W1hyXJ6fO/Ieg89vkc6Y4rIAh2vQEyVW9XhQsRBtsb/4C0sjHTinVAC+wnD0q5+M6zpaN5SGfQ+ PjZE0CQArlOfBAzWkDE6OY1o6qr6hYJNeruQFco/CGx+kiGgy5Y+30e3cAGYlpyZT3 X-Received: by 2002:a05:6000:2c10:b0:439:9225:3378 with SMTP id ffacd0b85a97d-4399ddfc322mr7096342f8f.24.1772228714464; Fri, 27 Feb 2026 13:45:14 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4399c71b498sm9663359f8f.15.2026.02.27.13.45.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Feb 2026 13:45:13 -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.400.21\)) Subject: Re: git: ee73475119ff - main - llvm: Link private LLVM libraries against compiler_rt for aarch64 From: Jessica Clarke In-Reply-To: Date: Fri, 27 Feb 2026 21:45:03 +0000 Cc: Mark Millard , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Andrew Turner Content-Transfer-Encoding: quoted-printable Message-Id: References: <698a0b1e.1d294.40e36519@gitrepo.freebsd.org> <23acebb1-f71c-46e6-9eea-3fa44316335d@FreeBSD.org> <720e4cb6-fd13-4686-93d9-ef095ad611c2@yahoo.com> To: John Baldwin X-Mailer: Apple Mail (2.3864.400.21) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4fN21S6YKZz3hh5 X-Spamd-Bar: ---- On 27 Feb 2026, at 21:24, John Baldwin wrote: > On 2/27/26 15:55, Mark Millard wrote: >> On 2/27/26 09:27, John Baldwin wrote: >>> On 2/9/26 11:47, John Baldwin wrote: >>>> On 2/9/26 11:40, Jessica Clarke wrote: >>>>> On 9 Feb 2026, at 16:28, John Baldwin wrote: >>>>>>=20 >>>>>> The branch main has been updated by jhb: >>>>>>=20 >>>>>> URL: https://cgit.FreeBSD.org/src/commit/? >>>>>> id=3Dee73475119ff7aa98bd11828625d524f6ab87f06 >>>>>>=20 >>>>>> commit ee73475119ff7aa98bd11828625d524f6ab87f06 >>>>>> Author: John Baldwin >>>>>> AuthorDate: 2026-02-09 16:26:52 +0000 >>>>>> Commit: John Baldwin >>>>>> CommitDate: 2026-02-09 16:26:52 +0000 >>>>>>=20 >>>>>> llvm: Link private LLVM libraries against compiler_rt for = aarch64 >>>>>>=20 >>>>>> This is required for GCC which uses libcalls for outlined = atomics. >>>>>=20 >>>>> This doesn=E2=80=99t seem right, they=E2=80=99re provided by = libgcc.a, so why aren=E2=80=99t >>>>> they being pulled in? libcompiler_rt.a doesn=E2=80=99t even have = the symbols. >>>>=20 >>>> My guess is that we don't link libraries against libgcc by default, = only >>>> binaries (maybe this is a GCC feature/bug vs clang)? I have = another >>>> review >>>> open for a couple of google test libraries which similarly fail to = link. >>>=20 >>> So after some more digging (along with Jessica), it seems that GCC = only >>> uses -lgcc_s (and not -lgcc) for C++ (but not C) on both Linux and = FreeBSD. >>> clang's FreeBSD toolchain driver is supposed to mimic GCC but = doesn't, it >>> applies the C rules even for C++ linking, so clang is implicitly = adding >>> both -lgcc and -lgcc_s for C++. >>>=20 >>> On Linux, libgcc.so is a linker script that includes both the = dynamic >>> library and -lgcc which is how the static libgcc (including outline = atomics >>> for aarch64) is effectively linked into C++ shared libraries on = Linux. >>> (Note: libgcc.so is a linker script on seemingly all arches on = Linux, not >>> just aarch64) >>>=20 >>> So I think we have a couple of choices here. I can patch the devel/ >>> freebsd-gccN >>> ports to stop passing -shared-libgcc to cc1plus which will cause GCC = to >>> follow >>> the same rules as clang on FreeBSD (passing -lgcc -as-needed -lgcc_s = - >>> no-as-needed >>> instead of -lgcc_s), or we could change libgcc.so to be a linker = script >>> to match >>> Linux (and then eventually fix the FreeBSD driver in clang to only = pass >>> -lgcc_s for C++ linking) (I think Andrew already has a review to = make >>> libgcc.so >>> a linker script). >>>=20 >>> I can see arguments both ways. Using a linker script seems kind of = dumb >>> given >>> all the hoops GCC goes to internally to decide whether or not to = link only >>> shared or static or both. (Esp given libgcc is in theory part of = the >>> compiler, >>> so the compiler should know that libgcc_s should depend on libgcc = and be >>> able >>> to encode that in the default drivers.) OTOH, the linker script >>> approach would >>> mean we would more closely align with Linux. I think Jess favors >>> patching GCC. >>> Does anyone else have any strong opinions? >>>=20 >> Is the question limited to devel/freebsd-gcc* ? Or does it span >> lang/gcc* use as well? >=20 > We don't really support building the base system with lang/gcc* > (it's why devel/freebsd-gcc* exist) as the base system builds require > various changes like kernel printf support, defaulting to libc++, etc. Third-party software still needs to be buildable with it though. Jessica From nobody Fri Feb 27 22:01:17 2026 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 4fN2N70gR4z6TNn3 for ; Fri, 27 Feb 2026 22:01:27 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic314-20.consmr.mail.gq1.yahoo.com (sonic314-20.consmr.mail.gq1.yahoo.com [98.137.69.83]) (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 4fN2N64htbz3kkM for ; Fri, 27 Feb 2026 22:01:26 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1772229679; bh=yg4Ih7gHMMmfwu8CzrkuB31pg1RUf4yg4Rq7JKwgOQo=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From:Subject:Reply-To; b=WOX0VQ2T3/h/mJfCLvOcj2fWDQRa+GHghyksDk8Kz19ULpuDYvEC8Gbji2Y8oeUtFsDZRYWLYf8xqHjpSRzy5N83bnNjbqDXubRashKwxDRI1atqjfERtLFJ11FGuCxl+ECpebLWr63RmQzM7ieiyAXK7n+QPxwk+Xh17KbQUaXJDu+qO/WR4RK2q1MdKFCmtpexti7lWZYEJ1oQhgu+oRsPlEyM8Hd7Wp73aH7KwXY6M+9RyQhmA3f6DbEpGJLKk7k0RlFDB8zimdMq+hVW3EIOSOA2ZSxCZvmnlmgG2VFnYGgIbGSj2qQxhnYvW6A1SFDp4Lh9mOwh0FqPXVcSug== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1772229679; bh=guODkmT0GGdzFPJJM7wEAZ2dXezuVT90pWdG4I+jL93=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=DLB87TnDRCPpC+VH+C3ogfgAGbUXZFIvAMjf2CMy6EQyPUGHZGtcycGgIDtbRTn6zGlCoUOJghDf6crDXuH1WX97fh3Eh3pwSPZCbb4kLsGv4smiR1sULYyK9TBB2ntp1L8n8TeQXYP/N5yKkhtxg5bcq4/bCQR5WPWOuCDSPNXMiMTTbWhNTvVK4yD6zxrA449vN2ciqGLhhj2oX+NqQnW1p8H67SXTrj173QB7fHTmzF/ABMVBnhIaiEyNVKC7txlQhbX1tZwMsk5nWqyXhvWLKFfmYiOZtRdWGiqNvycwn0atEcZreg0bvi7YJUDbxTFFX6PLemH/9EPrMFvVxg== X-YMail-OSG: lN8mVKwVM1kchpdck4FYbRP84fZ6h2ezr1PiwhaSViNxcAnApXVDHbJoIrh_zta OHrsmFz0guWbQPkKmjpwTo.b_RGVBWyJq6iKyxotA_WHcfGdtKAw_9dPV6lWjJOQ.RHJuOb492DF JUE1INLAl.CCDYMxnGKHQ9c._XtTqU8AvZgoZnF_AJbINNDxfAh.oBr91inzFb29IfTvaZbANSYj 1x4v_ZjV1xnV3EzZtNF.CXJxmWycY8OgUSKlhc7io3k2zHz4wdUbMldIXrJz9XpHNVYX6gbImBxW kiTfcbPuUadseJBvsBMTkZ4RxzEKMq3qWTxXxfmksAz1rydyZ3QQWKsNKB33GtEXol24tiMaAlcS 3Y6ORtqckke.faLzACQAMESI90G7SzI2dkgXiBrXhk.AV2qZ1Jeh4t6qSW9sneUGq.DMDZMpQ.37 8bMMZUQIo0beCB4dvOBWenj5ovgE0j6wXJAg4oMQJ92fR.9Xc2VEANABAsKVOHK966qbfAN7N6i. HlKY6ryacAIz4YfFWspt6ISaEuH.d9GoJV_Za.SB_xHB.aH0oBZ.74It50cZMjX2bR8Mqt3396Qg GmwCKaw8drC3HaKXv8FhM.wmklujwuesKvSthVtruUmXxMzm1lMNMF_udi4mJtosXx_ib7MVdiR4 Xqh6r2o.B8ccGUEO50HwDLgQdPaKQxlUWXmvdULNLy2NS4vvQuv63Y9wNo9.a9dwygY.E21H4gJ7 PE8Cnn_jLuLtSuHPPrfHZ5m3RO5z1X9ZzqyklCKyzcrjg32R_paG97sDA2OS7dPv7kRNDvzLwXF9 xwoluJbkN_6JVaHRU4WcJgGlBAYkGIbNkAqdezDjpwvPxd8PXW6nh3TZkp8mIyYCnPwiHW7IkU_c gv4QOMlOkjmZv5XMC6U0YeOkAfxbdyRTHjKfDoxnIixZItoILfz6_q6AluJZvu0vHACtOL4nRYXb QmxibYO.Jx9nlC4a3AvPKT0NroB8gMIXREPnCbIF5VJP3rGWee5lXeJRfRTBDDT8vFVjrF2FV_p3 2lWHbydMcHtSB5usYbHPnT1CYgwsvAJkA_GRT90sXczsPfaQxnjrVTdxcQKbk4ei.hCRPZnaQfs. isT.D6gY.RffT6fDZK54qM8B8A1.r_cyY_YjIwMdnI2aBxsLhWNJCYwOeKWKoJWAYdda7vkUKv_K 549ejbGJroW0gtDca2pbBk33Fw73mSbpi46M4JDscZgGbdIVNObcChs4QV8lSxc4bBl0ZMDz77Ie B2ppKCLgfag7Xz882QXwXQv7e2I1HME696xfYEVvXAbgZmeaPqv.KLhELkG9n_p.YIedIR.88OFX LPm.X95AckBSi1virCCPaTV93u5MN4oQutxL4toJyuIZ7aRHEP7Ivqr2Mv4YoxThiJmJHPeToNuB 81wq5.8Eke0D3xUQFrGXzEH.7NJ4aFCOlo2CXoDVlXpQyhQX_o3jGhyI73o3PEIjVGZAoBWKEz7C zOU4OksTp.muiR0hS10VRfWa6TuixNc75X4gOWX8Rf1x2leA_DB9NTF1kEDS8HLMyKw4Koe135ID wcPsNEScnCL4IzSvBmQygyAflRDPU1ETlUvt36xjlTxZyAYN28oe_o_879ynukPzkRkpHokZFeSe 708ZMzyjSI4gTTzjgyvAZGenPN_0V4zhsVRpsrm89TRZsIwY2Vn1xMe.zeEcHNohkhrXgyhq5HWd Kk3sS1xrTZkRZZMyh04R.OevPwP4bu5CUuBf9tt4ikbYI_58UKdCZy93bo9WSoXkGywBwHHHbYc_ kdbvQroNLy0wY1iiJMy7zmjp8q73S8i2zS2C2GDXdj8SBSOW1Cyu5wFxlk.EczuCx1RUbZEDLyg5 ZbI0dOdzfEjWPMQ8aWfjlqGJQa83HBxVLarj0GC5FwDjWQdL9wE9C.OoLW0munAKOw10nV8ARKF9 VrDbioymmLLCogxc.aRZCtFJuYwcT5YnS8R8ltYM2hwWy2o2EbSrjX3gUTOFIx2V5iAt_VjSawPB 88p.3P.8IMgyuQOae6aAyrdj5pBXGjLsVCLnutv1l0tvSAu7krMQ7GjZQI3zy0my7gMDpUBhhgF1 6dXn5gj47ONuPfRbfdkNBHY6vWKgC8MIdCiTvum1CeAsjNVnxUnAaUBire9V8h3k3eCDdh9rK5IG K3IhHdtncm4el0f5RMemkHOL2pzhr8x87L9FS29uhwadAzK7HASMFsP.eUe2_.K5bpXn3d3Xh8Pz o7h2yKzwi5TTBSuKl80vXcO74AYGV3p5y1XC.yLKYAOXvU5h6bZSvYSb9j_tvScm3ADXvMTc2dMO _qI_It5iw6JFh1XeFGWWvHJFXrPY3xi9._656VYpmvF_WlIftPg-- X-Sonic-MF: X-Sonic-ID: d46b7342-5997-43c3-8ba4-519d6225d0ae Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.gq1.yahoo.com with HTTP; Fri, 27 Feb 2026 22:01:19 +0000 Received: by hermes--production-gq1-6dfcf9f8b-82g65 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 601d5302bbf9ea35dc23bfdae888d64e; Fri, 27 Feb 2026 22:01:17 +0000 (UTC) Message-ID: <4514bc7c-49c0-46af-b67a-3e4565a7e8cd@yahoo.com> Date: Fri, 27 Feb 2026 14:01:17 -0800 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: ee73475119ff - main - llvm: Link private LLVM libraries against compiler_rt for aarch64 To: John Baldwin , Jessica Clarke Cc: "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Andrew Turner References: <698a0b1e.1d294.40e36519@gitrepo.freebsd.org> <23acebb1-f71c-46e6-9eea-3fa44316335d@FreeBSD.org> <720e4cb6-fd13-4686-93d9-ef095ad611c2@yahoo.com> Content-Language: en-US From: Mark Millard In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25198 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4fN2N64htbz3kkM X-Spamd-Bar: ---- On 2/27/26 13:24, John Baldwin wrote: > On 2/27/26 15:55, Mark Millard wrote: >> On 2/27/26 09:27, John Baldwin wrote: >>> On 2/9/26 11:47, John Baldwin wrote: >>>> On 2/9/26 11:40, Jessica Clarke wrote: >>>>> On 9 Feb 2026, at 16:28, John Baldwin wrote: >>>>>> >>>>>> The branch main has been updated by jhb: >>>>>> >>>>>> URL: https://cgit.FreeBSD.org/src/commit/? >>>>>> id=ee73475119ff7aa98bd11828625d524f6ab87f06 >>>>>> >>>>>> commit ee73475119ff7aa98bd11828625d524f6ab87f06 >>>>>> Author:     John Baldwin >>>>>> AuthorDate: 2026-02-09 16:26:52 +0000 >>>>>> Commit:     John Baldwin >>>>>> CommitDate: 2026-02-09 16:26:52 +0000 >>>>>> >>>>>>       llvm: Link private LLVM libraries against compiler_rt for >>>>>> aarch64 >>>>>> >>>>>>       This is required for GCC which uses libcalls for outlined >>>>>> atomics. >>>>> >>>>> This doesn’t seem right, they’re provided by libgcc.a, so why aren’t >>>>> they being pulled in? libcompiler_rt.a doesn’t even have the symbols. >>>> >>>> My guess is that we don't link libraries against libgcc by default, >>>> only >>>> binaries (maybe this is a GCC feature/bug vs clang)?  I have another >>>> review >>>> open for a couple of google test libraries which similarly fail to >>>> link. >>> >>> So after some more digging (along with Jessica), it seems that GCC only >>> uses -lgcc_s (and not -lgcc) for C++ (but not C) on both Linux and >>> FreeBSD. >>> clang's FreeBSD toolchain driver is supposed to mimic GCC but >>> doesn't, it >>> applies the C rules even for C++ linking, so clang is implicitly adding >>> both -lgcc and -lgcc_s for C++. >>> >>> On Linux, libgcc.so is a linker script that includes both the dynamic >>> library and -lgcc which is how the static libgcc (including outline >>> atomics >>> for aarch64) is effectively linked into C++ shared libraries on Linux. >>> (Note: libgcc.so is a linker script on seemingly all arches on Linux, >>> not >>> just aarch64) >>> >>> So I think we have a couple of choices here.  I can patch the devel/ >>> freebsd-gccN >>> ports to stop passing -shared-libgcc to cc1plus which will cause GCC to >>> follow >>> the same rules as clang on FreeBSD (passing -lgcc -as-needed -lgcc_s - >>> no-as-needed >>> instead of -lgcc_s), or we could change libgcc.so to be a linker script >>> to match >>> Linux (and then eventually fix the FreeBSD driver in clang to only pass >>> -lgcc_s for C++ linking) (I think Andrew already has a review to make >>> libgcc.so >>> a linker script). >>> >>> I can see arguments both ways.  Using a linker script seems kind of dumb >>> given >>> all the hoops GCC goes to internally to decide whether or not to link >>> only >>> shared or static or both.  (Esp given libgcc is in theory part of the >>> compiler, >>> so the compiler should know that libgcc_s should depend on libgcc and be >>> able >>> to encode that in the default drivers.)  OTOH, the linker script >>> approach would >>> mean we would more closely align with Linux.  I think Jess favors >>> patching GCC. >>> Does anyone else have any strong opinions? >>> >> >> Is the question limited to devel/freebsd-gcc* ? Or does it span >> lang/gcc* use as well? > > We don't really support building the base system with lang/gcc* > (it's why devel/freebsd-gcc* exist) as the base system builds require > various changes like kernel printf support, defaulting to libc++, etc. > Likely more food for thought than you were originally trying to deal with for aarch64 contexts. I was not trying to indicate that any devel/freebsd-gcc* commit vs. lang/gcc* commit would/should be the same commit. More like . . . Are all of the potentially involved linking issues/techniques limited to that aarch64 system context and the use of devel/freebsd-gcc* ? Or are there, for example, "uses libcalls for outlined atomics" issues also for lang/gcc* g++* use, especially when it is told to use -stdlib=libc++ ( the system libc++ ) instead of using libstdc++ ? Do any issues and techniques generalize beyond devel/freebsd-gcc* use in any meaningful way? Even without committing anything for lang/gcc* , notes might prove useful later for someone, depending on the answers to the above. -- === Mark Millard marklmi at yahoo.com From nobody Fri Feb 27 22:08:46 2026 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 4fN2Xb2Fh0z6TPs3 for ; Fri, 27 Feb 2026 22:08: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fN2XZ6zvvz3lZH for ; Fri, 27 Feb 2026 22:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772230126; 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=MtAaM7EkAMDYZGgDNyq9KPNPRZMP5G3a2II60/vYSQk=; b=RWBVPA+ORN+I5tvq1mjE2Pb+ZaP4PjIeyrGWQlh3Bx178VVcts223UulBPVsSWBLCXkQrS 2h5fGfxJnscsd3Je+g67x9HvKV0MKO1zRKTQst0yjD/dyXPTd6wulQdTRlW6BzG2UhhSkB ydoGrw+6t+sAwfg3PX/Q34rCx3aZYzCh96CYOk8vaLeT8P0b6F6i9zkcT46xJfK+gem9lT Unvmq/Jxh8+OQRisMOBegiFgl7PzyIw19lB/TCGsWcROEKGX4WvO/zWvGa92siIRrZLDVN VzlOjBd5NOoSlA7l13Pn1jdqsVvZBHcqGrV8hMVVDmdV375n8s/9Zx0KqCUXyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772230126; a=rsa-sha256; cv=none; b=KYYLUo5rXbd21/qSLQt9pnnAywu21SOZGSn+OIL75nD79rJnJzBAPVzOgiQUXOQqqCQaZk hLZOA/CKSiIqJclpdz3TppNeXbfPCT3fJmQtrKVT+mkiBEc2t7cs7lBrQdSTIZRtJnDm3G T4qNa63Btj9MnY6ALrmQjdjDEodm/2FV66a7nkL8JVNfZ9OB44wuJ5k1zOIZiMF3mXM6C5 IgEEEKuAd/aDm2VKKVtX9shRy3X5quDFnS/6RInnGAQSZ6b/jCLIosSQuHaBozvOkQ5Qle GsDk9NCJCA/e1dcumBJEP/Df94HBZSFfbmb2tomIp8zjIOCiSUkGMFFAVklGfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772230126; 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=MtAaM7EkAMDYZGgDNyq9KPNPRZMP5G3a2II60/vYSQk=; b=iLtvbffRIX0RlZvq2v5hHc21Ov/lJvgf7wjUhndGMqF2T6hMxab8opJxcDeZ5ohi4/tjQV txz0WqSuP+JTdkbIOI0Detv/Gx8yf1xmXD9zFNACeaA6Rsrbt5DsL98/eZtF2nzRRDf/hB wtxbxyYOQ+ulEaPpTXlRZO25p4nzIqQynE6XK93y0TpGRZJkyYMwldsIWKKCMfNPnXCgTE lUPhWo7qGVU6LyFVY1efzB7sCMRBFAths7RkKp25kGWbNwdwoXpJvAjYcdfn/QXLPtkmuh mDJ0FdMP9hWGT9Y3TUC6K5bSgA2YnuAEeh4XHlAJ36Vw+NKES0ELLKAWzbbhRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fN2XZ6bXxzbKM for ; Fri, 27 Feb 2026 22:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34056 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 22:08:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ali Mashtizadeh From: Warner Losh Subject: git: e51ef8ae490f - main - hwpmc: Initial support for AMD IBS 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: e51ef8ae490fc9f73191f33e7ad388c2511c454a Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 22:08:46 +0000 Message-Id: <69a215ee.34056.b6b1ce8@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e51ef8ae490fc9f73191f33e7ad388c2511c454a commit e51ef8ae490fc9f73191f33e7ad388c2511c454a Author: Ali Mashtizadeh AuthorDate: 2026-01-30 09:12:17 +0000 Commit: Warner Losh CommitDate: 2026-02-27 21:22:16 +0000 hwpmc: Initial support for AMD IBS This patch adds support for AMD IBS. It adds a new class of performance counter that cotains two events: ibs-fetch and ibs-op events. Unlike most existing sampled events, IBS events provide a number of values containing extra information regarding the sample. To support this we use the existing callchain event, and introduce a new flag for multipart payloads. The first 8 bytes of the pc_sample contains a header that defines up to four payloads. Sponsored by: Netflix Reviewed by: imp,mhorne Pull Request: https://github.com/freebsd/freebsd-src/pull/2022 --- lib/libpmc/libpmc.c | 64 ++++- sys/amd64/include/pmc_mdep.h | 5 + sys/conf/files.x86 | 1 + sys/dev/hwpmc/hwpmc_amd.c | 25 +- sys/dev/hwpmc/hwpmc_ibs.c | 614 +++++++++++++++++++++++++++++++++++++++++ sys/dev/hwpmc/hwpmc_ibs.h | 176 ++++++++++++ sys/dev/hwpmc/hwpmc_mod.c | 96 ++++++- sys/dev/hwpmc/pmc_events.h | 13 +- sys/i386/include/pmc_mdep.h | 5 + sys/modules/hwpmc/Makefile | 4 +- sys/sys/pmc.h | 19 +- sys/sys/pmclog.h | 14 + sys/x86/x86/local_apic.c | 27 +- usr.sbin/pmcstat/pmcstat_log.c | 99 ++++++- 14 files changed, 1130 insertions(+), 32 deletions(-) diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c index 10e357f55935..155da7cf6a7b 100644 --- a/lib/libpmc/libpmc.c +++ b/lib/libpmc/libpmc.c @@ -50,8 +50,8 @@ #if defined(__amd64__) || defined(__i386__) static int k8_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); -#endif -#if defined(__amd64__) || defined(__i386__) +static int ibs_allocate_pmc(enum pmc_event _pe, char *_ctrspec, + struct pmc_op_pmcallocate *_pmc_config); static int tsc_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); #endif @@ -132,6 +132,7 @@ struct pmc_class_descr { PMC_CLASSDEP_TABLE(iaf, IAF); PMC_CLASSDEP_TABLE(k8, K8); +PMC_CLASSDEP_TABLE(ibs, IBS); PMC_CLASSDEP_TABLE(armv7, ARMV7); PMC_CLASSDEP_TABLE(armv8, ARMV8); PMC_CLASSDEP_TABLE(cmn600_pmu, CMN600_PMU); @@ -201,8 +202,7 @@ static const struct pmc_class_descr NAME##_class_table_descr = \ #if defined(__i386__) || defined(__amd64__) PMC_CLASS_TABLE_DESC(k8, K8, k8, k8); -#endif -#if defined(__i386__) || defined(__amd64__) +PMC_CLASS_TABLE_DESC(ibs, IBS, ibs, ibs); PMC_CLASS_TABLE_DESC(tsc, TSC, tsc, tsc); #endif #if defined(__arm__) @@ -691,9 +691,49 @@ k8_allocate_pmc(enum pmc_event pe, char *ctrspec, return (0); } -#endif +static int +ibs_allocate_pmc(enum pmc_event pe, char *ctrspec, + struct pmc_op_pmcallocate *pmc_config) +{ + char *e, *p, *q; + uint64_t ctl; + + pmc_config->pm_caps |= + (PMC_CAP_SYSTEM | PMC_CAP_EDGE | PMC_CAP_PRECISE); + pmc_config->pm_md.pm_ibs.ibs_ctl = 0; + + /* setup parsing tables */ + switch (pe) { + case PMC_EV_IBS_FETCH: + pmc_config->pm_md.pm_ibs.ibs_type = IBS_PMC_FETCH; + break; + case PMC_EV_IBS_OP: + pmc_config->pm_md.pm_ibs.ibs_type = IBS_PMC_OP; + break; + default: + return (-1); + } + + /* parse parameters */ + while ((p = strsep(&ctrspec, ",")) != NULL) { + if (KWPREFIXMATCH(p, "ctl=")) { + q = strchr(p, '='); + if (*++q == '\0') /* skip '=' */ + return (-1); + + ctl = strtoull(q, &e, 0); + if (e == q || *e != '\0') + return (-1); + + pmc_config->pm_md.pm_ibs.ibs_ctl |= ctl; + } else { + return (-1); + } + } + + return (0); +} -#if defined(__i386__) || defined(__amd64__) static int tsc_allocate_pmc(enum pmc_event pe, char *ctrspec, struct pmc_op_pmcallocate *pmc_config) @@ -1268,6 +1308,10 @@ pmc_event_names_of_class(enum pmc_class cl, const char ***eventnames, ev = k8_event_table; count = PMC_EVENT_TABLE_SIZE(k8); break; + case PMC_CLASS_IBS: + ev = ibs_event_table; + count = PMC_EVENT_TABLE_SIZE(ibs); + break; case PMC_CLASS_ARMV7: switch (cpu_info.pm_cputype) { default: @@ -1471,6 +1515,10 @@ pmc_init(void) case PMC_CLASS_K8: pmc_class_table[n++] = &k8_class_table_descr; break; + + case PMC_CLASS_IBS: + pmc_class_table[n++] = &ibs_class_table_descr; + break; #endif case PMC_CLASS_SOFT: @@ -1676,7 +1724,9 @@ _pmc_name_of_event(enum pmc_event pe, enum pmc_cputype cpu) if (pe >= PMC_EV_K8_FIRST && pe <= PMC_EV_K8_LAST) { ev = k8_event_table; evfence = k8_event_table + PMC_EVENT_TABLE_SIZE(k8); - + } else if (pe >= PMC_EV_IBS_FIRST && pe <= PMC_EV_IBS_LAST) { + ev = ibs_event_table; + evfence = ibs_event_table + PMC_EVENT_TABLE_SIZE(ibs); } else if (pe >= PMC_EV_ARMV7_FIRST && pe <= PMC_EV_ARMV7_LAST) { switch (cpu) { case PMC_CPU_ARMV7_CORTEX_A8: diff --git a/sys/amd64/include/pmc_mdep.h b/sys/amd64/include/pmc_mdep.h index 5c20d8473855..24b785312a16 100644 --- a/sys/amd64/include/pmc_mdep.h +++ b/sys/amd64/include/pmc_mdep.h @@ -41,6 +41,7 @@ struct pmc_mdep; #include #include +#include #include #include @@ -51,6 +52,7 @@ struct pmc_mdep; */ #define PMC_MDEP_CLASS_INDEX_TSC 1 #define PMC_MDEP_CLASS_INDEX_K8 2 +#define PMC_MDEP_CLASS_INDEX_IBS 3 #define PMC_MDEP_CLASS_INDEX_P4 2 #define PMC_MDEP_CLASS_INDEX_IAP 2 #define PMC_MDEP_CLASS_INDEX_IAF 3 @@ -62,6 +64,7 @@ struct pmc_mdep; * * TSC The timestamp counter * K8 AMD Athlon64 and Opteron PMCs in 64 bit mode. + * IBS AMD IBS * PIV Intel P4/HTT and P4/EMT64 * IAP Intel Core/Core2/Atom CPUs in 64 bits mode. * IAF Intel fixed-function PMCs in Core2 and later CPUs. @@ -71,6 +74,7 @@ struct pmc_mdep; union pmc_md_op_pmcallocate { struct pmc_md_amd_op_pmcallocate pm_amd; + struct pmc_md_ibs_op_pmcallocate pm_ibs; struct pmc_md_iap_op_pmcallocate pm_iap; struct pmc_md_ucf_op_pmcallocate pm_ucf; struct pmc_md_ucp_op_pmcallocate pm_ucp; @@ -85,6 +89,7 @@ union pmc_md_op_pmcallocate { union pmc_md_pmc { struct pmc_md_amd_pmc pm_amd; + struct pmc_md_ibs_pmc pm_ibs; struct pmc_md_iaf_pmc pm_iaf; struct pmc_md_iap_pmc pm_iap; struct pmc_md_ucf_pmc pm_ucf; diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index fabcd5d9ebe5..8a7e0b78feb4 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -114,6 +114,7 @@ dev/hptrr/hptrr_osm_bsd.c optional hptrr dev/hptrr/hptrr_config.c optional hptrr dev/hptrr/$M-elf.hptrr_lib.o optional hptrr dev/hwpmc/hwpmc_amd.c optional hwpmc +dev/hwpmc/hwpmc_ibs.c optional hwpmc dev/hwpmc/hwpmc_intel.c optional hwpmc dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_uncore.c optional hwpmc diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index b34cbffcffa8..cf44f9362a72 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -543,6 +543,10 @@ amd_intr(struct trapframe *tf) pac = amd_pcpu[cpu]; + retval = pmc_ibs_intr(tf); + if (retval) + goto done; + /* * look for all PMCs that have interrupted: * - look for a running, sampling PMC which has overflowed @@ -613,6 +617,7 @@ amd_intr(struct trapframe *tf) } } +done: if (retval) counter_u64_add(pmc_stats.pm_intr_processed, 1); else @@ -760,7 +765,7 @@ pmc_amd_initialize(void) struct pmc_classdep *pcd; struct pmc_mdep *pmc_mdep; enum pmc_cputype cputype; - int error, i, ncpus; + int error, i, ncpus, nclasses; int family, model, stepping; int amd_core_npmcs, amd_l3_npmcs, amd_df_npmcs; struct amd_descr *d; @@ -884,10 +889,16 @@ pmc_amd_initialize(void) M_WAITOK | M_ZERO); /* - * These processors have two classes of PMCs: the TSC and - * programmable PMCs. + * These processors have two or three classes of PMCs: the TSC, + * programmable PMCs, and AMD IBS. */ - pmc_mdep = pmc_mdep_alloc(2); + if ((amd_feature2 & AMDID2_IBS) != 0) { + nclasses = 3; + } else { + nclasses = 2; + } + + pmc_mdep = pmc_mdep_alloc(nclasses); ncpus = pmc_cpu_max(); @@ -927,6 +938,12 @@ pmc_amd_initialize(void) PMCDBG0(MDP, INI, 0, "amd-initialize"); + if (nclasses >= 3) { + error = pmc_ibs_initialize(pmc_mdep, ncpus); + if (error != 0) + goto error; + } + return (pmc_mdep); error: diff --git a/sys/dev/hwpmc/hwpmc_ibs.c b/sys/dev/hwpmc/hwpmc_ibs.c new file mode 100644 index 000000000000..66d3260cf040 --- /dev/null +++ b/sys/dev/hwpmc/hwpmc_ibs.c @@ -0,0 +1,614 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026, Ali Jose Mashtizadeh + * 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. + */ + +/* Support for the AMD IBS */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#define IBS_STOP_ITER 50 /* Stopping iterations */ + +/* AMD IBS PMCs */ +struct ibs_descr { + struct pmc_descr pm_descr; /* "base class" */ +}; + +/* + * Globals + */ +static uint64_t ibs_features; + +/* + * Per-processor information + */ +#define IBS_CPU_RUNNING 1 +#define IBS_CPU_STOPPING 2 +#define IBS_CPU_STOPPED 3 + +struct ibs_cpu { + int pc_status; + struct pmc_hw pc_ibspmcs[IBS_NPMCS]; +}; +static struct ibs_cpu **ibs_pcpu; + +/* + * Read a PMC value from the MSR. + */ +static int +ibs_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) +{ + + KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), + ("[ibs,%d] illegal CPU value %d", __LINE__, cpu)); + KASSERT(ri >= 0 && ri < IBS_NPMCS, + ("[ibs,%d] illegal row-index %d", __LINE__, ri)); + KASSERT(ibs_pcpu[cpu], + ("[ibs,%d] null per-cpu, cpu %d", __LINE__, cpu)); + + /* read the IBS ctl */ + switch (ri) { + case IBS_PMC_FETCH: + *v = rdmsr(IBS_FETCH_CTL); + break; + case IBS_PMC_OP: + *v = rdmsr(IBS_OP_CTL); + break; + } + + PMCDBG2(MDP, REA, 2, "ibs-read id=%d -> %jd", ri, *v); + + return (0); +} + +/* + * Write a PMC MSR. + */ +static int +ibs_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) +{ + + KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), + ("[ibs,%d] illegal CPU value %d", __LINE__, cpu)); + KASSERT(ri >= 0 && ri < IBS_NPMCS, + ("[ibs,%d] illegal row-index %d", __LINE__, ri)); + + PMCDBG3(MDP, WRI, 1, "ibs-write cpu=%d ri=%d v=%jx", cpu, ri, v); + + return (0); +} + +/* + * Configure hardware PMC according to the configuration recorded in 'pm'. + */ +static int +ibs_config_pmc(int cpu, int ri, struct pmc *pm) +{ + struct pmc_hw *phw; + + PMCDBG3(MDP, CFG, 1, "cpu=%d ri=%d pm=%p", cpu, ri, pm); + + KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), + ("[ibs,%d] illegal CPU value %d", __LINE__, cpu)); + KASSERT(ri >= 0 && ri < IBS_NPMCS, + ("[ibs,%d] illegal row-index %d", __LINE__, ri)); + + phw = &ibs_pcpu[cpu]->pc_ibspmcs[ri]; + + KASSERT(pm == NULL || phw->phw_pmc == NULL, + ("[ibs,%d] pm=%p phw->pm=%p hwpmc not unconfigured", + __LINE__, pm, phw->phw_pmc)); + + phw->phw_pmc = pm; + + return (0); +} + +/* + * Retrieve a configured PMC pointer from hardware state. + */ +static int +ibs_get_config(int cpu, int ri, struct pmc **ppm) +{ + + *ppm = ibs_pcpu[cpu]->pc_ibspmcs[ri].phw_pmc; + + return (0); +} + +/* + * Check if a given PMC allocation is feasible. + */ +static int +ibs_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, + const struct pmc_op_pmcallocate *a) +{ + uint64_t caps, config; + + KASSERT(ri >= 0 && ri < IBS_NPMCS, + ("[ibs,%d] illegal row index %d", __LINE__, ri)); + + /* check class match */ + if (a->pm_class != PMC_CLASS_IBS) + return (EINVAL); + if (a->pm_md.pm_ibs.ibs_type != ri) + return (EINVAL); + + caps = pm->pm_caps; + + PMCDBG2(MDP, ALL, 1, "ibs-allocate ri=%d caps=0x%x", ri, caps); + + if ((caps & PMC_CAP_SYSTEM) == 0) + return (EINVAL); + + config = a->pm_md.pm_ibs.ibs_ctl; + pm->pm_md.pm_ibs.ibs_ctl = config; + + PMCDBG2(MDP, ALL, 2, "ibs-allocate ri=%d -> config=0x%x", ri, config); + + return (0); +} + +/* + * Release machine dependent state associated with a PMC. This is a + * no-op on this architecture. + */ +static int +ibs_release_pmc(int cpu, int ri, struct pmc *pmc __unused) +{ + struct pmc_hw *phw __diagused; + + KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), + ("[ibs,%d] illegal CPU value %d", __LINE__, cpu)); + KASSERT(ri >= 0 && ri < IBS_NPMCS, + ("[ibs,%d] illegal row-index %d", __LINE__, ri)); + + PMCDBG1(MDP, ALL, 1, "ibs-release ri=%d", ri); + + phw = &ibs_pcpu[cpu]->pc_ibspmcs[ri]; + + KASSERT(phw->phw_pmc == NULL, + ("[ibs,%d] PHW pmc %p non-NULL", __LINE__, phw->phw_pmc)); + + return (0); +} + +/* + * Start a PMC. + */ +static int +ibs_start_pmc(int cpu __diagused, int ri, struct pmc *pm) +{ + uint64_t config; + + KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), + ("[ibs,%d] illegal CPU value %d", __LINE__, cpu)); + KASSERT(ri >= 0 && ri < IBS_NPMCS, + ("[ibs,%d] illegal row-index %d", __LINE__, ri)); + + PMCDBG2(MDP, STA, 1, "ibs-start cpu=%d ri=%d", cpu, ri); + + /* + * This is used to handle spurious NMIs. All that matters is that it + * is not in the stopping state. + */ + atomic_store_int(&ibs_pcpu[cpu]->pc_status, IBS_CPU_RUNNING); + + /* + * Turn on the ENABLE bit. Zeroing out the control register eliminates + * stale valid bits from spurious NMIs and it resets the counter. + */ + switch (ri) { + case IBS_PMC_FETCH: + wrmsr(IBS_FETCH_CTL, 0); + config = pm->pm_md.pm_ibs.ibs_ctl | IBS_FETCH_CTL_ENABLE; + wrmsr(IBS_FETCH_CTL, config); + break; + case IBS_PMC_OP: + wrmsr(IBS_OP_CTL, 0); + config = pm->pm_md.pm_ibs.ibs_ctl | IBS_OP_CTL_ENABLE; + wrmsr(IBS_OP_CTL, config); + break; + } + + return (0); +} + +/* + * Stop a PMC. + */ +static int +ibs_stop_pmc(int cpu __diagused, int ri, struct pmc *pm) +{ + int i; + uint64_t config; + + KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), + ("[ibs,%d] illegal CPU value %d", __LINE__, cpu)); + KASSERT(ri >= 0 && ri < IBS_NPMCS, + ("[ibs,%d] illegal row-index %d", __LINE__, ri)); + + PMCDBG1(MDP, STO, 1, "ibs-stop ri=%d", ri); + + /* + * Turn off the ENABLE bit, but unfortunately there are a few quirks + * that generate excess NMIs. Workaround #420 in the Revision Guide + * for AMD Family 10h Processors 41322 Rev. 3.92 March 2012. requires + * that we clear the count before clearing enable. + * + * Even after clearing the counter spurious NMIs are still possible so + * we use a per-CPU atomic variable to notify the interrupt handler we + * are stopping and discard spurious NMIs. We then retry clearing the + * control register for 50us. This gives us enough time and ensures + * that the valid bit is not accidently stuck after a spurious NMI. + */ + config = pm->pm_md.pm_ibs.ibs_ctl; + + atomic_store_int(&ibs_pcpu[cpu]->pc_status, IBS_CPU_STOPPING); + + switch (ri) { + case IBS_PMC_FETCH: + wrmsr(IBS_FETCH_CTL, config & ~IBS_FETCH_CTL_MAXCNTMASK); + DELAY(1); + config &= ~IBS_FETCH_CTL_ENABLE; + wrmsr(IBS_FETCH_CTL, config); + break; + case IBS_PMC_OP: + wrmsr(IBS_FETCH_CTL, config & ~IBS_FETCH_CTL_MAXCNTMASK); + DELAY(1); + config &= ~IBS_OP_CTL_ENABLE; + wrmsr(IBS_OP_CTL, config); + break; + } + + for (i = 0; i < IBS_STOP_ITER; i++) { + DELAY(1); + + switch (ri) { + case IBS_PMC_FETCH: + wrmsr(IBS_FETCH_CTL, 0); + break; + case IBS_PMC_OP: + wrmsr(IBS_OP_CTL, 0); + break; + } + } + + atomic_store_int(&ibs_pcpu[cpu]->pc_status, IBS_CPU_STOPPED); + + return (0); +} + +static void +pmc_ibs_process_fetch(struct pmc *pm, struct trapframe *tf, uint64_t config) +{ + struct pmc_multipart mpd; + + if (pm == NULL) + return; + + if (pm->pm_state != PMC_STATE_RUNNING) + return; + + memset(&mpd, 0, sizeof(mpd)); + + mpd.pl_type = PMC_CC_MULTIPART_IBS_FETCH; + mpd.pl_length = 4; + mpd.pl_mpdata[PMC_MPIDX_FETCH_CTL] = config; + if (ibs_features) { + mpd.pl_mpdata[PMC_MPIDX_FETCH_EXTCTL] = rdmsr(IBS_FETCH_EXTCTL); + } + mpd.pl_mpdata[PMC_MPIDX_FETCH_CTL] = config; + mpd.pl_mpdata[PMC_MPIDX_FETCH_LINADDR] = rdmsr(IBS_FETCH_LINADDR); + if ((config & IBS_FETCH_CTL_PHYSADDRVALID) != 0) { + mpd.pl_mpdata[PMC_MPIDX_FETCH_PHYSADDR] = + rdmsr(IBS_FETCH_PHYSADDR); + } + + pmc_process_interrupt_mp(PMC_HR, pm, tf, &mpd); +} + +static void +pmc_ibs_process_op(struct pmc *pm, struct trapframe *tf, uint64_t config) +{ + struct pmc_multipart mpd; + + if (pm == NULL) + return; + + if (pm->pm_state != PMC_STATE_RUNNING) + return; + + memset(&mpd, 0, sizeof(mpd)); + + mpd.pl_type = PMC_CC_MULTIPART_IBS_OP; + mpd.pl_length = 8; + mpd.pl_mpdata[PMC_MPIDX_OP_CTL] = config; + mpd.pl_mpdata[PMC_MPIDX_OP_RIP] = rdmsr(IBS_OP_RIP); + mpd.pl_mpdata[PMC_MPIDX_OP_DATA] = rdmsr(IBS_OP_DATA); + mpd.pl_mpdata[PMC_MPIDX_OP_DATA2] = rdmsr(IBS_OP_DATA2); + mpd.pl_mpdata[PMC_MPIDX_OP_DATA3] = rdmsr(IBS_OP_DATA3); + mpd.pl_mpdata[PMC_MPIDX_OP_DC_LINADDR] = rdmsr(IBS_OP_DC_LINADDR); + mpd.pl_mpdata[PMC_MPIDX_OP_DC_PHYSADDR] = rdmsr(IBS_OP_DC_PHYSADDR); + + pmc_process_interrupt_mp(PMC_HR, pm, tf, &mpd); + + wrmsr(IBS_OP_CTL, pm->pm_md.pm_ibs.ibs_ctl | IBS_OP_CTL_ENABLE); +} + +/* + * Interrupt handler. This function needs to return '1' if the + * interrupt was this CPU's PMCs or '0' otherwise. It is not allowed + * to sleep or do anything a 'fast' interrupt handler is not allowed + * to do. + */ +int +pmc_ibs_intr(struct trapframe *tf) +{ + struct ibs_cpu *pac; + struct pmc *pm; + int retval, cpu; + uint64_t config; + + cpu = curcpu; + KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), + ("[ibs,%d] out of range CPU %d", __LINE__, cpu)); + + PMCDBG3(MDP, INT, 1, "cpu=%d tf=%p um=%d", cpu, tf, TRAPF_USERMODE(tf)); + + retval = 0; + + pac = ibs_pcpu[cpu]; + + config = rdmsr(IBS_FETCH_CTL); + if ((config & IBS_FETCH_CTL_VALID) != 0) { + pm = pac->pc_ibspmcs[IBS_PMC_FETCH].phw_pmc; + + retval = 1; + + pmc_ibs_process_fetch(pm, tf, config); + } + + config = rdmsr(IBS_OP_CTL); + if ((retval == 0) && ((config & IBS_OP_CTL_VALID) != 0)) { + pm = pac->pc_ibspmcs[IBS_PMC_OP].phw_pmc; + + retval = 1; + + pmc_ibs_process_op(pm, tf, config); + } + + if (retval == 0) { + // Lets check for a stray NMI when stopping + if (atomic_load_int(&pac->pc_status) == IBS_CPU_STOPPING) { + return (1); + } + } + + + if (retval) + counter_u64_add(pmc_stats.pm_intr_processed, 1); + else + counter_u64_add(pmc_stats.pm_intr_ignored, 1); + + PMCDBG1(MDP, INT, 2, "retval=%d", retval); + + return (retval); +} + +/* + * Describe a PMC. + */ +static int +ibs_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc) +{ + struct pmc_hw *phw; + + KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), + ("[ibs,%d] illegal CPU %d", __LINE__, cpu)); + KASSERT(ri >= 0 && ri < IBS_NPMCS, + ("[ibs,%d] row-index %d out of range", __LINE__, ri)); + + phw = &ibs_pcpu[cpu]->pc_ibspmcs[ri]; + + if (ri == IBS_PMC_FETCH) { + strlcpy(pi->pm_name, "IBS-FETCH", sizeof(pi->pm_name)); + pi->pm_class = PMC_CLASS_IBS; + pi->pm_enabled = true; + *ppmc = phw->phw_pmc; + } else { + strlcpy(pi->pm_name, "IBS-OP", sizeof(pi->pm_name)); + pi->pm_class = PMC_CLASS_IBS; + pi->pm_enabled = true; + *ppmc = phw->phw_pmc; + } + + return (0); +} + +/* + * Processor-dependent initialization. + */ +static int +ibs_pcpu_init(struct pmc_mdep *md, int cpu) +{ + struct ibs_cpu *pac; + struct pmc_cpu *pc; + struct pmc_hw *phw; + int first_ri, n; + + KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), + ("[ibs,%d] insane cpu number %d", __LINE__, cpu)); + + PMCDBG1(MDP, INI, 1, "ibs-init cpu=%d", cpu); + + ibs_pcpu[cpu] = pac = malloc(sizeof(struct ibs_cpu), M_PMC, + M_WAITOK | M_ZERO); + + /* + * Set the content of the hardware descriptors to a known + * state and initialize pointers in the MI per-cpu descriptor. + */ + pc = pmc_pcpu[cpu]; + first_ri = md->pmd_classdep[PMC_MDEP_CLASS_INDEX_IBS].pcd_ri; + + KASSERT(pc != NULL, ("[ibs,%d] NULL per-cpu pointer", __LINE__)); + + for (n = 0, phw = pac->pc_ibspmcs; n < IBS_NPMCS; n++, phw++) { + phw->phw_state = PMC_PHW_FLAG_IS_ENABLED | + PMC_PHW_CPU_TO_STATE(cpu) | PMC_PHW_INDEX_TO_STATE(n); + phw->phw_pmc = NULL; + pc->pc_hwpmcs[n + first_ri] = phw; + } + + return (0); +} + +/* + * Processor-dependent cleanup prior to the KLD being unloaded. + */ +static int +ibs_pcpu_fini(struct pmc_mdep *md, int cpu) +{ + struct ibs_cpu *pac; + struct pmc_cpu *pc; + int first_ri, i; + + KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), + ("[ibs,%d] insane cpu number (%d)", __LINE__, cpu)); + + PMCDBG1(MDP, INI, 1, "ibs-cleanup cpu=%d", cpu); + + /* + * Turn off IBS. + */ + wrmsr(IBS_FETCH_CTL, 0); + wrmsr(IBS_OP_CTL, 0); + + /* + * Free up allocated space. + */ + if ((pac = ibs_pcpu[cpu]) == NULL) + return (0); + + ibs_pcpu[cpu] = NULL; + + pc = pmc_pcpu[cpu]; + KASSERT(pc != NULL, ("[ibs,%d] NULL per-cpu state", __LINE__)); + + first_ri = md->pmd_classdep[PMC_MDEP_CLASS_INDEX_IBS].pcd_ri; + + /* + * Reset pointers in the MI 'per-cpu' state. + */ + for (i = 0; i < IBS_NPMCS; i++) + pc->pc_hwpmcs[i + first_ri] = NULL; + + free(pac, M_PMC); + + return (0); +} + +/* + * Initialize ourselves. + */ +int +pmc_ibs_initialize(struct pmc_mdep *pmc_mdep, int ncpus) +{ + u_int regs[4]; + struct pmc_classdep *pcd; + + /* + * Allocate space for pointers to PMC HW descriptors and for + * the MDEP structure used by MI code. + */ + ibs_pcpu = malloc(sizeof(struct ibs_cpu *) * pmc_cpu_max(), M_PMC, + M_WAITOK | M_ZERO); + + /* Initialize AMD IBS handling. */ + pcd = &pmc_mdep->pmd_classdep[PMC_MDEP_CLASS_INDEX_IBS]; + + pcd->pcd_caps = IBS_PMC_CAPS; + pcd->pcd_class = PMC_CLASS_IBS; + pcd->pcd_num = IBS_NPMCS; + pcd->pcd_ri = pmc_mdep->pmd_npmc; + pcd->pcd_width = 0; + + pcd->pcd_allocate_pmc = ibs_allocate_pmc; + pcd->pcd_config_pmc = ibs_config_pmc; + pcd->pcd_describe = ibs_describe; + pcd->pcd_get_config = ibs_get_config; + pcd->pcd_pcpu_fini = ibs_pcpu_fini; + pcd->pcd_pcpu_init = ibs_pcpu_init; + pcd->pcd_release_pmc = ibs_release_pmc; + pcd->pcd_start_pmc = ibs_start_pmc; + pcd->pcd_stop_pmc = ibs_stop_pmc; + pcd->pcd_read_pmc = ibs_read_pmc; + pcd->pcd_write_pmc = ibs_write_pmc; + + pmc_mdep->pmd_npmc += IBS_NPMCS; + + if (cpu_exthigh >= CPUID_IBSID) { + do_cpuid(CPUID_IBSID, regs); + ibs_features = regs[0]; + } else { + ibs_features = 0; + } + + PMCDBG0(MDP, INI, 0, "ibs-initialize"); + + return (0); +} + +/* + * Finalization code for AMD CPUs. + */ +void +pmc_ibs_finalize(struct pmc_mdep *md) +{ + PMCDBG0(MDP, INI, 1, "ibs-finalize"); + + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(ibs_pcpu[i] == NULL, + ("[ibs,%d] non-null pcpu cpu %d", __LINE__, i)); + + free(ibs_pcpu, M_PMC); + ibs_pcpu = NULL; +} diff --git a/sys/dev/hwpmc/hwpmc_ibs.h b/sys/dev/hwpmc/hwpmc_ibs.h new file mode 100644 index 000000000000..4449b44c8368 --- /dev/null +++ b/sys/dev/hwpmc/hwpmc_ibs.h @@ -0,0 +1,176 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026, Ali Jose Mashtizadeh + * 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. + */ + +#ifndef _DEV_HWPMC_IBS_H_ +#define _DEV_HWPMC_IBS_H_ 1 + +#define IBS_NPMCS 2 +#define IBS_PMC_FETCH 0 +#define IBS_PMC_OP 1 + +/* + * All of the CPUID definitions come from AMD PPR Vol 1 for AMD Family 1Ah + * Model 02h C1 (57238) 2024-09-29 Revision 0.24. + */ +#define CPUID_IBSID 0x8000001B +#define CPUID_IBSID_IBSFFV 0x00000001 /* IBS Feature Flags Valid */ +#define CPUID_IBSID_FETCHSAM 0x00000002 /* IBS Fetch Sampling */ +#define CPUID_IBSID_OPSAM 0x00000004 /* IBS Execution Sampling */ +#define CPUID_IBSID_RDWROPCNT 0x00000008 /* RdWr Operationg Counter */ +#define CPUID_IBSID_OPCNT 0x00000010 /* Operation Counter */ +#define CPUID_IBSID_BRNTRGT 0x00000020 /* Branch Target Address */ +#define CPUID_IBSID_OPCNTEXT 0x00000040 /* Extend Counter */ +#define CPUID_IBSID_RIPINVALIDCHK 0x00000080 /* Invalid RIP Indication */ +#define CPUID_IBSID_OPFUSE 0x00000010 /* Fused Branch Operation */ +#define CPUID_IBSID_IBSFETCHCTLEXTD 0x00000020 /* IBS Fetch Control Ext */ +#define CPUID_IBSID_IBSOPDATA4 0x00000040 /* IBS OP DATA4 */ +#define CPUID_IBSID_ZEN4IBSEXTENSIONS 0x00000080 /* IBS Zen 4 Extensions */ +#define CPUID_IBSID_IBSLOADLATENCYFILT 0x00000100 /* Load Latency Filtering */ +#define CPUID_IBSID_IBSUPDTDDTLBSTATS 0x00080000 /* Simplified DTLB Stats */ + +/* + * All of these definitions here come from AMD64 Architecture Programmer's + * Manual Volume 2: System Programming (24593) 2025-07-02 Version 3.43. with + * the following exceptions: + * + * OpData4 and fields come from the BKDG for AMD Family 15h Model 70-7Fh + * (55072) 2018-06-20 Revision 3.09. + */ + +/* IBS MSRs */ +#define IBS_CTL 0xC001103A /* IBS Control */ +#define IBS_CTL_LVTOFFSETVALID (1ULL << 8) +#define IBS_CTL_LVTOFFSETMASK 0x0000000F + +/* IBS Fetch Control */ +#define IBS_FETCH_CTL 0xC0011030 /* IBS Fetch Control */ +#define IBS_FETCH_CTL_L3MISS (1ULL << 61) /* L3 Cache Miss */ +#define IBS_FETCH_CTL_OPCACHEMISS (1ULL << 60) /* Op Cache Miss */ +#define IBS_FETCH_CTL_L3MISSONLY (1ULL << 59) /* L3 Miss Filtering */ +#define IBS_FETCH_CTL_RANDOMIZE (1ULL << 57) /* Randomized Tagging */ +#define IBS_FETCH_CTL_L1TLBMISS (1ULL << 55) /* L1 TLB Miss */ +// Page size 54:53 +#define IBS_FETCH_CTL_PHYSADDRVALID (1ULL << 52) /* PHYSADDR Valid */ +#define IBS_FETCH_CTL_ICMISS (1ULL << 51) /* Inst. Cache Miss */ +#define IBS_FETCH_CTL_COMPLETE (1ULL << 50) /* Complete */ *** 650 LINES SKIPPED *** From nobody Fri Feb 27 22:08:48 2026 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 4fN2Xc1nBFz6TPsv for ; Fri, 27 Feb 2026 22:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fN2Xc0bZ6z3lTs for ; Fri, 27 Feb 2026 22:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772230128; 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=hKAqqFRGof7OrLBLZbzyydUSlZA39LpQPEhgoQGBxxk=; b=iRMss9orQ4AOukL4/w/r25NBL07SzhPA8rkYcd/WWRX//xanVLDYu9Bwy1mjepH4FOHJJK wVUbkBUdZsn5mprGMLlbnjgSSrPNRj39n+5yllSJ4bL936JqYPVDLqcVNqsWarlRoa+6h7 MkrQ+FKD+q5r4MMOsh7vLJzdXjcGmo1/VoA8UwrVnUuqYa/YPrBibCkGYnfTmWWryJ1eFj DyXujDxNtWGUY0pceYrXjshL+TC2IoVbpSAT9xZkAVe0kEq31X0deElag7Lm3Z3HhaVvwi c0dbkJvhbU+LbQz9Fy81Yv5Cw4KO/lrtrhOzf3ChAH9IceM670/MZH2unxtsvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772230128; a=rsa-sha256; cv=none; b=tohVGrMBuDGJwHROZaKB5zrVG7mugyavd413wrYe3sjXBZJ9rMIQNVhQoryEsy2xojy0/m 9zn4CSdlmUptKeV7kzXC0cAYOgjvz+0Jw/v4BLDYtNFm+2JtTA1AaR/EVzU3p1doqFFhO7 HpTx2+xm6hTjyJKBKtXgzZ2XHpupv0DgLtrll29/cQ7lXvXUXohDmMJyBG4cPVGKSOIZhA dfJGxgeWvZAeVLjVjZ6d8yIP/iCc5MpPanpwgM8bJvjwaKAt3q6I3IeWWiLfoo82iVARiQ PQWqbxTUutq1TC5fhoPVVpOFJ2bBcT0Fwn8N1Q5p2GWD006uWMsK3SyDKZCZmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772230128; 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=hKAqqFRGof7OrLBLZbzyydUSlZA39LpQPEhgoQGBxxk=; b=Cl1dW9WZ47Lf60PKhUS0BHw0YbusKs5fWjenyHRxebuRTIlOhNhAERkwDuFLVhIKbUwiIn WG+ug/NI5KE6xVE7tH2Ebv5LDJWGvAp3C/5usiK3obwpa2MtL5U0Bg+VlrGbHc+kwRn4o7 dfVHp+4A4hDXi/viKzUYZIsBiCttTW6rQXUXS5vHR6w1DjM4kd8TZILGzwJMj4jNlq5GsP vfDHvSs676qmXZDOEJ5jWgVNf1RoVkNaRlIbkBuiEyxmcnkr+MpHkYl2lU+nGAQPqMctLi KE8LkZFGUPY2Ysl792ETLtCfRAIf/HWU2vqS7K94kWpWn9IIEGxlsWDCj+D4zQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fN2Xc0BCvzcc4 for ; Fri, 27 Feb 2026 22:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3423b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 22:08:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ali Mashtizadeh From: Warner Losh Subject: git: 3ce3e896acf6 - main - libpmc: Update event definitions for AMD Zen 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: 3ce3e896acf6cd504514ee44fc3aedcdc48a199c Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 22:08:48 +0000 Message-Id: <69a215f0.3423b.3bc7cd10@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3ce3e896acf6cd504514ee44fc3aedcdc48a199c commit 3ce3e896acf6cd504514ee44fc3aedcdc48a199c Author: Ali Mashtizadeh AuthorDate: 2026-02-24 15:36:03 +0000 Commit: Warner Losh CommitDate: 2026-02-27 21:26:34 +0000 libpmc: Update event definitions for AMD Zen The pmu event definitions for AMD Zen 5 was updated since it was imported into the tree. As a bonus I also updated the recommended json counters for Zen 1-3 even though we do not use that file yet. Sponsored by: Netflix Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2048 --- lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json | 3 ++- lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json | 3 ++- lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json | 3 ++- lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json b/lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json index bf5083c1c260..4d28177325a0 100644 --- a/lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json +++ b/lib/libpmc/pmu-events/arch/x86/amdzen1/recommended.json @@ -169,8 +169,9 @@ }, { "MetricName": "nps1_die_to_dram", - "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die) (may need --metric-no-group)", + "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die)", "MetricExpr": "dram_channel_data_controller_0 + dram_channel_data_controller_1 + dram_channel_data_controller_2 + dram_channel_data_controller_3 + dram_channel_data_controller_4 + dram_channel_data_controller_5 + dram_channel_data_controller_6 + dram_channel_data_controller_7", + "MetricConstraint": "NO_GROUP_EVENTS", "MetricGroup": "data_fabric", "PerPkg": "1", "ScaleUnit": "6.1e-5MiB" diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json b/lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json index a71694a043ba..60e19456d4c8 100644 --- a/lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json +++ b/lib/libpmc/pmu-events/arch/x86/amdzen2/recommended.json @@ -169,8 +169,9 @@ }, { "MetricName": "nps1_die_to_dram", - "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die) (may need --metric-no-group)", + "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die)", "MetricExpr": "dram_channel_data_controller_0 + dram_channel_data_controller_1 + dram_channel_data_controller_2 + dram_channel_data_controller_3 + dram_channel_data_controller_4 + dram_channel_data_controller_5 + dram_channel_data_controller_6 + dram_channel_data_controller_7", + "MetricConstraint": "NO_GROUP_EVENTS", "MetricGroup": "data_fabric", "PerPkg": "1", "ScaleUnit": "6.1e-5MiB" diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json b/lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json index 988cf68ae825..3e9e1781812e 100644 --- a/lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json +++ b/lib/libpmc/pmu-events/arch/x86/amdzen3/recommended.json @@ -205,10 +205,11 @@ }, { "MetricName": "nps1_die_to_dram", - "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die) (may need --metric-no-group)", + "BriefDescription": "Approximate: Combined DRAM B/bytes of all channels on a NPS1 node (die)", "MetricExpr": "dram_channel_data_controller_0 + dram_channel_data_controller_1 + dram_channel_data_controller_2 + dram_channel_data_controller_3 + dram_channel_data_controller_4 + dram_channel_data_controller_5 + dram_channel_data_controller_6 + dram_channel_data_controller_7", "MetricGroup": "data_fabric", "PerPkg": "1", + "MetricConstraint": "NO_GROUP_EVENTS", "ScaleUnit": "6.1e-5MiB" } ] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json b/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json index ff6627a77805..06bbaea15925 100644 --- a/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json +++ b/lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json @@ -70,19 +70,19 @@ "EventName": "ls_mab_alloc.load_store_allocations", "EventCode": "0x41", "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for load-store allocations.", - "UMask": "0x3f" + "UMask": "0x07" }, { "EventName": "ls_mab_alloc.hardware_prefetcher_allocations", "EventCode": "0x41", "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for hardware prefetcher allocations.", - "UMask": "0x40" + "UMask": "0x08" }, { "EventName": "ls_mab_alloc.all_allocations", "EventCode": "0x41", "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for all types of allocations.", - "UMask": "0x7f" + "UMask": "0x0f" }, { "EventName": "ls_dmnd_fills_from_sys.local_l2", From nobody Fri Feb 27 22:08:49 2026 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 4fN2Xd38d4z6TPs8 for ; Fri, 27 Feb 2026 22:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fN2Xd1Nzpz3llN for ; Fri, 27 Feb 2026 22:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772230129; 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=MKnlOmZ5mpqBdLijLPcW6UdNYAkSygrPz6pL1m1IFSo=; b=E47ANRjvHu2wTjHf0NgobmQNPCDnT2NE33ry9JPhOFUkrxsTOfi4cVnzMwQLF0FlLeIPLS pHLuzx9fL2Fif7P1trtgxXPnR4DroSlPKIM4WhuztB6gkarqwWPp1jsN83uGTLolfx2tpg D5euI9ZFbNSNg/NXS5DUcFlrg6pugCluSnLiiTwK99bJkViRXGZCF9DY2zJVH3Jatni4vT MY2XlQn+SlhA3ClcdvNQbCCQWspIqDJXX4mQEJYyXOD+8AbcMbnJHOKxCtwl0xrlTM2xL8 dwAkB3G52buIK5AlCHHqmGi43vT6bSRSaWUYI3GH8jmeDMv4dmsdqd3o0bBn9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772230129; a=rsa-sha256; cv=none; b=qji0utqn/RWPPCNyP57uAIOClmwLyzDxSnGjUWcJKlXIRvuhmzjDWsv6OPUVUS+bURNU0v JUygGfsZGiuCPBtS+3rpR9Zmx2iNL7qd4T4VCte43cV0lzXo/qKJ553KR/niSc3B0iVbG2 dGIVjaa7qOmVXkpgG/prD7Kc1YAFzDS6Ldcp5l6jpr6E89PCvjID41D9fjr6ACe72YIUFA 5m+xAfYJIfq1Qxob8LFFKHB+9m/UKnZ0ymyHpO6lZO9smx2T0a9RdLFjcV1uE0jgxOLYP5 M4v+mgzUcHfuVekQ1yCRkMbtRsoiMMakvjESOWD/RjUqic0NGlUeK3u0Upwggw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772230129; 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=MKnlOmZ5mpqBdLijLPcW6UdNYAkSygrPz6pL1m1IFSo=; b=Zbt9zWCYdVc5wv7WT5Fl0hG/bZFzOIVtcO8LGjXXLjX92SP4kvljKJCy4o+WFtl6bWC6Hf Ntn9ZrL/t4TVFcAcmj1wxQRezSayvx/qmIcgVRQ/PcHTNkSUg4lmdqeXCY84pGazon4INl sr7wPi8QqTtQNxWbyzEm5xMK4hKzNFbBPE9SZBLJmN6wxhE0UQ5Vxqi6XChYaiLAyvZhNQ X/9mOxmYuPz9lFtwTqhkSQAa5xXfX6siBWQf/hETxOr71Z8ZwVuLdF61I1TDrR5UBcuZyt AVpKi4VxE+7JlItlFxs1anoAcNd1poF/lRyJzUb2jkPwXmykb6wGUcmlN05oWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fN2Xd0z3wzbKN for ; Fri, 27 Feb 2026 22:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3227b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 22:08:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ali Mashtizadeh From: Warner Losh Subject: git: 178d0b5b8da7 - main - libpmc: Import AMD Zen 6 PMU 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: 178d0b5b8da7480f455273aedf40dd8f1e785d3f Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 22:08:49 +0000 Message-Id: <69a215f1.3227b.5e050122@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=178d0b5b8da7480f455273aedf40dd8f1e785d3f commit 178d0b5b8da7480f455273aedf40dd8f1e785d3f Author: Ali Mashtizadeh AuthorDate: 2026-02-24 15:52:00 +0000 Commit: Warner Losh CommitDate: 2026-02-27 21:27:35 +0000 libpmc: Import AMD Zen 6 PMU events. Sponsored by: Netflix Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2049 --- .../arch/x86/amdzen6/branch-prediction.json | 93 ++ lib/libpmc/pmu-events/arch/x86/amdzen6/decode.json | 139 +++ .../pmu-events/arch/x86/amdzen6/execution.json | 192 ++++ .../arch/x86/amdzen6/floating-point.json | 1106 ++++++++++++++++++++ .../pmu-events/arch/x86/amdzen6/inst-cache.json | 120 +++ .../pmu-events/arch/x86/amdzen6/l2-cache.json | 326 ++++++ .../pmu-events/arch/x86/amdzen6/l3-cache.json | 177 ++++ .../pmu-events/arch/x86/amdzen6/load-store.json | 523 +++++++++ .../arch/x86/amdzen6/memory-controller.json | 101 ++ .../pmu-events/arch/x86/amdzen6/pipeline.json | 99 ++ .../pmu-events/arch/x86/amdzen6/recommended.json | 339 ++++++ lib/libpmc/pmu-events/arch/x86/mapfile.csv | 3 +- 12 files changed, 3217 insertions(+), 1 deletion(-) diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen6/branch-prediction.json b/lib/libpmc/pmu-events/arch/x86/amdzen6/branch-prediction.json new file mode 100644 index 000000000000..dd70069f68ed --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen6/branch-prediction.json @@ -0,0 +1,93 @@ +[ + { + "EventName": "bp_l1_tlb_miss_l2_tlb_hit", + "EventCode": "0x84", + "BriefDescription": "Instruction fetches that miss in the L1 ITLB but hit in the L2 ITLB." + }, + { + "EventName": "bp_l1_tlb_miss_l2_tlb_miss.if4k", + "EventCode": "0x85", + "BriefDescription": "Instruction fetches that miss in both the L1 and L2 ITLBs (page-table walks requested) for 4k pages.", + "UMask": "0x01" + }, + { + "EventName": "bp_l1_tlb_miss_l2_tlb_miss.if2m", + "EventCode": "0x85", + "BriefDescription": "Instruction fetches that miss in both the L1 and L2 ITLBs (page-table walks requested) for 2M pages.", + "UMask": "0x02" + }, + { + "EventName": "bp_l1_tlb_miss_l2_tlb_miss.if1g", + "EventCode": "0x85", + "BriefDescription": "Instruction fetches that miss in both the L1 and L2 ITLBs (page-table walks requested) for 1G pages.", + "UMask": "0x04" + }, + { + "EventName": "bp_l1_tlb_miss_l2_tlb_miss.coalesced_4k", + "EventCode": "0x85", + "BriefDescription": "Instruction fetches that miss in both the L1 and L2 ITLBs (page-table walks requested) for coalesced pages (16k pages created from four adjacent 4k pages).", + "UMask": "0x08" + }, + { + "EventName": "bp_l1_tlb_miss_l2_tlb_miss.all", + "EventCode": "0x85", + "BriefDescription": "Instruction fetches that miss in both the L1 and L2 ITLBs (page-table walks requested) for all page sizes.", + "UMask": "0x0f" + }, + { + "EventName": "bp_pipe_correct", + "EventCode": "0x8b", + "BriefDescription": "Branch predictor pipeline flushes due to internal conditions such as a second level prediction structure." + }, + { + "EventName": "bp_var_target_pred", + "EventCode": "0x8e", + "BriefDescription": "Indirect predictions (branch used the indirect predictor to make a prediction)." + }, + { + "EventName": "bp_early_redir", + "EventCode": "0x91", + "BriefDescription": "Early redirects sent to branch predictor. This happens when either the decoder or dispatch logic is able to detect that the branch predictor needs to be redirected." + }, + { + "EventName": "bp_l1_tlb_fetch_hit.if4k", + "EventCode": "0x94", + "BriefDescription": "Instruction fetches that hit in the L1 ITLB for 4k or coalesced pages (16k pages created from four adjacent 4k pages).", + "UMask": "0x01" + }, + { + "EventName": "bp_l1_tlb_fetch_hit.if2m", + "EventCode": "0x94", + "BriefDescription": "Instruction fetches that hit in the L1 ITLB for 2M pages.", + "UMask": "0x02" + }, + { + "EventName": "bp_l1_tlb_fetch_hit.if1g", + "EventCode": "0x94", + "BriefDescription": "Instruction fetches that hit in the L1 ITLB for 1G pages.", + "UMask": "0x04" + }, + { + "EventName": "bp_l1_tlb_fetch_hit.all", + "EventCode": "0x94", + "BriefDescription": "Instruction fetches that hit in the L1 ITLB for all page sizes.", + "UMask": "0x07" + }, + { + "EventName": "bp_fe_redir.resync", + "EventCode": "0x9f", + "BriefDescription": "Redirects of the pipeline frontend caused by resyncs. These are retire time pipeline restarts.", + "UMask": "0x01" + }, + { + "EventName": "bp_fe_redir.ex_redir", + "EventCode": "0x9f", + "BriefDescription": "Redirects of the pipeline frontend caused by mispredicts. These are used for branch direction correction and handling indirect branch target mispredicts.", + "UMask": "0x02" + }, + { + "EventName": "bp_fe_redir.all", + "EventCode": "0x9f", + "BriefDescription": "Redirects of the pipeline frontend caused by any reason." + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen6/decode.json b/lib/libpmc/pmu-events/arch/x86/amdzen6/decode.json new file mode 100644 index 000000000000..c5d37fbac948 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen6/decode.json @@ -0,0 +1,139 @@ +[ + { + "EventName": "de_op_queue_empty", + "EventCode": "0xa9", + "BriefDescription": "Cycles where the op queue is empty. Such cycles indicate that the frontend is not delivering instructions fast enough." + }, + { + "EventName": "de_src_op_disp.x86_decoder", + "EventCode": "0xaa", + "BriefDescription": "Ops dispatched from x86 decoder.", + "UMask": "0x01" + }, + { + "EventName": "de_src_op_disp.op_cache", + "EventCode": "0xaa", + "BriefDescription": "Ops dispatched from op cache.", + "UMask": "0x02" + }, + { + "EventName": "de_src_op_disp.all", + "EventCode": "0xaa", + "BriefDescription": "Ops dispatched from any source.", + "UMask": "0x07" + }, + { + "EventName": "de_dis_ops_from_decoder.any_fp", + "EventCode": "0xab", + "BriefDescription": "Ops dispatched from the decoder to a floating-point unit.", + "UMask": "0x04" + }, + { + "EventName": "de_dis_ops_from_decoder.any_int", + "EventCode": "0xab", + "BriefDescription": "Ops dispatched from the decoder to an integer unit.", + "UMask": "0x08" + }, + { + "EventName": "de_disp_stall_cycles_dynamic_tokens_part1.int_phy_reg_file_rsrc_stall", + "EventCode": "0xae", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to integer physical register file resource stalls.", + "UMask": "0x01" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part1.load_queue_rsrc_stall", + "EventCode": "0xae", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to load queue token stalls.", + "UMask": "0x02" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part1.store_queue_rsrc_stall", + "EventCode": "0xae", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to store queue token stalls.", + "UMask": "0x04" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part1.taken_brnch_buffer_rsrc", + "EventCode": "0xae", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to taken branch buffer resource stalls.", + "UMask": "0x10" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part1.fp_sch_rsrc_stall", + "EventCode": "0xae", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to floating-point non-schedulable queue token stalls.", + "UMask": "0x40" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part2.int_sq0", + "EventCode": "0xaf", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to unavailability of integer scheduler 0 tokens.", + "UMask": "0x01" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part2.int_sq1", + "EventCode": "0xaf", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to unavailability of integer scheduler 1 tokens.", + "UMask": "0x02" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part2.int_sq2", + "EventCode": "0xaf", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to unavailability of integer scheduler 2 tokens.", + "UMask": "0x04" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part2.int_sq3", + "EventCode": "0xaf", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to unavailability of integer scheduler 3 tokens.", + "UMask": "0x08" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part2.int_sq4", + "EventCode": "0xaf", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to unavailability of integer scheduler 4 tokens.", + "UMask": "0x10" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part2.int_sq5", + "EventCode": "0xaf", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to unavailability of integer scheduler 5 tokens.", + "UMask": "0x20" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part2.ret_q", + "EventCode": "0xaf", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to unavailability of retire queue tokens.", + "UMask": "0x80" + }, + { + "EventName": "de_dispatch_stall_cycle_dynamic_tokens_part2.all", + "EventCode": "0xaf", + "BriefDescription": "Cycles where a dispatch group is valid but does not get dispatched due to any token stalls.", + "UMask": "0xbf" + }, + { + "EventName": "de_no_dispatch_per_slot.no_ops_from_frontend", + "EventCode": "0x1a0", + "BriefDescription": "Dispatch slots in each cycle that were empty because the frontend did not supply ops.", + "UMask": "0x01" + }, + { + "EventName": "de_no_dispatch_per_slot.backend_stalls", + "EventCode": "0x1a0", + "BriefDescription": "Dispatch slots in each cycle that were unused because of backend stalls.", + "UMask": "0x1e" + }, + { + "EventName": "de_no_dispatch_per_slot.smt_contention", + "EventCode": "0x1a0", + "BriefDescription": "Dispatch slots in each cycle that were unused because the dispatch cycle was granted to the other SMT thread.", + "UMask": "0x60" + }, + { + "EventName": "de_additional_resource_stalls.dispatch_stalls", + "EventCode": "0x1a2", + "BriefDescription": "Counts additional cycles where dispatch is stalled due to a lack of dispatch resources.", + "UMask": "0x30" + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen6/execution.json b/lib/libpmc/pmu-events/arch/x86/amdzen6/execution.json new file mode 100644 index 000000000000..1b80acc89b6f --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen6/execution.json @@ -0,0 +1,192 @@ +[ + { + "EventName": "ex_ret_instr", + "EventCode": "0xc0", + "BriefDescription": "Retired instructions." + }, + { + "EventName": "ex_ret_ops", + "EventCode": "0xc1", + "BriefDescription": "Retired macro-ops." + }, + { + "EventName": "ex_ret_brn", + "EventCode": "0xc2", + "BriefDescription": "Retired branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_misp", + "EventCode": "0xc3", + "BriefDescription": "Retired branch instructions that were mispredicted." + }, + { + "EventName": "ex_ret_brn_tkn", + "EventCode": "0xc4", + "BriefDescription": "Retired taken branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_tkn_misp", + "EventCode": "0xc5", + "BriefDescription": "Retired taken branch instructions that were mispredicted." + }, + { + "EventName": "ex_ret_brn_far", + "EventCode": "0xc6", + "BriefDescription": "Retired far control transfers (far call, far jump, far return, IRET, SYSCALL and SYSRET, plus exceptions and interrupts). Far control transfers are not subject to branch prediction." + }, + { + "EventName": "ex_ret_near_ret", + "EventCode": "0xc8", + "BriefDescription": "Retired near returns (RET or RET Iw)." + }, + { + "EventName": "ex_ret_near_ret_mispred", + "EventCode": "0xc9", + "BriefDescription": "Retired near returns that were mispredicted. Each misprediction incurs the same penalty as that of a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_brn_ind_misp", + "EventCode": "0xca", + "BriefDescription": "Retired indirect branch instructions that were mispredicted (only EX mispredicts). Each misprediction incurs the same penalty as that of a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_brn_ind", + "EventCode": "0xcc", + "BriefDescription": "Retired indirect branch instructions." + }, + { + "EventName": "ex_ret_brn_cond", + "EventCode": "0xd1", + "BriefDescription": "Retired conditional branch instructions." + }, + { + "EventName": "ex_div_busy", + "EventCode": "0xd3", + "BriefDescription": "Cycles where the divider is busy." + }, + { + "EventName": "ex_div_count", + "EventCode": "0xd4", + "BriefDescription": "Divide ops executed." + }, + { + "EventName": "ex_no_retire.empty", + "EventCode": "0xd6", + "BriefDescription": "Cycles where the thread does not retire any ops due to a lack of valid ops in the retire queue (may be caused by front-end bottlenecks or pipeline redirects).", + "UMask": "0x01" + }, + { + "EventName": "ex_no_retire.not_complete", + "EventCode": "0xd6", + "BriefDescription": "Cycles where the thread does not retire any ops as the oldest retire slot is waiting to be marked as completed.", + "UMask": "0x02" + }, + { + "EventName": "ex_no_retire.other", + "EventCode": "0xd6", + "BriefDescription": "Cycles where the thread does not retire any ops due to other reasons (retire breaks, traps, faults, etc.).", + "UMask": "0x08" + }, + { + "EventName": "ex_no_retire.thread_not_selected", + "EventCode": "0xd6", + "BriefDescription": "Cycles where the thread does not retire any ops as thread arbitration did not select the current thread.", + "UMask": "0x10" + }, + { + "EventName": "ex_no_retire.load_not_complete", + "EventCode": "0xd6", + "BriefDescription": "Cycles where the thread does not retire any ops due to missing load completion.", + "UMask": "0xa2" + }, + { + "EventName": "ex_ret_ucode_instr", + "EventCode": "0x1c1", + "BriefDescription": "Retired microcoded instructions." + }, + { + "EventName": "ex_ret_ucode_ops", + "EventCode": "0x1c2", + "BriefDescription": "Retired microcode ops." + }, + { + "EventName": "ex_ret_brn_cond_misp", + "EventCode": "0x1c7", + "BriefDescription": "Retired conditional branch instructions that were mispredicted due to direction mismatch." + }, + { + "EventName": "ex_ret_brn_uncond_ind_near_misp", + "EventCode": "0x1c8", + "BriefDescription": "Retired unconditional indirect near branch instructions that were mispredicted." + }, + { + "EventName": "ex_ret_brn_uncond", + "EventCode": "0x1c9", + "BriefDescription": "Retired unconditional branch instructions." + }, + { + "EventName": "ex_tagged_ibs_ops.tagged", + "EventCode": "0x1cf", + "BriefDescription": "Execution IBS tagged ops.", + "UMask": "0x01" + }, + { + "EventName": "ex_tagged_ibs_ops.tagged_ret", + "EventCode": "0x1cf", + "BriefDescription": "Execution IBS tagged ops that retired.", + "UMask": "0x02" + }, + { + "EventName": "ex_tagged_ibs_ops.rollovers", + "EventCode": "0x1cf", + "BriefDescription": "Execution IBS periodic counter rollovers due to a previous tagged op not being IBS complete.", + "UMask": "0x04" + }, + { + "EventName": "ex_tagged_ibs_ops.filtered", + "EventCode": "0x1cf", + "BriefDescription": "Execution IBS tagged ops that retired but were discarded due to IBS filtering.", + "UMask": "0x08" + }, + { + "EventName": "ex_tagged_ibs_ops.valid", + "EventCode": "0x1cf", + "BriefDescription": "Execution IBS tagged ops that resulted in a valid sample and an IBS interrupt.", + "UMask": "0x10" + }, + { + "EventName": "ex_ret_fused_instr", + "EventCode": "0x1d0", + "BriefDescription": "Retired fused instructions." + }, + { + "EventName": "ex_mprof_ibs_ops.tagged", + "EventCode": "0x2c0", + "BriefDescription": "Memory Profiler IBS tagged ops.", + "UMask": "0x01" + }, + { + "EventName": "ex_mprof_ibs_ops.tagged_ret", + "EventCode": "0x2c0", + "BriefDescription": "Memory Profiler IBS tagged ops that retired.", + "UMask": "0x02" + }, + { + "EventName": "ex_mprof_ibs_ops.rollovers", + "EventCode": "0x2c0", + "BriefDescription": "Memory Profiler IBS periodic counter rollovers due to a previous tagged op not being IBS complete.", + "UMask": "0x04" + }, + { + "EventName": "ex_mprof_ibs_ops.filtered", + "EventCode": "0x2c0", + "BriefDescription": "Memory Profiler IBS tagged ops that retired but were discarded due to IBS filtering.", + "UMask": "0x08" + }, + { + "EventName": "ex_mprof_ibs_ops.valid", + "EventCode": "0x2c0", + "BriefDescription": "Memory Profiler IBS tagged ops that resulted in a valid sample and an IBS interrupt.", + "UMask": "0x10" + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen6/floating-point.json b/lib/libpmc/pmu-events/arch/x86/amdzen6/floating-point.json new file mode 100644 index 000000000000..03cb039434de --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen6/floating-point.json @@ -0,0 +1,1106 @@ +[ + { + "EventName": "fp_ret_x87_fp_ops.add_sub_ops", + "EventCode": "0x02", + "BriefDescription": "Retired x87 floating-point add and subtract uops.", + "UMask": "0x01" + }, + { + "EventName": "fp_ret_x87_fp_ops.mul_ops", + "EventCode": "0x02", + "BriefDescription": "Retired x87 floating-point multiply uops.", + "UMask": "0x02" + }, + { + "EventName": "fp_ret_x87_fp_ops.div_sqrt_ops", + "EventCode": "0x02", + "BriefDescription": "Retired x87 floating-point divide and square root uops.", + "UMask": "0x04" + }, + { + "EventName": "fp_ret_x87_fp_ops.all", + "EventCode": "0x02", + "BriefDescription": "Retired x87 floating-point uops of all types.", + "UMask": "0x07" + }, + { + "EventName": "fp_ret_sse_avx_ops.add_sub_flops", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX add and subtract FLOPs.", + "UMask": "0x01" + }, + { + "EventName": "fp_ret_sse_avx_ops.mult_flops", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX multiply FLOPs.", + "UMask": "0x02" + }, + { + "EventName": "fp_ret_sse_avx_ops.div_flops", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX divide and square root FLOPs.", + "UMask": "0x04" + }, + { + "EventName": "fp_ret_sse_avx_ops.mac_flops", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX multiply-accumulate FLOPs (each operation is counted as 2 FLOPs, bfloat operations are not included).", + "UMask": "0x08" + }, + { + "EventName": "fp_ret_sse_avx_ops.bfloat16_flops", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX bfloat16 FLOPs.", + "UMask": "0x20" + }, + { + "EventName": "fp_ret_sse_avx_ops.scalar_single_flops", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX scalar single-precision (FP32) FLOPs.", + "UMask": "0x40" + }, + { + "EventName": "fp_ret_sse_avx_ops.packed_single_flops", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX packed single-precision (FP32) FLOPs.", + "UMask": "0x60" + }, + { + "EventName": "fp_ret_sse_avx_ops.scalar_double_flops", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX scalar double-precision (FP64) FLOPs.", + "UMask": "0x80" + }, + { + "EventName": "fp_ret_sse_avx_ops.packed_double_flops", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX packed double-precision (FP64) FLOPs.", + "UMask": "0xa0" + }, + { + "EventName": "fp_ret_sse_avx_ops.scalar_half_flops", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX scalar half-precision (FP16) FLOPs.", + "UMask": "0xa0" + }, + { + "EventName": "fp_ret_sse_avx_ops.packed_half_flops", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX packed half-precision (FP16) FLOPs.", + "UMask": "0xa0" + }, + { + "EventName": "fp_ret_sse_avx_ops.all", + "EventCode": "0x03", + "BriefDescription": "Retired SSE and AVX FLOPs of all types.", + "UMask": "0x0f" + }, + { + "EventName": "fp_ops_ret_by_width.x87", + "EventCode": "0x08", + "BriefDescription": "Retired x87 floating-point uops.", + "UMask": "0x01" + }, + { + "EventName": "fp_ops_ret_by_width.mmx", + "EventCode": "0x08", + "BriefDescription": "Retired MMX floating-point uops.", + "UMask": "0x02" + }, + { + "EventName": "fp_ops_ret_by_width.scalar", + "EventCode": "0x08", + "BriefDescription": "Retired scalar floating-point uops.", + "UMask": "0x04" + }, + { + "EventName": "fp_ops_ret_by_width.pack_128", + "EventCode": "0x08", + "BriefDescription": "Retired packed 128-bit floating-point uops.", + "UMask": "0x08" + }, + { + "EventName": "fp_ops_ret_by_width.pack_256", + "EventCode": "0x08", + "BriefDescription": "Retired packed 256-bit floating-point uops.", + "UMask": "0x10" + }, + { + "EventName": "fp_ops_ret_by_width.pack_512", + "EventCode": "0x08", + "BriefDescription": "Retired packed 512-bit floating-point uops.", + "UMask": "0x20" + }, + { + "EventName": "fp_ops_ret_by_width.all", + "EventCode": "0x08", + "BriefDescription": "Retired floating-point uops of all widths.", + "UMask": "0x3f" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_add", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point add uops.", + "UMask": "0x01" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_sub", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point subtract uops.", + "UMask": "0x02" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_mul", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point multiply uops.", + "UMask": "0x03" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_mac", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point multiply-accumulate uops.", + "UMask": "0x04" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_div", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point divide uops.", + "UMask": "0x05" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_sqrt", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point square root uops.", + "UMask": "0x06" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_cmp", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point compare uops.", + "UMask": "0x07" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_cvt", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point convert uops.", + "UMask": "0x08" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_blend", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point blend uops.", + "UMask": "0x09" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_move", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point move uops.", + "UMask": "0x0a" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_shuffle", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point shuffle uops (may include instructions not necessarily thought of as including shuffles e.g. horizontal add, dot product, and certain MOV instructions).", + "UMask": "0x0b" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_bfloat", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point bfloat uops.", + "UMask": "0x0c" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_logical", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point move uops.", + "UMask": "0x0d" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_other", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point uops of other types.", + "UMask": "0x0e" + }, + { + "EventName": "fp_ops_ret_by_type.scalar_all", + "EventCode": "0x0a", + "BriefDescription": "Retired scalar floating-point uops of all types.", + "UMask": "0x0f" + }, + { + "EventName": "fp_ops_ret_by_type.vector_add", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point add uops.", + "UMask": "0x10" + }, + { + "EventName": "fp_ops_ret_by_type.vector_sub", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point subtract uops.", + "UMask": "0x20" + }, + { + "EventName": "fp_ops_ret_by_type.vector_mul", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point multiply uops.", + "UMask": "0x30" + }, + { + "EventName": "fp_ops_ret_by_type.vector_mac", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point multiply-accumulate uops.", + "UMask": "0x40" + }, + { + "EventName": "fp_ops_ret_by_type.vector_div", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point divide uops.", + "UMask": "0x50" + }, + { + "EventName": "fp_ops_ret_by_type.vector_sqrt", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point square root uops.", + "UMask": "0x60" + }, + { + "EventName": "fp_ops_ret_by_type.vector_cmp", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point compare uops.", + "UMask": "0x70" + }, + { + "EventName": "fp_ops_ret_by_type.vector_cvt", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point convert uops.", + "UMask": "0x80" + }, + { + "EventName": "fp_ops_ret_by_type.vector_blend", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point blend uops.", + "UMask": "0x90" + }, + { + "EventName": "fp_ops_ret_by_type.vector_move", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point move uops.", + "UMask": "0xa0" + }, + { + "EventName": "fp_ops_ret_by_type.vector_shuffle", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point shuffle uops (may include instructions not necessarily thought of as including shuffles e.g. horizontal add, dot product, and certain MOV instructions).", + "UMask": "0xb0" + }, + { + "EventName": "fp_ops_ret_by_type.vector_bfloat", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point bfloat uops.", + "UMask": "0xc0" + }, + { + "EventName": "fp_ops_ret_by_type.vector_logical", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point logical uops.", + "UMask": "0xd0" + }, + { + "EventName": "fp_ops_ret_by_type.vector_other", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point uops of other types.", + "UMask": "0xe0" + }, + { + "EventName": "fp_ops_ret_by_type.vector_all", + "EventCode": "0x0a", + "BriefDescription": "Retired vector floating-point uops of all types.", + "UMask": "0xf0" + }, + { + "EventName": "fp_ops_ret_by_type.all", + "EventCode": "0x0a", + "BriefDescription": "Retired floating-point uops of all types.", + "UMask": "0xff" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_add", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer add uops.", + "UMask": "0x01" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_sub", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer subtract uops.", + "UMask": "0x02" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_mul", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer multiply uops.", + "UMask": "0x03" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_mac", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer multiply-accumulate uops.", + "UMask": "0x04" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_aes", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer AES uops.", + "UMask": "0x05" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_sha", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer SHA uops.", + "UMask": "0x06" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_cmp", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer compare uops.", + "UMask": "0x07" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_cvt", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer convert or pack uops.", + "UMask": "0x08" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_shift", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer shift or rotate uops.", + "UMask": "0x09" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_mov", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer move uops.", + "UMask": "0x0a" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_shuffle", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer shuffle uops (may include instructions not necessarily thought of as including shuffles e.g. horizontal add, dot product, and certain MOV instructions).", + "UMask": "0x0b" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_vnni", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer VNNI uops.", + "UMask": "0x0c" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_logical", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer logical uops.", + "UMask": "0x0d" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_other", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer multiply uops of other types.", + "UMask": "0x0e" + }, + { + "EventName": "fp_sse_avx_ops_ret.mmx_all", + "EventCode": "0x0b", + "BriefDescription": "Retired MMX integer uops of all types.", + "UMask": "0x0f" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_add", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer add uops.", + "UMask": "0x10" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_sub", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer subtract uops.", + "UMask": "0x20" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_mul", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer multiply uops.", + "UMask": "0x30" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_mac", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer multiply-accumulate uops.", + "UMask": "0x40" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_aes", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer AES uops.", + "UMask": "0x50" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_sha", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer SHA uops.", + "UMask": "0x60" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_cmp", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer compare uops.", + "UMask": "0x70" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_cvt", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer convert or pack uops.", + "UMask": "0x80" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_shift", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer shift or rotate uops.", + "UMask": "0x90" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_mov", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer move uops.", + "UMask": "0xa0" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_shuffle", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer shuffle uops (may include instructions not necessarily thought of as including shuffles e.g. horizontal add, dot product, and certain MOV instructions).", + "UMask": "0xb0" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_vnni", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer VNNI uops.", + "UMask": "0xc0" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_logical", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer logical uops.", + "UMask": "0xd0" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_other", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer uops of other types.", + "UMask": "0xe0" + }, + { + "EventName": "fp_sse_avx_ops_ret.sse_avx_all", + "EventCode": "0x0b", + "BriefDescription": "Retired SSE and AVX integer uops of all types.", + "UMask": "0xf0" + }, + { + "EventName": "fp_sse_avx_ops_ret.all", *** 2338 LINES SKIPPED *** From nobody Fri Feb 27 22:08:45 2026 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 4fN2Xg5wtGz6TPwm for ; Fri, 27 Feb 2026 22:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fN2Xg1DhSz3llc for ; Fri, 27 Feb 2026 22:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772230131; 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=hlCOIGhuG1XGKutVgxVT68aBhwyKDc6ajwdM1tw57gw=; b=yXGG39cxmqKTsy6KD3kxRpWgKSbVRfIb3lZTQpbNiiQYmnDkHxiSCO4ZoGyOlPCq/KWYgT 9/0dIuV7CMW8xuu+inYW6ElNdC8FaGX/uTRpmQWaaooLQMYp5/+eM6eLP/hZcLW0QnZjay /hibVTOhAc1jEvexsOmVi3tNEi2Nsdg/rQhFLdGAS25y5ycxS6N5u5WZCEs6RLeAfrH8JV MgzaiGv0nDLrtBKIGwWGYh7PvmY3TaDYOoihib13n59XRGKEP6MfKfCP7/F5nq2eoStQeS 3qSst0zMkczSwl3tjRH6UdJtHIgg7I8maBL05VjVygkrclDedX/C/1q4raYnkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772230131; a=rsa-sha256; cv=none; b=PteHiVN6EhgclskIFwYGTHLpeStdjwjNSb/uvsOdjQ9UzIYw511opD9Zlx5h/FwtNRvAwp N7mdjfp7kibQtsZaTHLxJMP6WvDal3rg1bdfDGD2o7lzJygV7vsDHW8VA+kD4f8jqerqCE MbisZOvHri0a7RV+LXsFjFo0tQVjDVrvJtMjv8tV+vY/6eb0tItofAcgSi87U0A8BvscI1 4t2p6AyUIUrcAy7C4tOyOC3x/SpvEfXLeT1A8dt4jc5vfkH5cXRzKYNwQDGDftSnjnSZY0 fiRmcWZCZ3dGrcQlnPcMYvuKbFcVR2z1T+XT1HYgKxawgINMBZReKgnPGPFNUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772230131; 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=hlCOIGhuG1XGKutVgxVT68aBhwyKDc6ajwdM1tw57gw=; b=FKR2+THnb5u2l6OVKwtOLGpwiMUfWe+wUNeImkCy+j5GCQ+EMrSgekAMbl6Vy2KzuxYipt 1cfrT1Zg4guAmHsCWX2ACaMCnVYUiro5OHSHZA0aF0UjLlbj9aMBcXi88tz6lsFk5mPozB 2iFnpq9Udz6Vm0/0AoLdP+sQzCrPQCsj9/+o5klQKHO9wW3xElCMU4HWFd4YO79C4Ul8IA ndvNT38AjVeM7eqXg0fQI7sf3UYhmcNZ6QcK6zzmkhNmtCpYGCZEgmei15A0FjUr/ztgLX h2fNf5DdH5XG+rBRjqB0fQic+C78wrRiLz5UaIQ5QaJER2GTY2Asqbl7Oy1drw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fN2Xg0lpvzcTC for ; Fri, 27 Feb 2026 22:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 342b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 22:08:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ali Mashtizadeh From: Warner Losh Subject: git: 00c0a1f0bf6c - main - hwpmc: Fix PMC flags for AMD Zen cores 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: 00c0a1f0bf6c07e63384a389060dfc10924c0ed6 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 22:08:45 +0000 Message-Id: <69a215ed.342b2.2e815130@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=00c0a1f0bf6c07e63384a389060dfc10924c0ed6 commit 00c0a1f0bf6c07e63384a389060dfc10924c0ed6 Author: Ali Mashtizadeh AuthorDate: 2026-02-21 19:07:26 +0000 Commit: Warner Losh CommitDate: 2026-02-27 21:19:40 +0000 hwpmc: Fix PMC flags for AMD Zen cores The PMC flags available for DF and L3 counters were not all implemented. More importantly, the field encodings for the L3 counters changed in an incompatible way between Family 17h and Family 19h. Similarly, the field encodings for the DF coutners changed between Family 19h and 1Ah. I also added the precise retire flag for the 3rd core counter. Lastly, I added a warning in the jevent parser because ignoring the unknown fields results in counters incorrectly programmed. We should not just ignore that. Sponsored by: Netflix Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2040 --- lib/libpmc/libpmc_pmu_util.c | 71 ++++++++++++++++++++++++++++--- lib/libpmc/pmu-events/jevents.c | 40 +++++++++++++++++- lib/libpmc/pmu-events/json.c | 14 +++++++ lib/libpmc/pmu-events/json.h | 1 + sys/dev/hwpmc/hwpmc_amd.c | 19 ++++++++- sys/dev/hwpmc/hwpmc_amd.h | 93 +++++++++++++++++++++++++++++------------ 6 files changed, 204 insertions(+), 34 deletions(-) diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index de642aa71a18..0832ab32e2f1 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -121,6 +121,24 @@ pmu_events_mfr(void) return (mfr); } +static int +pmu_events_x86_family(void) +{ + char buf[PMC_CPUID_LEN]; + size_t s = sizeof(buf); + char *cpuid, *family; + + if (sysctlbyname("kern.hwpmc.cpuid", buf, &s, + (void *)NULL, 0) == -1) + return (-1); + cpuid = &buf[0]; + + strsep(&cpuid, "-"); + family = strsep(&cpuid, "-"); + + return (strtol(family, NULL, 10)); +} + /* * The Intel fixed mode counters are: * "inst_retired.any", @@ -208,6 +226,10 @@ struct pmu_event_desc { uint64_t ped_offcore_rsp; uint64_t ped_l3_thread; uint64_t ped_l3_slice; + uint32_t ped_sourceid; + uint32_t ped_coreid; + uint32_t ped_allsources; + uint32_t ped_allcores; uint32_t ped_event; uint32_t ped_frontend; uint32_t ped_ldlat; @@ -347,6 +369,14 @@ pmu_parse_event(struct pmu_event_desc *ped, const char *eventin) ped->ped_l3_thread = strtol(value, NULL, 16); else if (strcmp(key, "l3_slice_mask") == 0) ped->ped_l3_slice = strtol(value, NULL, 16); + else if (strcmp(key, "sourceid") == 0) + ped->ped_sourceid = strtol(value, NULL, 16); + else if (strcmp(key, "coreid") == 0) + ped->ped_coreid = strtol(value, NULL, 16); + else if (strcmp(key, "allcores") == 0) + ped->ped_allcores = strtol(value, NULL, 10); + else if (strcmp(key, "allsources") == 0) + ped->ped_allsources = strtol(value, NULL, 10); else { debug = getenv("PMUDEBUG"); if (debug != NULL && strcmp(debug, "true") == 0 && value != NULL) @@ -486,20 +516,23 @@ static int pmc_pmu_amd_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, struct pmu_event_desc *ped) { + int cpu_family; struct pmc_md_amd_op_pmcallocate *amd; const struct pmu_event *pe; int idx = -1; + cpu_family = pmu_events_x86_family(); + amd = &pm->pm_md.pm_amd; if (ped->ped_umask > 0) { pm->pm_caps |= PMC_CAP_QUALIFIER; - amd->pm_amd_config |= AMD_PMC_TO_UNITMASK(ped->ped_umask); } pm->pm_class = PMC_CLASS_K8; pe = pmu_event_get(NULL, event_name, &idx); if (pe->pmu == NULL) { amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK(ped->ped_event); + amd->pm_amd_config |= AMD_PMC_TO_UNITMASK(ped->ped_umask); amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_CORE; if ((pm->pm_caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == 0 || (pm->pm_caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == @@ -515,14 +548,42 @@ pmc_pmu_amd_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, amd->pm_amd_config |= AMD_PMC_INVERT; if (pm->pm_caps & PMC_CAP_INTERRUPT) amd->pm_amd_config |= AMD_PMC_INT; + if (pm->pm_caps & PMC_CAP_PRECISE) + amd->pm_amd_config |= AMD_PMC_PRECISERETIRE; } else if (strcmp("amd_l3", pe->pmu) == 0) { - amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK(ped->ped_event); + amd->pm_amd_config |= AMD_PMC_L3_TO_EVENTMASK(ped->ped_event); + amd->pm_amd_config |= AMD_PMC_L3_TO_UNITMASK(ped->ped_umask); amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_L3_CACHE; - amd->pm_amd_config |= AMD_PMC_TO_L3SLICE(ped->ped_l3_slice); - amd->pm_amd_config |= AMD_PMC_TO_L3CORE(ped->ped_l3_thread); + if (cpu_family <= 0x17) { + amd->pm_amd_config |= + AMD_PMC_L31_TO_SLICE(ped->ped_l3_slice); + amd->pm_amd_config |= + AMD_PMC_L31_TO_CORE(ped->ped_l3_thread); + } else { + amd->pm_amd_config |= + AMD_PMC_L32_TO_THREAD(ped->ped_l3_thread); + amd->pm_amd_config |= + AMD_PMC_L32_TO_SOURCEID(ped->ped_sourceid); + amd->pm_amd_config |= + AMD_PMC_L32_TO_COREID(ped->ped_coreid); + if (ped->ped_allcores) + amd->pm_amd_config |= AMD_PMC_L32_ALLCORES; + if (ped->ped_allsources) + amd->pm_amd_config |= AMD_PMC_L32_ALLSOURCES; + } } else if (strcmp("amd_df", pe->pmu) == 0) { - amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK_DF(ped->ped_event); amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_DATA_FABRIC; + if (cpu_family <= 19) { + amd->pm_amd_config |= + AMD_PMC_DF1_TO_EVENTMASK(ped->ped_event); + amd->pm_amd_config |= + AMD_PMC_DF1_TO_UNITMASK(ped->ped_umask); + } else { + amd->pm_amd_config |= + AMD_PMC_DF2_TO_EVENTMASK(ped->ped_event); + amd->pm_amd_config |= + AMD_PMC_DF2_TO_UNITMASK(ped->ped_umask); + } } else { printf("PMC pmu '%s' is not supported!\n", pe->pmu); return (EOPNOTSUPP); diff --git a/lib/libpmc/pmu-events/jevents.c b/lib/libpmc/pmu-events/jevents.c index 628ed26c6f9d..4e4f53a0c0d0 100644 --- a/lib/libpmc/pmu-events/jevents.c +++ b/lib/libpmc/pmu-events/jevents.c @@ -560,6 +560,10 @@ static int json_events(const char *fn, jsmntok_t *obj = tok++; bool configcode_present = false; char *umask = NULL; + char *allcores = NULL; + char *allslices = NULL; + char *sliceid = NULL; + char *threadmask = NULL; char *cmask = NULL; char *inv = NULL; char *any = NULL; @@ -585,6 +589,22 @@ static int json_events(const char *fn, /* match_field */ if (json_streq(map, field, "UMask") && nz) { addfield(map, &umask, "", "umask=", val); + } else if (json_streq(map, field, "EnAllCores") && nz) { + addfield(map, &allcores, "", "allcores=", val); + } else if (json_streq(map, field, "EnAllSlices") && nz) { + addfield(map, &allslices, "", "allslices=", val); + } else if (json_streq(map, field, "SliceId") && nz) { + /* + * We use sourceid because there's a + * descripency where the JSON from linux calls + * it a SliceId, which is not the name used by + * AMD in the PPRs. The field name from Family + * 19h and below that calls it slicemask see + * the references in hwpmc_amd.h. + */ + addfield(map, &sliceid, "", "sourceid=", val); + } else if (json_streq(map, field, "ThreadMask") && nz) { + addfield(map, &threadmask, "", "l3_thread_mask=", val); } else if (json_streq(map, field, "CounterMask") && nz) { addfield(map, &cmask, "", "cmask=", val); } else if (json_streq(map, field, "Invert") && nz) { @@ -675,8 +695,14 @@ static int json_events(const char *fn, addfield(map, &arch_std, "", "", val); for (s = arch_std; *s; s++) *s = tolower(*s); + } else { + /* + * We shouldn't ignore unknown fields that + * makes the counter invalid! + */ + json_copystr(map, field, buf, sizeof(buf)); + fprintf(stderr, "Unknown field '%s'!\n", buf); } - /* ignore unknown fields */ } if (precise && je.desc && !strstr(je.desc, "(Precise Event)")) { if (json_streq(map, precise, "2")) @@ -707,6 +733,14 @@ static int json_events(const char *fn, addfield(map, &event, ",", period, NULL); if (umask) addfield(map, &event, ",", umask, NULL); + if (allcores) + addfield(map, &event, ",", allcores, NULL); + if (allslices) + addfield(map, &event, ",", allslices, NULL); + if (sliceid) + addfield(map, &event, ",", sliceid, NULL); + if (threadmask) + addfield(map, &event, ",", threadmask, NULL); if (je.desc && extra_desc) addfield(map, &je.desc, " ", extra_desc, NULL); @@ -737,6 +771,10 @@ static int json_events(const char *fn, err = func(data, &je); free_strings: free(umask); + free(allcores); + free(allslices); + free(sliceid); + free(threadmask); free(cmask); free(inv); free(any); diff --git a/lib/libpmc/pmu-events/json.c b/lib/libpmc/pmu-events/json.c index 89cafbc04fb6..66eaf0a74ba6 100644 --- a/lib/libpmc/pmu-events/json.c +++ b/lib/libpmc/pmu-events/json.c @@ -160,3 +160,17 @@ int json_streq(char *map, jsmntok_t *t, const char *s) unsigned len = json_len(t); return len == strlen(s) && !strncasecmp(map + t->start, s, len); } + +int json_copystr(char *map, jsmntok_t *t, char *s, int len) +{ + int jlen; + + jlen = json_len(t); + if (jlen > len) + jlen = len - 1; + + memcpy(s, map + t->start, jlen); + s[jlen] = '\0'; + + return (jlen); +} diff --git a/lib/libpmc/pmu-events/json.h b/lib/libpmc/pmu-events/json.h index 278ebd32cfb6..89b9c2fba617 100644 --- a/lib/libpmc/pmu-events/json.h +++ b/lib/libpmc/pmu-events/json.h @@ -9,6 +9,7 @@ int json_line(char *map, jsmntok_t *t); const char *json_name(jsmntok_t *t); int json_streq(char *map, jsmntok_t *t, const char *s); int json_len(jsmntok_t *t); +int json_copystr(char *map, jsmntok_t *t, char *s, int len); extern int verbose; diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index 801b75b39595..b34cbffcffa8 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -347,6 +347,10 @@ amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, caps = pm->pm_caps; + if (((caps & PMC_CAP_PRECISE) != 0) && + ((pd->pd_caps & PMC_CAP_PRECISE) == 0)) + return (EINVAL); + PMCDBG2(MDP, ALL, 1,"amd-allocate ri=%d caps=0x%x", ri, caps); /* Validate sub-class. */ @@ -360,6 +364,9 @@ amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, return (0); } + /* + * Everything below this is for supporting older processors. + */ pe = a->pm_ev; /* map ev to the correct event mask code */ @@ -817,6 +824,14 @@ pmc_amd_initialize(void) "K8-%d", i); d->pm_descr.pd_class = PMC_CLASS_K8; d->pm_descr.pd_caps = AMD_PMC_CAPS; + /* + * Zen 5 can precisely count retire events. + * + * Refer to PPR Vol 1 for AMD Family 1Ah Model 02h C1 57238 + * Rev. 0.24 September 29, 2024. + */ + if ((family >= 0x1a) && (i == 2)) + d->pm_descr.pd_caps |= PMC_CAP_PRECISE; d->pm_descr.pd_width = 48; if ((amd_feature2 & AMDID2_PCXC) != 0) { d->pm_evsel = AMD_PMC_CORE_BASE + 2 * i; @@ -836,7 +851,7 @@ pmc_amd_initialize(void) snprintf(d->pm_descr.pd_name, PMC_NAME_MAX, "K8-L3-%d", i); d->pm_descr.pd_class = PMC_CLASS_K8; - d->pm_descr.pd_caps = AMD_PMC_CAPS; + d->pm_descr.pd_caps = AMD_PMC_L3_CAPS; d->pm_descr.pd_width = 48; d->pm_evsel = AMD_PMC_L3_BASE + 2 * i; d->pm_perfctr = AMD_PMC_L3_BASE + 2 * i + 1; @@ -852,7 +867,7 @@ pmc_amd_initialize(void) snprintf(d->pm_descr.pd_name, PMC_NAME_MAX, "K8-DF-%d", i); d->pm_descr.pd_class = PMC_CLASS_K8; - d->pm_descr.pd_caps = AMD_PMC_CAPS; + d->pm_descr.pd_caps = AMD_PMC_DF_CAPS; d->pm_descr.pd_width = 48; d->pm_evsel = AMD_PMC_DF_BASE + 2 * i; d->pm_perfctr = AMD_PMC_DF_BASE + 2 * i + 1; diff --git a/sys/dev/hwpmc/hwpmc_amd.h b/sys/dev/hwpmc/hwpmc_amd.h index be484a1111a2..6d8ab8203942 100644 --- a/sys/dev/hwpmc/hwpmc_amd.h +++ b/sys/dev/hwpmc/hwpmc_amd.h @@ -62,21 +62,10 @@ #define AMD_PMC_CORE_DEFAULT 6 #define AMD_PMC_CORE_MAX 16 -/* L3 */ -#define AMD_PMC_L3_BASE 0xC0010230 -#define AMD_PMC_L3_DEFAULT 6 -#define AMD_PMC_L3_MAX 6 - -/* DF */ -#define AMD_PMC_DF_BASE 0xC0010240 -#define AMD_PMC_DF_DEFAULT 4 -#define AMD_PMC_DF_MAX 64 - -#define AMD_NPMCS_K8 4 -#define AMD_NPMCS_MAX (AMD_PMC_CORE_MAX + AMD_PMC_L3_MAX + \ - AMD_PMC_DF_MAX) - #define AMD_PMC_COUNTERMASK 0xFF000000 +#define AMD_PMC_PRECISERETIRE (1ULL << 43) /* Only valid for PERF_CTL2 */ +#define AMD_PMC_HOST (1ULL << 41) +#define AMD_PMC_GUEST (1ULL << 40) #define AMD_PMC_TO_COUNTER(x) (((x) << 24) & AMD_PMC_COUNTERMASK) #define AMD_PMC_INVERT (1 << 23) #define AMD_PMC_ENABLE (1 << 22) @@ -85,24 +74,13 @@ #define AMD_PMC_EDGE (1 << 18) #define AMD_PMC_OS (1 << 17) #define AMD_PMC_USR (1 << 16) -#define AMD_PMC_L3SLICEMASK (0x000F000000000000) -#define AMD_PMC_L3COREMASK (0xFF00000000000000) -#define AMD_PMC_TO_L3SLICE(x) (((x) << 48) & AMD_PMC_L3SLICEMASK) -#define AMD_PMC_TO_L3CORE(x) (((x) << 56) & AMD_PMC_L3COREMASK) - -#define AMD_PMC_UNITMASK_M 0x10 -#define AMD_PMC_UNITMASK_O 0x08 -#define AMD_PMC_UNITMASK_E 0x04 -#define AMD_PMC_UNITMASK_S 0x02 -#define AMD_PMC_UNITMASK_I 0x01 -#define AMD_PMC_UNITMASK_MOESI 0x1F #define AMD_PMC_UNITMASK 0xFF00 #define AMD_PMC_EVENTMASK 0xF000000FF #define AMD_PMC_TO_UNITMASK(x) (((x) << 8) & AMD_PMC_UNITMASK) #define AMD_PMC_TO_EVENTMASK(x) (((x) & 0xFF) | (((uint64_t)(x) & 0xF00) << 24)) -#define AMD_PMC_TO_EVENTMASK_DF(x) (((x) & 0xFF) | (((uint64_t)(x) & 0x0F00) << 24)) | (((uint64_t)(x) & 0x3000) << 47) + #define AMD_VALID_BITS (AMD_PMC_COUNTERMASK | AMD_PMC_INVERT | \ AMD_PMC_ENABLE | AMD_PMC_INT | AMD_PMC_PC | AMD_PMC_EDGE | \ AMD_PMC_OS | AMD_PMC_USR | AMD_PMC_UNITMASK | AMD_PMC_EVENTMASK) @@ -111,6 +89,69 @@ PMC_CAP_SYSTEM | PMC_CAP_EDGE | PMC_CAP_THRESHOLD | \ PMC_CAP_READ | PMC_CAP_WRITE | PMC_CAP_INVERT | PMC_CAP_QUALIFIER) +/* L3 */ +#define AMD_PMC_L3_BASE 0xC0010230 +#define AMD_PMC_L3_DEFAULT 6 +#define AMD_PMC_L3_MAX 6 + +/* + * L3 counters change their encoding slightly between Family 17h and Family 19h + * processors. + * + * Refer to the following documents for the L3 fields: + * PPR for AMD Family 17h Model 20h A1 55772-A1 Rev. 3.08 April 14, 2021 + * PPR for AMD Family 19h Model 51h A1 56569-A1 Rev. 3.03 September 21, 2021 + * PPR for AMD Family 1Ah Model 02h C1 57238 Rev. 0.24 September 29, 2024 + */ +#define AMD_PMC_L31_SLICEMASK (0x000F000000000000ULL) +#define AMD_PMC_L31_COREMASK (0xFF00000000000000ULL) + +#define AMD_PMC_L31_TO_SLICE(x) (((uint64_t)(x) << 48) & AMD_PMC_L31_SLICEMASK) +#define AMD_PMC_L31_TO_CORE(x) (((uint64_t)(x) << 56) & AMD_PMC_L31_COREMASK) + +#define AMD_PMC_L32_THREADMASK (0x0F00000000000000ULL) +#define AMD_PMC_L32_SOURCEMASK (0x0007000000000000ULL) +#define AMD_PMC_L32_ALLCORES (1ULL << 47) +#define AMD_PMC_L32_ALLSOURCES (1ULL << 46) +#define AMD_PMC_L32_COREMASK (0x00001C0000000000ULL) + +#define AMD_PMC_L32_TO_THREAD(x) (((uint64_t)(x) << 56) & AMD_PMC_L32_THREADMASK) +#define AMD_PMC_L32_TO_SOURCEID(x) (((uint64_t)(x) << 48) & AMD_PMC_L32_SOURCEMASK) +#define AMD_PMC_L32_TO_COREID(x) (((uint64_t)(x) << 42) & AMD_PMC_L32_COREMASK) + +#define AMD_PMC_L3_TO_UNITMASK(x) (((x) << 8) & AMD_PMC_UNITMASK) +#define AMD_PMC_L3_TO_EVENTMASK(x) ((x) & 0xFF) + +#define AMD_PMC_L3_CAPS (PMC_CAP_READ | PMC_CAP_WRITE | \ + PMC_CAP_QUALIFIER | PMC_CAP_DOMWIDE) + +/* DF */ +#define AMD_PMC_DF_BASE 0xC0010240 +#define AMD_PMC_DF_DEFAULT 4 +#define AMD_PMC_DF_MAX 64 + +#define AMD_PMC_DF_CAPS (PMC_CAP_READ | PMC_CAP_WRITE | \ + PMC_CAP_QUALIFIER | PMC_CAP_DOMWIDE) + +/* + * DF counters change their encoding between Family 19h and Family 1Ah + * processors. + * + * Refer to the same documents as the L3 counters. + */ +#define AMD_PMC_DF1_TO_EVENTMASK(x) (((x) & 0xFF) | \ + (((uint64_t)(x) & 0x0F00) << 24) | (((uint64_t)(x) & 0x3000) << 47)) +#define AMD_PMC_DF1_TO_UNITMASK(x) (((x) & 0xFF) << 8) + +#define AMD_PMC_DF2_TO_EVENTMASK(x) (((x) & 0xFF) | \ + (((uint64_t)(x) & 0x7F00) << 24)) +#define AMD_PMC_DF2_TO_UNITMASK(x) ((((x) & 0xFF) << 8) | \ + (((uint64_t)(x) & 0x0F00) << 16)) + +#define AMD_NPMCS_K8 4 +#define AMD_NPMCS_MAX (AMD_PMC_CORE_MAX + AMD_PMC_L3_MAX + \ + AMD_PMC_DF_MAX) + #define AMD_PMC_IS_STOPPED(evsel) ((rdmsr((evsel)) & AMD_PMC_ENABLE) == 0) #define AMD_PMC_HAS_OVERFLOWED(pmc) ((rdpmc(pmc) & (1ULL << 47)) == 0) From nobody Sat Feb 28 01:44:45 2026 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 4fN7Ks61Kvz6TpqQ; Sat, 28 Feb 2026 01:44:49 +0000 (UTC) (envelope-from glebius@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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fN7Ks5T9pz3BqL; Sat, 28 Feb 2026 01:44:49 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772243089; 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=pawD+ZI0lcu/MNedTwjxFA4gA/OseMJ1aNyPOs3j1do=; b=oFfhtF5jZ+OAhLMaio4L1Gbgp40LYR9tYNHmcADE8IkHjb5A2lsXs+cLs37Jw4Y45HFmgx j8yx3vhJLhThsll57m9BpKOOxdu0oGu3KOgx/YXrBmkKfu/je6bXsONn4DgkF0saUJhMoT WglCEJpdUgguQhfD7dHhgtIVPJSHXsuXz2DOGdj0+18Mc0wHtHDl0aObFFSMHyPHzjTAzk apbY+ACoT9zZ0grbRmcO2SSLb3oOO5Sqt/fsSBhptEoqFHOkBHr1YtGDML34xb+NhMW+mg lPWtKS8cU0YcP3ZSFdoC9QwxrmNSe55yvtYlZR/oxIMUKj022ZXX26YaeSvnSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772243089; a=rsa-sha256; cv=none; b=n+wsFExVskRFHkBealDMTi3IcroYYMapsuGP4wc9CDu68UlRngdT2Igfse4iVwOgzcxt48 8lnFFo8PgnOS/IS7IFsNHm2PRWkWHcudKO1XYyCWKHZRVoqwRfRZPYRR7N/f6nk1vRb1bt 5cutwu3BRdlPlsJ3Po8zshZzUg3tIwuqM5Vb675rabFMmUPCj6BdcOdQX0P17xp0JI4OCw 9+2H/FufMImUolx4rc30WOjsEEnkCSVXGxQYmOkgmY+82zJ0RORMAfx0QozSRul5VIhtOv /Gv8wDdfMJf2vMxDZtRqIUp16l9v0KO8cGaAVDv6fQ1jvNq+FQLh3P5EqrzEog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772243089; 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=pawD+ZI0lcu/MNedTwjxFA4gA/OseMJ1aNyPOs3j1do=; b=KseI8jLUmtnDG5Se65nRtRkrxb2VQZjWooSD6bZNAjC72AMS/XRBwTmHFVJAR7AmEvqmXu SL7/2+iiNkTGEkINGhaxhCP+pME3xh7mFmhXSqRCul64spdyZII/CdbUDFdETaLObNVuMP wCq6tD4j+hUMitPncC3Mo/+r+5t9xbKc/gwhlflS0j9TtMQ/U1vzQ2M95TrODfXJ8e9yPQ KCst5+JnRc5P+aPU0InnoleQeWrcsne9DgHoy+oXgsMyj3B0P8Goo1ZQbPVHCk0fjg0IdB aIRs8gAeURI/DrkqvjfDDEi8tcE1i+3yXUsL6YUbRTPRtxXwz5+124gXZ+uJfg== 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 4fN7Ks0BghzZ9Q; Sat, 28 Feb 2026 01:44:48 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Fri, 27 Feb 2026 17:44:45 -0800 From: Gleb Smirnoff To: Michael Tuexen Cc: "Enji Cooper (yaneurabeya)" , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 454212b9718b - main - sctp: fix so_proto when peeling off a socket Message-ID: References: <699ef25d.42e41.7579887f@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-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Fri, Feb 27, 2026 at 08:11:39AM +0100, Michael Tuexen wrote: M> >> - so = sopeeloff(head); M> >> + so = sopeeloff(head, &sctp_stream_protosw); M> > M> > This part of the change broke LINT-NOINET because sctp_stream_protosw is only defined in the INET case. I didn’t dig into the SCTP syscalls too far, but I think that the right protocol needs to be picked per the address family, right? btw, I tried to move the function to sctp_syscalls.c and this required exposing soattach() and soalloc() outside. After weighting in and out decided to leave it the way it is. -- Gleb Smirnoff From nobody Sat Feb 28 06:50:21 2026 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 4fNG6T4rKFz6Sy4g; Sat, 28 Feb 2026 06:50:25 +0000 (UTC) (envelope-from tuexen@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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fNG6T269tz3jpX; Sat, 28 Feb 2026 06:50:25 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772261425; 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=PVLubbqJ+3+0hNiLwnR4Xsy8Hy7p/H0Z5rzaKdU+ap4=; b=pp2UM8sV2cKYYrj6Zw3NNyEhICQOtPSwKfO4bMpd455p40hY9uuu7bslSJbov6qyTpOmWO JSVU7nXC37SIT6Pl+5Amd/s1957/lzFs/1Yl1ezAe4kPt3OmG/hCyV4w0qSpOZ6axxGHkO k5i+peypbn3+FjRDQkKhrIuwS2OIszyJDjI89/w+yM/N6GDmCIgpn8cNTqLPNwig1pKlUJ Gi4InVZM976vzGpxlLcb9v9G0ujxo2zxgOFKeoEvPLygbN5l8HWY2vDGUfH3H82ls6X5Lh O1+M5DHSG1TO5jW1hy5Fc7r1q2g3dY/lX/Pa/TrpA3KITHbPIeHeChHiAE9k0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772261425; a=rsa-sha256; cv=none; b=EWiJDJvrDVg2l8fPaf+3xOBGIdC5HQgSgMdHI/RakjhjVisSHvkCZNXGz/PK85OUkYwTkO oiX+XcDBlCDjp89ek+oaseOA5B7rxve89y5GccN5kDv5dT+pzFXFtyAYEWYTF70tniSgsf mcK0rj2/yrrKrM8a6XG/3Zyf+VrxhFBGJ14Z3/sK3kvL88FyMCwOJRauyhjSYvKsPwMCAR k1jW0a531X7OaMMq8Inn3DfWYvlycUdQY1OLXcuvjgr+dxUwHm+z9NXkB4VL1+bkFsmMqO 6xwI49MG5yMtTQ3HiLXaLTDYL1bM0bjntX1GBhCsFmbKxQOgFy1Jvo5zGahG6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772261425; 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=PVLubbqJ+3+0hNiLwnR4Xsy8Hy7p/H0Z5rzaKdU+ap4=; b=obOHBMvFT28TdksryLUSpLmyDBFaHp74B16J5Ha0017lnSeyu2m/ru/Kvf6hyrcdZEDkSC VjLmUESLkSfL7xHUH8If3sw11AVwvztej4U1E8fAMP5J9TcTYIQEyGDUnaVT8VvlO/bkj1 VED4+xtzq7Y+isfZG+PF6sbpkM9KwE2A4nT9UN3QYpexiYsU4PFigTpjlqujNIwuX/gVw1 hyxbojA7FFINUti5EbNWDD5ZGEEYrALNmT7J6Id0MfXlVnCJLFU+Yy83DgOmgz/kWEKgdv kxTCEZm2blUgLiNE2Cfy+v+twPnmeX1xOVyDQEITDtKK3HuUIM2uVyghy+K4Cg== Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1101:be00:3cd2:796a:add9:aa81]) (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 4fNG6S3hdtzpQW; Sat, 28 Feb 2026 06:50:24 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) 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.400.21\)) Subject: Re: git: 454212b9718b - main - sctp: fix so_proto when peeling off a socket From: Michael Tuexen In-Reply-To: Date: Sat, 28 Feb 2026 07:50:21 +0100 Cc: "Enji Cooper (yaneurabeya)" , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <699ef25d.42e41.7579887f@gitrepo.freebsd.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.3864.400.21) > On 28. Feb 2026, at 02:44, Gleb Smirnoff wrote: >=20 > On Fri, Feb 27, 2026 at 08:11:39AM +0100, Michael Tuexen wrote: > M> >> - so =3D sopeeloff(head); > M> >> + so =3D sopeeloff(head, &sctp_stream_protosw); > M> >=20 > M> > This part of the change broke LINT-NOINET because = sctp_stream_protosw is only defined in the INET case. I didn=E2=80=99t = dig into the SCTP syscalls too far, but I think that the right protocol = needs to be picked per the address family, right? >=20 > btw, I tried to move the function to sctp_syscalls.c and this required = exposing > soattach() and soalloc() outside. After weighting in and out decided = to leave > it the way it is. I tried that also and came to the same conclusion. That is why I added = the parameter to sopeeloff(). Best regards Michael >=20 > --=20 > Gleb Smirnoff From nobody Sat Feb 28 10:03:17 2026 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 4fNLP11fQMz6TM9M for ; Sat, 28 Feb 2026 10:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fNLP10bLpz43pM for ; Sat, 28 Feb 2026 10:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772272997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQt3tvUIsjtSpmuqdo1iyrwdKNXPB8iVSOxu8pNAkWg=; b=gEqMYXOH10g+W7TakONcKHEb0v+JfW3dfmp06E8R3Ebnes/Bjk/SMWsl6q2m8hmVrC0SfB b0vQRh3pIaekHM4eyYCRlf1h58DKoeWx9h/dZGDE1JtHqvJo6y9ocdfpnkxcAJEDDkVF27 FPCjFpdruBG/7KQK5SUs/BEcd2pFNM94S/P5ed7GTOr5mtIhlMu6NTCwrG2veUQcCAM6W2 J6yuALygnpX7lUm96iaT7JcK/FuSlNPg128gg6RExmqSdgcPJ2Gq0H6hGlFDVySg3Npbau sozYWz0rJmKNInMMBbyQN5GlX0ffz/XMQ9ZrADV38ezfDyKSBrMz8al7EpzH8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772272997; a=rsa-sha256; cv=none; b=Cq4/O/kc2RmBOKXhlGfImVKGuoSJmHT6uIAFqLGXY4vzi5zM6aQL/gnj/p8JckxYZFd9yN hZPLCsG9LB2UqXwkrR5SJGbaSod2vPIhFQQrHWPHTzQEffCgiELG0Wp7mswFJdcng855sD RgOJvUiNo7AqHhoHDvfd8TQxAGPJNzjcwCMkosXeXREKxNhtCg3BJO6QmMTMQIjrSJ4MGR 4aMP2WBOli1LExJjj0zkaTAK/alRupKWhD8VwXzIsaxQWp38nGlP025plcHKST0tHDfTei kGkNqrkOn95QfLyJJUsWyPhVc6+Zijv0QxP73V4PmVj+VkAt9LVgu+oQu+S6yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772272997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQt3tvUIsjtSpmuqdo1iyrwdKNXPB8iVSOxu8pNAkWg=; b=TNqb8Ual8JXOZykiTrpxHFag/2uKUwA7nNc86VzTd81TzUH86lzjkzUXAedjI5D5Fr0UeQ rLQmWK6U9ddBAylqmJ0Ogv+wGIpEj7H3TxO2vESiurNavaXUfq/7J8LkazF34Kicg01PJv KKw1bn4vx56tTeFoiyn+8D+u972J2YI/EDujLPvSFdCw4ulXUzCY6IqxZcrPKxAEQUnnyd 62Jd1cIsHFWNdtESjVnwZNDk0ipQIWDAssD4stTL2aGO+Awcfa7MWPel/7WSX46yTse3wo W8pfSuOf8UJ/L727GMd7YvlJ8RrsC33JulfG5/FQ+ulA4/smrhYlkjSbiN2EUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fNLP109DZzydY for ; Sat, 28 Feb 2026 10:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31628 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 28 Feb 2026 10:03:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: d44d79e577ea - main - bsdinstall: remove ftp.at.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: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d44d79e577eab3e66b993c783b969b82678792d1 Auto-Submitted: auto-generated Date: Sat, 28 Feb 2026 10:03:17 +0000 Message-Id: <69a2bd65.31628.f92e8be@gitrepo.freebsd.org> The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=d44d79e577eab3e66b993c783b969b82678792d1 commit d44d79e577eab3e66b993c783b969b82678792d1 Author: Philip Paeps AuthorDate: 2026-02-28 09:56:23 +0000 Commit: Philip Paeps CommitDate: 2026-02-28 09:56:23 +0000 bsdinstall: remove ftp.at.freebsd.org After ~13 years of running the ftp.at.freebsd.org community mirror is shutting down at the end of March. Remove it from the mirrorselect script. Reported by: Klaus P. Ohrhallinger --- usr.sbin/bsdinstall/scripts/mirrorselect | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect index 05eff9fee56e..65a662b2df62 100755 --- a/usr.sbin/bsdinstall/scripts/mirrorselect +++ b/usr.sbin/bsdinstall/scripts/mirrorselect @@ -44,7 +44,6 @@ MIRROR=`bsddialog --backtitle "$OSNAME Installer" \ ftp://ftp.freebsd.org "Main Site (GeoDNS, FTP)"\ http://ftp.au.freebsd.org "Australia - IPv6"\ ftp://ftp3.au.freebsd.org "Australia #3"\ - ftp://ftp.at.freebsd.org "Austria - IPv6"\ ftp://ftp2.br.freebsd.org "Brazil #2"\ ftp://ftp3.br.freebsd.org "Brazil #3"\ ftp://ftp.bg.freebsd.org "Bulgaria - IPv6"\ From nobody Sat Feb 28 11:36:25 2026 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 4fNNST4lCkz6T3ZN for ; Sat, 28 Feb 2026 11:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fNNST3zfwz4Pp1 for ; Sat, 28 Feb 2026 11:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772278585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PUq2ZSw6zOlRj0JTzReVJf6LbqLiH+tLv3pwwrC0WGg=; b=pKGA0Xhrs1wjyFdGA+UoAlIFvMi/DQ1MohgostuC4huDo0tkcII6mD2UZHuM9YR5biY4wu CxJPXnoKNAJQ9DDkoGxdqH0fn0jTlKqHUHLW+PUffQgBhzgaN+d25xEupnv+hAT6qrXZhF rrK4LSt2lfA96Ndws4OkYO/cI1/d0HCQgjRFUIxaj8XasL7RN4QcQftjmHGcMqGZ4/8k9f TCjjqnFpMVuEoB0pX/A3exft0pgPxea4zCZ6sV3nT9PkhtoqcXQ5tRvlN1/sBjHcvBCz/M BsjGtHYGFbUn7IwWnBTEcAYAOhdjNo8jIIkWQfLNk01vV4S/tswKGQgqqLuhhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772278585; a=rsa-sha256; cv=none; b=I6bK0GV3ssF5w+yVNNbhaFQS8+uJ84nlx4uT/ixlEOZhYpZjDhbv8rSt5F5vDQE6C+2dxj JXN8/rcpo/6tWfwzpp6VupGT+dUBADqOtll556jY5DYV2qbS+SFnXrEa0InwaFNwrBDNkT M9IC5bUsRRJ+WRnq5WrWScDwGqtuc6SNkgtcZ9KtFeGqxULw4ppCofKunRebGBcN+EbNil 1uhl64xJ0vvucQTklajQ6VrCFvPxq5zWieGIdZ5qTOmH+bcTb4jTvDeiXo9PkOkkFAlYen jeEIZc2ZEJ2ZUICvQptP0NUWcnQVWSy07/Ocy/fnmppebpMrwWFe7GAEPz8YIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772278585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PUq2ZSw6zOlRj0JTzReVJf6LbqLiH+tLv3pwwrC0WGg=; b=YsEf7cLRCwzr/lfCSaH880fqDS3gVNJh/8LwOm5sC/4hggIMs8CovCvzuSOpurm2toQO0R uVwpbI5k9wF/tC1shsFuCpr2k557+K0mZ37iwfPGFdtTJpMMHcP38+0ipCtrsxDlrGI91a pUie/VN1PmWGyv+EJORRimWJfYtO2ci0q6DLphkVYx97kMqfk2yDneYYpMKUzSMB0WqEd0 W8RNUM0EsW0Ni2pA93XwaHzWQDDwkUUcD8aRHQSCEJ5xefb6K4x94KD0lhQiASAiXfSQxK BD7MmPHLPd1ckUq2dFz8+TXhBqgklE/19yKgDx2EH5FkQqa8HrDI+xNiqZk2YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fNNST3ZSrz11sV for ; Sat, 28 Feb 2026 11:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a904 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 28 Feb 2026 11:36:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 32beb3ae71cb - main - vnet: Ensure the space allocated by vnet_data_alloc() is sufficent aligned 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32beb3ae71cb320dbe4190a01c036943d99083b3 Auto-Submitted: auto-generated Date: Sat, 28 Feb 2026 11:36:25 +0000 Message-Id: <69a2d339.3a904.194fb5c8@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=32beb3ae71cb320dbe4190a01c036943d99083b3 commit 32beb3ae71cb320dbe4190a01c036943d99083b3 Author: Zhenlei Huang AuthorDate: 2026-02-28 11:35:42 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-28 11:35:42 +0000 vnet: Ensure the space allocated by vnet_data_alloc() is sufficent aligned Some 32-bit architectures, e.g., armv7, require strict 8-byte alignment while doing atomic 64-bit access. Hence aligning to the pointer type (4-byte alignment) does not meet the requirement on those architectures. Make the space allocated by vnet_data_alloc() sufficent aligned to avoid unaligned access. PR: 265639 Diagnosed by: markj Reviewed by: jhb, markj Co-authored-by: jhb MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D55560 --- sys/net/vnet.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index a2b827052dd3..5ef68d11227a 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -171,11 +171,17 @@ static MALLOC_DEFINE(M_VNET_DATA, "vnet_data", "VNET data"); #define VNET_MODMIN (8 * PAGE_SIZE) #define VNET_SIZE roundup2(VNET_BYTES, PAGE_SIZE) +/* + * Ensure space allocated by vnet_data_alloc() is suitably aligned for any + * object. + */ +#define VNET_DATAALIGN _Alignof(__max_align_t) + /* * Space to store virtualized global variables from loadable kernel modules, * and the free list to manage it. */ -VNET_DEFINE_STATIC(char, modspace[VNET_MODMIN] __aligned(__alignof(void *))); +VNET_DEFINE_STATIC(char, modspace[VNET_MODMIN] __aligned(VNET_DATAALIGN)); /* * A copy of the initial values of all virtualized global variables. @@ -385,7 +391,7 @@ vnet_data_alloc(int size) void *s; s = NULL; - size = roundup2(size, sizeof(void *)); + size = roundup2(size, VNET_DATAALIGN); sx_xlock(&vnet_data_free_lock); TAILQ_FOREACH(df, &vnet_data_free_head, vnd_link) { if (df->vnd_len < size) @@ -403,6 +409,8 @@ vnet_data_alloc(int size) } sx_xunlock(&vnet_data_free_lock); + KASSERT(((uintptr_t)s & (VNET_DATAALIGN - 1)) == 0, + ("unaligned vnet alloc %p", s)); return (s); } @@ -417,7 +425,7 @@ vnet_data_free(void *start_arg, int size) uintptr_t start; uintptr_t end; - size = roundup2(size, sizeof(void *)); + size = roundup2(size, VNET_DATAALIGN); start = (uintptr_t)start_arg; end = start + size; /* From nobody Sat Feb 28 13:24:11 2026 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 4fNQrx3W1Hz6TGnP; Sat, 28 Feb 2026 13:24:17 +0000 (UTC) (envelope-from des@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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fNQrx2Z7Yz3MDQ; Sat, 28 Feb 2026 13:24:17 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772285057; 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=wpJI+f1aFO6FsVmrtderoWJwmhAd/loNseBP28Rc9tY=; b=VoXT0zl5yiymNVzG5dZt0CHHNNGAxh5x5muRtEc7j6JA4qtFgxveKKAN/9wBe0QV55IA6j 0fmGN6smi7xHC+zBuv952+tpg8Z9jgBkJkBmF6I7yLSskl1V4PaTlhHffHYn6R7vG3hGKv 2G2x8kkFImyKZ9SzgkyqFua/CS6UD2Fk+HV6XYC8j9lzCtZAegxlAOYSQgngYnd57LcUtp ZMlr69Acnbe2YHT/fsZN9JZdaciTlaZvlPBJMSKgaS2CBSROtgImyswyooq7t4GEcS1alK nWebVQbnQMcgqUaK7lPBJRcwA+LsSgsTqo1xJx/5UdGqLADMz8U4iCDwBsg8BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772285057; a=rsa-sha256; cv=none; b=qRcisIf9HEm28uzACVUqWnnNNj1Ap8fMCyCOW+69GcllXMjllZRQxBwICF/p92j78xn7z/ Shw5jAuzKh37lad9t9USyG662odrAd0Y2RGjpPOQd/NdmaawiWozPa9iXCuIikQF15pNOK 8cHLyyhPt8PKvY4q5+/f0nVpaCH1Ep4fyBeQMt3LXnWfCVvGVIZm6/3MLuhskrlq5xr1Dw rYbQTQoFDKTIdAbGrNTJjzHYxaBN/HC1hJhLlsUNMOEHfbf/CMRT2CZ3T8kvaKyIvZEGV2 mx4l/6ksHFdToUBu/HZ4su+SdF+603lx2mdCUc3xovaeJsNPKDHecJWxkF28mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772285057; 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=wpJI+f1aFO6FsVmrtderoWJwmhAd/loNseBP28Rc9tY=; b=h9Dy5hehxeryA5+S9jw2VNeCAqpD70EX8/Npy0mm0eM78cREOSe6ddWO7k/3VPIhhWag1t D2pnpwaDfTFY113fDsOxUwSSv9ljXiw/Sr+WzOWQRTwLs4LsVUqCSafmhXlSbzOzra2piD et32UW2yXpOAca9hExpmBN2O6Hir9OfCbE1jBc0Am7/nsFjy2GuZ9hVKq4HuZrPdo2z2lz Md1Ez60/z4cqz5WKULgHmhUd5s5eLL+4uEJ5koxAM77le4m4wARbdwlHJwUydK/yvnmEPd J5RgMC/ypKO0QIQkd8/4e4GNTFwbdUjwp1W+X3mCz8fCudyscu4jyvaC4TcxhQ== Received: from ltc.des.dev (2a01cb0585090500922e16fffef1acef.ipv6.abo.wanadoo.fr [IPv6:2a01:cb05:8509:500:922e:16ff:fef1:acef]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fNQrx1TnrzxQV; Sat, 28 Feb 2026 13:24:17 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 1B730F7351; Sat, 28 Feb 2026 14:24:11 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Enji Cooper Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1f2f5eba24aa - main - asmc(4): pull 32-bit support for the driver In-Reply-To: <69a1f40e.1eb9e.56768185@gitrepo.freebsd.org> (Enji Cooper's message of "Fri, 27 Feb 2026 19:44:14 +0000") References: <69a1f40e.1eb9e.56768185@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sat, 28 Feb 2026 14:24:11 +0100 Message-ID: <86y0kdngqs.fsf@ltc.des.dev> 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 Enji Cooper writes: > commit 1f2f5eba24aa53e180a4eb46b772410e5a782469 > Author: Enji Cooper > AuthorDate: 2026-01-05 03:36:55 +0000 > Commit: Enji Cooper > CommitDate: 2026-02-27 19:44:08 +0000 > > asmc(4): pull 32-bit support for the driver >=20=20=20=20=20 > The asmc(4) driver should work for 32-bit Intel-based Macs, in theory= , if > the model details were added to the detection list. That being said, > 32-bit Intel Macs were only released and available to the general pub= lic > for 8 months [1], so the value in maintaining i386 support in the dri= ver is > reduced due to limited hardware access. >=20=20=20=20=20 > Remove 32-bit support for the driver officially to make it clear its = use is > not supported. >=20=20=20=20=20 > This should fix building `NOTES.i386` by proxy as well. >=20=20=20=20=20 > Relnotes: yes > MFC after: 2 weeks > Fixes: f224591746b ("Add ASMC_DEBUG make option") > Fixes: 8342d9f7b5f ("asmc(4): Stop building it on i386, as..= .") > Differential Revision: https://reviews.freebsd.org/D55544 Please remember that the bugs this fixes have already been merged to stable/15 and stable/14. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sat Feb 28 16:56:14 2026 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 4fNWYV5qthz6Thry for ; Sat, 28 Feb 2026 16:56:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fNWYV5FPVz3nZs for ; Sat, 28 Feb 2026 16:56:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772297774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xo6hGX3dgiCj9+WmixsmxNCZ4+s/XSjrKSFg2N5JNU4=; b=fmcKqhIO3Y0qoFH4vqd4IH5QnSgRp71PXQ8bynl0TCYDAAveLQsP14gfIJx85451HIaXyl RoDEcHq5lXlkkoZHbBG41Az11caBRdB4PriYZGIZbABMbIa+Wl+JmPHA9nG+u4u8D+MY1s 2/vW8HcPUyM4GpnJXz7eQsrUITwnWrVCvUcRMHVlZ0Tv/E7TeKMgMkamzXXnNBJz5GlkYx 32beH46f5Yjv7JCR0AivVK3GJHdTGjft/nVEET6DRIKj4pGEwbpl+fEHFPFlvusUXUw+ag geHnrzGG4FPfAZNpSfPGNgHO4DRfCEH7OgOp7NTzNt5aAK3Huod+cZy+gZysCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772297774; a=rsa-sha256; cv=none; b=KZusItD11tBVont5LzwGHchBEJLHIMH3F/807rveO0+1P8Ln9QF8CnV1/YNYs/Ga5ge8ta 2RZhRiwbfirGp9464a+ycgFjADiiJMVI9TOrFv9BY5ct6cd7eksKdeEGPkCgVNDA5CpmCf /P+LoEYxemmiyg9oabyKmIUXx0bhhee6DjmpfQhO57MfWRTfS0/cVmM3/nWHgCfEeS6L6k iGg088OBX4I4l3uqxwwNj1k62l4ybbtpprVnt2pAFVbbln3bJLyAf9aJFXJmUutv2zypZG 9eiFfBrMFUI1AH52ahtzakKaiKKie6DPyv0mfzutr931NIy0bhSs/XwFjU4Ptg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772297774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xo6hGX3dgiCj9+WmixsmxNCZ4+s/XSjrKSFg2N5JNU4=; b=jocvdP5q7x6iesra3RI8AdS+RcAY0/KDgOb4begbao8pq5DVn1U8SP1epX54a3WYvrffMe ATrajkWhoZoNPd+DipQ7otbVwdhy/9Dk86b0AVWeIJI6ac7K4PRNRhimAKtobdHeThB7vc 1n6TNmgG7Sm2I4DfeK9XIJY5LZhggLKaUqeBGbNntSyooMvC6/JPrU8wibp7mcncjzQFAb c5PvQ/claHpOxuHqlKkF0tWTxsTB33KcqFGLsJvd56VoSOle62Miam50KnfMW6PS9rYqEe ghVy+rkaYiKPjE71S4c7p5ShcqzFB6aLBjmymmgrvvpfhv6gxpiPAcc08U1oOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fNWYV4rN2z1B4n for ; Sat, 28 Feb 2026 16:56:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c9c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 28 Feb 2026 16:56:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: df5014f71cff - main - nuageinit.7: Fix a couple of minor 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: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df5014f71cff2c02f46afa8823370d7f61494bdb Auto-Submitted: auto-generated Date: Sat, 28 Feb 2026 16:56:14 +0000 Message-Id: <69a31e2e.3c9c9.56232d08@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=df5014f71cff2c02f46afa8823370d7f61494bdb commit df5014f71cff2c02f46afa8823370d7f61494bdb Author: Navdeep Parhar AuthorDate: 2026-02-26 23:01:47 +0000 Commit: Navdeep Parhar CommitDate: 2026-02-28 16:52:40 +0000 nuageinit.7: Fix a couple of minor errors Use the correct key name in the chpasswd section. Remove a stray line to fix the description of 'password'. MFC after: 1 week Sponsored by: Chelsio Communications Reviewed by: maxim Differential Revision: https://reviews.freebsd.org/D55547 --- libexec/nuageinit/nuageinit.7 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 35e1d6024105..9651abba868f 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -3,7 +3,7 @@ .\" Copyright (c) 2025 Baptiste Daroussin .\" Copyright (c) 2025 Jesús Daniel Colmenares Oviedo .\" -.Dd January 6, 2026 +.Dd February 26, 2026 .Dt NUAGEINIT 7 .Os .Sh NAME @@ -340,11 +340,10 @@ Boolean to force the user to change their password on first login. .It Ic users An array of objects: .Bl -tag -width "password" -.It Ic user +.It Ic name Specify the user whose password will be changed. .It Ic password Specify a text line with the new password or -specify the user whose password will be changed. .Qq Cm RANDOM to assign the password randomly. If the textline starts with From nobody Sat Feb 28 18:11:37 2026 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 4fNYDT2cXlz6TqfT for ; Sat, 28 Feb 2026 18:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fNYDT1B6dz400D for ; Sat, 28 Feb 2026 18:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772302297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IJ/rX1AUtAT3m+ukRsBqjAFABPyWYm2uQwFMs51/iTY=; b=GMO+i98UwccCWh8FvPEHR2M8UydP/08gMUrQL3wrCdgbZifWZCqaQOtkWy11z8Ja8KMDV5 l/DnH+g9Y1KUGa7frjoh7qsfBEWtGUh4XGrGKRmhGXWoB5rCq3lPn2ltDIku/XVfPTot9u nE4NDrD4NZQn1mCgotegxw8Ffe5evuoS4JqQ6JtSGqxvRb7xuow3lG/viVGQ7NRDFjOU0K 65DEt+swBCBG6wtMwmNmevbOtv8rzSuAE9bgWL6Q05Nlf9LzcfUO6d6zFRiFrTu+mc2MKi sGJOuFkl93WeZW8oR1DoctmVbpGvYqHGGUluk8jFv+c3aOACVNmXws5f5V+s2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772302297; a=rsa-sha256; cv=none; b=WdTeG5wkpkdMnARHZWkRzLu0c4Z5Cz3T40pNPMebSclOW+vHdw+i2KN9GIcoIefFiey+A5 94oaxQpgKs7A80tRe5i1nIl6rdVRK/EWhoPTD+V16JKs2sIHe/QC3+NoVDKMhBZbjml4B3 3q8kZrb7wmfFCPc3Z+U/XmSrNT/oB5g66D5vw9XoXBTQ4UY4di9UsM7DN4VjpEVn+aOTti Bhc0mj07EQQDLQ7HClsreS71aRWEkpzC1bBdEruk1wP6giEC9Cl3TIumhCG6Y6bzKf0Z6z pZ+yW2QTSKhwCNJtXdAaL8ehc+BwS9GWeFrczmMrVVWUdzoeM18RuLxdNNLing== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772302297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IJ/rX1AUtAT3m+ukRsBqjAFABPyWYm2uQwFMs51/iTY=; b=KN+G4mZH/eiq9d6MJbf5MOI7XHGeG9xXi1Ocejs8Ezcdcad6MAZGH3a43t2oafQs+lbCiN 1ooJuke0ktMmRbIXBW/pOdrUqAuwE7sKxGEWoi5JQD524gBrjqtqp7iuy0risqbufg1nV8 TSZka1hSJeISLiOBvv5i2czWUmzDU/MvpkfYVSVAsWpDtYtsWQJilB6spzK2/WcRiNPy0e QmpjEpqG121PnkfXCjkJg+GvIHvZQ4Bde4LZz27iRPtqS7Nvf3STLQysJ0OqAE4fWW7Ly6 n9iP5egZt+Ay8e9DUBn+vlGTNu6zG4uc8LvrXamq+AIWVRYsik7BucbVUwtivQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fNYDT0Wfpz35 for ; Sat, 28 Feb 2026 18:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43d40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 28 Feb 2026 18:11:37 +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: 05ca4837a3e9 - main - libiscsiutil: Record dependency on libmd 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: 05ca4837a3e9a413aabcf005abb14fff35088476 Auto-Submitted: auto-generated Date: Sat, 28 Feb 2026 18:11:37 +0000 Message-Id: <69a32fd9.43d40.521522d1@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=05ca4837a3e9a413aabcf005abb14fff35088476 commit 05ca4837a3e9a413aabcf005abb14fff35088476 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-28 18:11:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-28 18:11:10 +0000 libiscsiutil: Record dependency on libmd MFC after: 3 days Fixes: 6378393308bc ("Add an internal libiscsiutil library.") Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55596 --- lib/libiscsiutil/Makefile | 2 +- share/mk/src.libnames.mk | 1 + usr.sbin/ctld/Makefile | 2 +- usr.sbin/iscsid/Makefile | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libiscsiutil/Makefile b/lib/libiscsiutil/Makefile index d9762302fd40..d34ffd83aaed 100644 --- a/lib/libiscsiutil/Makefile +++ b/lib/libiscsiutil/Makefile @@ -2,8 +2,8 @@ LIB= iscsiutil INTERNALLIB= INCS= libiscsiutil.h - SRCS= chap.c connection.c keys.c log.c pdu.c text.c utils.c CFLAGS+= -I${SRCTOP}/sys/dev/iscsi +LIBADD= md .include diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 2d451fcdbc1a..75a857ba2cff 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -501,6 +501,7 @@ _DP_netmap= _DP_ifconfig= m _DP_pfctl= nv _DP_krb5ss= edit +_DP_iscsiutil= md # OFED support .if ${MK_OFED} != "no" diff --git a/usr.sbin/ctld/Makefile b/usr.sbin/ctld/Makefile index 61efe8a05cfb..097e6c6f89b1 100644 --- a/usr.sbin/ctld/Makefile +++ b/usr.sbin/ctld/Makefile @@ -20,7 +20,7 @@ NO_WCAST_ALIGN= CXXWARNFLAGS.gcc= -Wno-shadow MAN= ctld.8 ctl.conf.5 -LIBADD= bsdxml iscsiutil nvmf md sbuf util ucl m nv util++ +LIBADD= bsdxml iscsiutil nvmf sbuf util ucl m nv util++ YFLAGS+= -v CLEANFILES= y.tab.c y.tab.h y.output diff --git a/usr.sbin/iscsid/Makefile b/usr.sbin/iscsid/Makefile index 4403e796f89d..650096d137e7 100644 --- a/usr.sbin/iscsid/Makefile +++ b/usr.sbin/iscsid/Makefile @@ -8,6 +8,6 @@ CFLAGS+= -I${SRCTOP}/lib/libiscsiutil CFLAGS+= -DICL_KERNEL_PROXY MAN= iscsid.8 -LIBADD= iscsiutil md util +LIBADD= iscsiutil util .include From nobody Sat Feb 28 18:15:49 2026 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 4fNYKK6sxLz6TrFJ for ; Sat, 28 Feb 2026 18:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fNYKK62Bqz40hH for ; Sat, 28 Feb 2026 18:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772302549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S+1Z36BYOEwpcVBJn05AqdyUwndbEK9haGyXuVfWlNA=; b=LdMryNVHuRyvDfJaNmQN82Wzf/QWSDKhzzszdaxqJBjnEIGXrvSzCfMMbgq1Q9vGJ1wCB5 DCese4rjUdj/UB919Ug3uPVKpTOKYykmJ5n6caw2tPI4WyCjDsKB+xbwXS/Dvzkh7pZ7AW LJ4LN+4hPzmTOT/t6R0mg+p2Wtmi8XF0RPGCeloaxeYEigWoB91EvGF+9M2noJbZKRVJ7Q ic2pDnvWgLiBFcmPVKZjl5VGyCdzzPS+MssqFTi7RpZh/J7PDOlPcbG7oNtQq1t8TsjcKc E+xbaGXKYLz3Kk+rT7FHeIX8qp96NXzEXv3zRDv0tyT4l+wSRarLJFgh/yg/Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772302549; a=rsa-sha256; cv=none; b=g8P5HCqgN5xJzm+RElAFvULr86/7IByBjfAgh1ZSk9097S0aZMUrGfsUxUdhw+RCwegwrE E43ox5q3UEhXguA7wl1p70KNWTbGM4R83JX/NVcDCpGS7Kn5mYO7ETJWOsu8GY/SOhG7lb uvvQqQcepQJGOfRFmNUUUZQ5ppoKrb+8Dm355VUK2TayC038WXD1shLmt69PRmlRlUOGaS wGy9qIHOty0euW1v14FI1NygSnOQZKERAA3z9MyExow+jmlanQzS+NyIPIBD8QO3bOGZeJ eBatUFDnMtI+ElrJmbHAyN88ZHnZXlcr8Zm2CQqgaPKwtE/hxR6WNGAIO/bnwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772302549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S+1Z36BYOEwpcVBJn05AqdyUwndbEK9haGyXuVfWlNA=; b=Yca6BRcCnMN8KwiXoebpbK9Uz280JNEtpz/pZVmJLqnD1Qv2j8qfpToAGkGtIKosyoVmnl 8D3olYwD1vra2dgVKjs7pUWeDoxv0JOE2Z3ZUNslkSuskfEllvhy2lYZw+HJSxbOG0bDLd 43m1gIv9/Ar7STy6rGoz6gglGKR2p4NAree3cpKnZSM9jMAPJYwrN2PbNZoOr8p04YhpwM MLImj53T57dFSy4RPSApcvsKBTH8kRhkVnVZz+gcCYBxlAZ5hUqycPXncjOAPrlXXyHYJN D5R9d/wnHmL4Jsaes+6rbvInp61iCDxYTHaXwFXRiYuzy2ozVfZBogEZkWEzqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fNYKK5Bz7zNS for ; Sat, 28 Feb 2026 18:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44fd2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 28 Feb 2026 18:15:49 +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: c2dee7786bf3 - main - diff3: Code 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2dee7786bf32cb66cedec226e42e79e06457c51 Auto-Submitted: auto-generated Date: Sat, 28 Feb 2026 18:15:49 +0000 Message-Id: <69a330d5.44fd2.56809847@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c2dee7786bf32cb66cedec226e42e79e06457c51 commit c2dee7786bf32cb66cedec226e42e79e06457c51 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-28 18:15:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-28 18:15:23 +0000 diff3: Code cleanup * Order includes. * Turn the diff type into an enum. * Turn an unreachable error message into an assertion. * Remove unused debugging code. * Remove some dead assignments. * Consistently use 1 instead of EXIT_FAILURE. * Turn a return from main() into an exit(). MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D55517 --- usr.bin/diff3/diff3.c | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 9a01951e60ab..c33e3275d006 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -62,19 +62,20 @@ * SUCH DAMAGE. */ +#include #include #include -#include #include +#include #include #include #include #include +#include +#include #include #include -#include -#include #include #include @@ -87,14 +88,15 @@ struct range { int to; }; +enum difftype { + DIFF_NONE, + DIFF_TYPE1, + DIFF_TYPE2, + DIFF_TYPE3, +}; + struct diff { -#define DIFF_TYPE1 1 -#define DIFF_TYPE2 2 -#define DIFF_TYPE3 3 - int type; -#if DEBUG - char *line; -#endif /* DEBUG */ + enum difftype type; /* Ranges as lines */ struct range old; @@ -137,7 +139,7 @@ static const char *newmark = ">>>>>>>"; static const char *divider = "======="; static bool duplicate(struct range *, struct range *); -static int edit(struct diff *, bool, int, int); +static int edit(struct diff *, bool, int, enum difftype); static char *getchange(FILE *); static char *get_line(FILE *, size_t *); static int readin(int fd, struct diff **); @@ -256,9 +258,6 @@ readin(int fd, struct diff **dd) for (i = 0; (p = getchange(f)) != NULL; i++) { if ((size_t)i >= szchanges - 1) increase(); -#if DEBUG - (*dd)[i].line = strdup(p); -#endif /* DEBUG */ a = b = strtoi(p, &p); if (*p == ',') @@ -565,7 +564,7 @@ skip(int i, int from, const char *pr) for (n = 0; cline[i] < from - 1; n += j) { if ((line = get_line(fp[i], &j)) == NULL) - errx(EXIT_FAILURE, "logic error"); + errx(1, "logic error"); if (pr != NULL) printf("%s%s", Tflag == 1 ? "\t" : pr, line); cline[i]++; @@ -596,7 +595,7 @@ duplicate(struct range *r1, struct range *r2) if (c == -1 && d == -1) break; if (c == -1 || d == -1) - errx(EXIT_FAILURE, "logic error"); + errx(1, "logic error"); nchar++; if (c != d) { repos(nchar); @@ -621,7 +620,7 @@ repos(int nchar) * collect an editing script for later regurgitation */ static int -edit(struct diff *diff, bool dup, int j, int difftype) +edit(struct diff *diff, bool dup, int j, enum difftype difftype) { if (!(eflag == EFLAG_UNMERGED || (!dup && eflag == EFLAG_OVERLAP ) || @@ -634,10 +633,6 @@ edit(struct diff *diff, bool dup, int j, int difftype) overlapcnt++; de[j].type = difftype; -#if DEBUG - de[j].line = strdup(diff->line); -#endif /* DEBUG */ - de[j].old.from = diff->old.from; de[j].old.to = diff->old.to; de[j].new.from = diff->new.from; @@ -657,7 +652,7 @@ printrange(FILE *p, struct range *r) return; if (r->from > r->to) - errx(EXIT_FAILURE, "invalid print range"); + errx(1, "invalid print range"); /* * XXX-THJ: We read through all of the file for each range printed. @@ -872,8 +867,7 @@ mergescript(int i, int f1f3delta) } break; default: - printf("Error: Unhandled diff type - exiting\n"); - exit(EXIT_FAILURE); + __assert_unreachable(); } if (de[n].type == DIFF_TYPE2) @@ -886,11 +880,7 @@ mergescript(int i, int f1f3delta) * Print from the final range to the end of 'myfile'. Any deletions or * additions to this file should have been handled by now. */ - new = &de[n-1].new; - old = &de[n-1].old; - r.from -= f1f3delta; - r.to = INT_MAX; printrange(fp[2], &r); exit(overlapcnt > 0); @@ -1109,5 +1099,5 @@ main(int argc, char **argv) merge(m, n); - return (EXIT_SUCCESS); + exit(0); } From nobody Sun Mar 1 01:20:11 2026 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 4fNkkz72tnz6Sk0v for ; Sun, 01 Mar 2026 01:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fNkkz5DHCz3lvF for ; Sun, 01 Mar 2026 01:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772328011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NqjHrg8a3TxIu96sEAUxIn+fqkLpTSTkA8cfg4mFtk=; b=VQJteRDSHCX3cwSaFv51b4PbsIRcNfaozrnrFBr9lW0zbJOxrktK9tukMPVneshs/Kv+K7 WsDCfxPDfFg1MnUH7eop8SjhIjJk6H4zYisZsuDiDMs/3SAnX0UrqO3oy7URb12q6uCi+e tf5kJECSVCTSalkZwd+pJTlEFwSFe97Qb4HwJbW+IUfFLfyMaoSKkoOezQpODORsb+t0Zi 18CTd89TsgkW7MlraPfebEx33MCBIGk8tDMxhiWBXNhSNmtLV7ChjVRKfK51tYS9ftQmSK pjNbU7KsKkgVDAY9G/YFseeZ4nYKNt9hx5Aa5tmRPe+rejZWtdgJ8b+Bzi1JMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772328011; a=rsa-sha256; cv=none; b=ARAl0E0BRYg5HzdnU5kPry2xDWo4sjFY0uGyVgPsFa+aUVaLCBrCy7VAkrdavXJ+F2Uoaz fGJEbRJ2vXEbkeRksOV6HMJcSZdIrnda9sIYOt5xXl+nob61iZ1/BFt1NvLkZokQgJ/Xzh 8+ehKfvOnM7W4VPzT7CnlDmzLkMaXrT7fiuMrq5LAQNfKzpY9TAeIZzeBD9tCAx/2mp6Z5 dxXEiCGwo/FUZmXhcnYwaJXPGqmGOAeOFc+pNdv5GdlH2S2YfMKj3MGmKpCzyZbudVN4op h+2mj5z5q7fHGg6TdXJbOJGuxDMzTd0AYI4dPrEvdnEZAN04fXC7D4XFVnxcFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772328011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NqjHrg8a3TxIu96sEAUxIn+fqkLpTSTkA8cfg4mFtk=; b=hwVJZGv6qnSb7u6KUxwEp1hjKCZZdYYLhzNcbz949xHi20YpjeF8TOmv+6ckGfWyPPWYdc nvCt9L0MeHyQQl4FNvmNcmgKm2uugLrWAxNPuAqIzXyhHSinHDWfQ1thg/F1t5dXjgbGU1 Fv/KCcA7fqJQieaXCS9P5V89805G1jvWtCvWj7zEcFepvyYHo1w+rIKUs7kxeeTnABTQPu 8db1l3UTBU0pysQHt5haO9BTQ9rCfHray6P+pK3qUbrUU4lN/p2P3pK4g62U9gJKDeGZYz KR5tmdMwDnbL0Y2v+dbt2ppFQyr8+gVZMuHoNsVCS0WMtfey+tHglhcH1AiDmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fNkkz3yD9zC1p for ; Sun, 01 Mar 2026 01:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 185c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 01:20:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6099b4600256 - main - amd64 initializecpu(): use 64bit type for rcr4() result 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: 6099b4600256552fc6f664c82b7dd0325a4b5b19 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 01:20:11 +0000 Message-Id: <69a3944b.185c4.37a3fbe0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6099b4600256552fc6f664c82b7dd0325a4b5b19 commit 6099b4600256552fc6f664c82b7dd0325a4b5b19 Author: Konstantin Belousov AuthorDate: 2026-03-01 01:00:28 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-01 01:19:53 +0000 amd64 initializecpu(): use 64bit type for rcr4() result Right now %cr4 defined bits fit into the low word, but this is not true with FRED. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/amd64/initcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c index 4c57c27596ad..7161cf631508 100644 --- a/sys/amd64/amd64/initcpu.c +++ b/sys/amd64/amd64/initcpu.c @@ -276,7 +276,7 @@ void initializecpu(void) { uint64_t msr; - uint32_t cr4; + uint64_t cr4; TSENTER(); cr4 = rcr4(); From nobody Sun Mar 1 03:24:16 2026 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 4fNnV84cDqz6SvPy for ; Sun, 01 Mar 2026 03:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fNnV83bHLz43WK for ; Sun, 01 Mar 2026 03:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772335456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5kUKXU2ACmU6HPlHy9aPVctLl/icUXPu655uVkzrOk0=; b=RTq3in886MBa28NO7MSVLhhbZVsAB3HtL7i7QOQP2+XK6gVgTo4qDio118AT8X5sa+BAGU kQD2qiicM6PzL0mm9TF2CGG/JIMMRtEQGeKxWuBx1+YuIy+CGNQgdbj6pubZOAm1l1F0KP EqAqmDHIAoiK8BTKtHGrUs6AcjLIlXW1A0iNVRP5gBGyRJgr9+4ivwtpyRQRq1L8M4IrN/ 44sn7RxRGKhLQOhJihuKu1+4sgILqAUAhnsO8pxFpz8Bm+S486bRRUg1cOxjagQNRzgMrK UYKAoltVB3o2pqzyqRPjC18bANKY609o6606SVRJu93IIVVgtRYnXmoZg+35CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772335456; a=rsa-sha256; cv=none; b=jKJs0hV7AfBzie650DxxaAv3eslh+I0JxKOE3jee9egCZHkk0gxWUrsje14XD9/Sr1A3Oc 2h84j/bM3TZPxzfcAsSryycEHKu3nznP/uazDrlSVSGWxOFiIcQFQNgH3t3KNGnMI50N+G qbp8+75p2PxdygeaEgQkEvWMEgFcbnaQvgwEgldwPjATAlPxLyYLk9EIN0eZW53besvXka +Tg4+b8cS65EU+D+qUqM/FHCBTI+sCXqYEU0Zgbt/1kx1gg0Som5nPQiqh6AW4yO/RHtMY nKGLQs2phrItWYIMAK/7P7fUxT9B8t7GAn8/gDtYjEVSxiH0RRm9OzCFeLgnAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772335456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5kUKXU2ACmU6HPlHy9aPVctLl/icUXPu655uVkzrOk0=; b=tHLtU8vBkBK1UkP9NbnE7bJOlCEQE5CGApStLwdpiQrS8CvYHctyh0KUlOCzwfs5mKa3Wy 4OBxDIIU12GjxO/g56012wsBG3QamPiZUNETrsn7jhOwRgcjNE+xWlIcniNYku+5hAS7R4 m4fFakKtT6T6cAUjIdsjk299p141B/LgjSMHtS8eCmLSUOZQpbndGq9aoP2iPkPgPF/Z1J oM6k2B+RoYrJq69t8Lm5x8IZmynLfg6DtL2jus5NBfKMQ/xHuHt73x+qARU0Cad2t9faVu 4pxYRYiSRQX6eyFir0JID5WsXxaQNSGkbIxl6EMdMpsMFfEjfvelxp9VejXYNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fNnV83BPrzXMY for ; Sun, 01 Mar 2026 03:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 264d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 03:24:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 6da9d465c54b - main - bhyveload: simplify cb_open() and eliminate minor TOCTOU 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6da9d465c54bf2e3496e83db025c5d22f3b3cc17 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 03:24:16 +0000 Message-Id: <69a3b160.264d7.32722ca9@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6da9d465c54bf2e3496e83db025c5d22f3b3cc17 commit 6da9d465c54bf2e3496e83db025c5d22f3b3cc17 Author: Kyle Evans AuthorDate: 2026-03-01 03:23:59 +0000 Commit: Kyle Evans CommitDate: 2026-03-01 03:23:59 +0000 bhyveload: simplify cb_open() and eliminate minor TOCTOU It's not at all clear why I wrote it like this, but we can do better. I wouldn't think this really has any meaningful security implications since the hierarchy in question can't really be modified by the guest scripts, but it would seem to make it a little more robust. Fixes: 6779d44bd878e3c ("bhyveload: use a dirfd to support -h") Reviewed by: bnovkov, markj Differential Revision: https://reviews.freebsd.org/D55379 --- usr.sbin/bhyveload/bhyveload.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 2b1bfec9a62d..4cc566f334c3 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -169,11 +169,9 @@ cb_open(void *arg __unused, const char *filename, void **hp) { struct cb_file *cf; struct stat sb; - int fd, flags; + int fd; cf = NULL; - fd = -1; - flags = O_RDONLY | O_RESOLVE_BENEATH; if (hostbase_fd == -1) return (ENOENT); @@ -185,20 +183,21 @@ cb_open(void *arg __unused, const char *filename, void **hp) if (filename[0] == '\0') filename = "."; - if (fstatat(hostbase_fd, filename, &sb, AT_RESOLVE_BENEATH) < 0) - return (errno); - - if (!S_ISDIR(sb.st_mode) && !S_ISREG(sb.st_mode)) - return (EINVAL); - - if (S_ISDIR(sb.st_mode)) - flags |= O_DIRECTORY; - /* May be opening the root dir */ - fd = openat(hostbase_fd, filename, flags); + fd = openat(hostbase_fd, filename, O_RDONLY | O_RESOLVE_BENEATH); if (fd < 0) return (errno); + if (fstat(fd, &sb) < 0) { + int serrno = errno; + + close(fd); + return (serrno); + } else if (!S_ISDIR(sb.st_mode) && !S_ISREG(sb.st_mode)) { + close(fd); + return (EINVAL); + } + cf = malloc(sizeof(struct cb_file)); if (cf == NULL) { close(fd); @@ -217,7 +216,6 @@ cb_open(void *arg __unused, const char *filename, void **hp) return (ENOMEM); } } else { - assert(S_ISREG(cf->cf_stat.st_mode)); cf->cf_isdir = 0; cf->cf_u.fd = fd; } From nobody Sun Mar 1 07:48:21 2026 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 4fNvMC3xLsz6TFkg for ; Sun, 01 Mar 2026 07:48:39 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) (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 4fNvMC21Blz3V8R for ; Sun, 01 Mar 2026 07:48:39 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-8274936d2c0so3148210b3a.3 for ; Sat, 28 Feb 2026 23:48:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772351313; x=1772956113; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=vTFqQv9A9FpWM1bZcPsUmOCFq+S//eKjMt/CqacZ7pE=; b=Dze1a8WYSCQ70YYjBz/Wp/xeThOnDaJgTZQ36UTgOBaHM285/EvNaD9SEcXm8i72BW 55lK5z70rtcVnJ4ytOroZ73jx3ivFdwPY0lQvY/w2WQCcSWQ+qfTMqnrZZADN4aFnGSf 3tbOeJrkfS8J1/nbft1MvM0krGhhC2nQsoZvctJxXvNWwkStMz5/yimlS+V1k835xroS 9bXeHy42KzW09GKnDny76K4RnuiyqQBMJHQpbGxB77Omb+z/XOll2tnCioziPuD2MvHc wN7f9HhFv9EOHvVfbpQtg4Jh+vlIZqtKs4H0as/n3m0E5fsQa+HssuCTYwPo1FUgTcDv 6d2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772351313; x=1772956113; h=to:references:message-id: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=vTFqQv9A9FpWM1bZcPsUmOCFq+S//eKjMt/CqacZ7pE=; b=HsHyB7fexvqJPbtR1GpSjAXB0Yy004VnjhcIPu4uPccxkrkHxpoBxcmCAuWaV+XUk6 CCmczpmaPJWMi0tUC9QI8pXCm51YHJu5EA9CaQskL1xi/b/XFgdFsZ6NSe95UdLBprut NZFRL3DLuAfJFyRYdI5pB86IleWLtflo9lXm1+x9PjjWCFOZWkckA9GSKDQYDmyAst81 YgmYnmzLXzB5XkFK5hwfJavioh7fFJfZsfg0jVxtqAvjED7W2US12O4PD6cqaMK8CswJ EXfFaOxRhbBkp+mQ3y8gX+b6gb3DQ7fWttjvh25xBzlIhljHQguzUOMSaWJQqK2DPlGx NzGg== X-Forwarded-Encrypted: i=1; AJvYcCVVP1PFHISZQCfZRUz/MzITNHmLdrNMp73wR3H+zM6NIw0hRdMT7GZM62gQeznnlYDJve5bfMZB3k7YCYu4fidPTjB0OA==@freebsd.org X-Gm-Message-State: AOJu0Ywd35fL435g4dqFRYIvCeoo48j/4JAt8tBvlSlRKF3qTJ+qwgmJ 4KYT5RZTgPz3dZKR7+81oyiG58/q9YS8WlpdczKvtBbTVUU4odsN6wjV/9g3phYF X-Gm-Gg: ATEYQzxkaM8NLysfRhTG9Ym4GvMRXDbxVLe5lVgXNk1TQgys2zYPfJAPbzohMLt/rvx NM2zC2X8PkHmxRoRX+lQLx8QZPHyp3iciAforLUUJoRKeOP5Fhk2yEi2hMDxn4lssclcoZvoaEx pVPwJ8+39xhbL8eJi+m8lD9NoVyudka+0USHVsZ2QgfW+XyS4qm5y+fi4RjvLWChl857VlNS6Nl AOV6ZhLujf7Di2KI7IxAV+B1BCBhJdUXNwWNs4s05YdRWnbZUc1oSPYFDbhyqEMFhmnZMo8ejUo oU9tbzXTZ8t+NfjKFxjWgVLjPoSipiG4vtBBnG8rnnMREDgJjSKunqOQo3cEDsgear25YTMQeGz gwYgq1JAdEX6X0pb9tSngRUXL6jf+eX0PdZcB6LuPkHIeHMKafuSv8A5WO5C0g+a+fjnfyndZCA DKHy23usCVFXMyxZDtRvN7YJjdQTXVcNfP5C3FrKvC938= X-Received: by 2002:a05:6300:85:b0:370:73c1:6a87 with SMTP id adf61e73a8af0-395c3b0dccfmr7398791637.58.1772351312921; Sat, 28 Feb 2026 23:48:32 -0800 (PST) Received: from smtpclient.apple ([185.219.141.153]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3593dda3a4dsm9148013a91.10.2026.02.28.23.48.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Feb 2026 23:48:32 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_D2E0B433-D30B-44E1-A3FC-2B179EC2CDA3"; protocol="application/pgp-signature"; micalg=pgp-sha256 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.1.3\)) Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup From: "Enji Cooper (yaneurabeya)" In-Reply-To: <69a330d5.44fd2.56809847@gitrepo.freebsd.org> Date: Sat, 28 Feb 2026 23:48:21 -0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: <5A228777-56E5-49AA-9F20-99543F397059@gmail.com> References: <69a330d5.44fd2.56809847@gitrepo.freebsd.org> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fNvMC21Blz3V8R X-Spamd-Bar: ---- --Apple-Mail=_D2E0B433-D30B-44E1-A3FC-2B179EC2CDA3 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 28, 2026, at 10:15=E2=80=AFAM, Dag-Erling Sm=C3=B8rgrav = wrote: >=20 > The branch main has been updated by des: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc2dee7786bf32cb66cedec226e42e79e= 06457c51 >=20 > commit c2dee7786bf32cb66cedec226e42e79e06457c51 > Author: Dag-Erling Sm=C3=B8rgrav > AuthorDate: 2026-02-28 18:15:23 +0000 > Commit: Dag-Erling Sm=C3=B8rgrav > CommitDate: 2026-02-28 18:15:23 +0000 >=20 > diff3: Code cleanup >=20 > * Order includes. >=20 > * Turn the diff type into an enum. >=20 > * Turn an unreachable error message into an assertion. >=20 > * Remove unused debugging code. >=20 > * Remove some dead assignments. >=20 > * Consistently use 1 instead of EXIT_FAILURE. >=20 > * Turn a return from main() into an exit(). >=20 > MFC after: 1 week > Sponsored by: Klara, Inc. > Reviewed by: bapt > Differential Revision: https://reviews.freebsd.org/D55517 Hi des@, It looks like the diff3(1) code came from OpenBSD (at one point = in time). Are there any plans to converge/merge with that codebase in = the future? Thanks! -Enji= --Apple-Mail=_D2E0B433-D30B-44E1-A3FC-2B179EC2CDA3 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmj70UACgkQGpE5DjPs NJgJHA//TmBhKFPjNOvztpWtghUfkXE9ZpRmRbhRvcHc/0lupljkuMMiiTz2CVVF 5TvV+JHm83oBAO9pogsoqpjIKxYtvfKgluYSzDlog99bNbFLnNtMv4kEeW1smM9I m2aDvwEF+sNHGUBD1OoJ51d/aMpA8+WAN/8J9qiGtpnt3/IysusZVxhG/Uz5kgmL qhptseL6bVtN8JwK+KJbKaswOPVR7hqVE10mY9umNzjIPap/FKTObmKBl4JURQdy od6uIzNml9ZuYNYBcHGSfnbXDihB2bLZnyHkARLDUyz9QOJdP5gDxzm5bVqdFCrr u0zMQHD5jEV8YlG2CL7QGCEQKZ0oztO9qLwwtL36YOWeaVERAMR/J+a/x8QTUKQP gUa4eg730bdi/w947wNuxhusPyQ7W7h5OjfXAt+MJv1JOahdkZzXBNHycH0gcGXT NEdgKf2KMvYltUb8FznJMFWNlJAA7Pc7KdrTy2+LSHBa+DTEd5WNn4b2OhcSEmF6 XNwf+w6SG9WeyI/MEsSt/gGkumR8+tz+qQJnnYNc0nP8pcZEnAlVz3/59AKmVufj Osd4UG/3+BxC6ChSSECitpCoRJror1hu22jJTvFXwebgp5ju2irvamQvxAg5XM3T GBUujKHW5QixZbOGXiOsXw0vkSZSpIbdM1kXZXNPBUe+zZWs3q8= =4jYQ -----END PGP SIGNATURE----- --Apple-Mail=_D2E0B433-D30B-44E1-A3FC-2B179EC2CDA3-- From nobody Sun Mar 1 07:49:41 2026 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 4fNvNg3PsPz6TFwd for ; Sun, 01 Mar 2026 07:49:55 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) (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 4fNvNg1HMRz3Vfb for ; Sun, 01 Mar 2026 07:49:55 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-2ae46fc8ec1so2260325ad.3 for ; Sat, 28 Feb 2026 23:49:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772351393; x=1772956193; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=tOaF3+kjUVZ8ou7IPHKo3znc1KF7ELipeBXS4/OLRnk=; b=jk+IN8m+E1U+76VGhpQLy3BeCDlZ8MMcm9/0jDrmCSCR0rFTNi9bdzgLgqfhCkoXVL uPZLHLEUEsqezfrFyxYdhBad8JTE7mtOS1ZDIxvPxhcAACq25qJTBl25R2aYhfnanuzu 1tW8tt7JsMobubruoZEcpuwfedoW0rn9n56MkTCfBKJB16KPtIcfLHn4LaxSjeSPq/Wn uiBi2FuEzkih8XCxuNGu3ruFDD79NNJD1/0glsbfdwvME1fMDY2lqVR8TsgznnZ1fF4K vKgOEqiggc1DmwQumZBS2MXsmrV6/7pyzA8FIe/Scrq3TlqDH4SxTNWnFIoKP1O9RlJS Sz9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772351393; x=1772956193; h=to:references:message-id: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=tOaF3+kjUVZ8ou7IPHKo3znc1KF7ELipeBXS4/OLRnk=; b=tpL7SYuLQ0H3l4R0hKqjrkVCLc4ci+PtP8yzy6qVM56VeWcOQrJ1AIxyRxoKkk96AF J35LKe1KJEkqtS9uP8czUzE+1oXZDHNKmRQxRqRwjEDnxFtjsZh/WExat42h/b9iV2po 3xguZbVbOzBKbu+nsd66A2BYNsuSoBLYEzapb/9/jX8zdZL6bYgFmQXfVMu+s81yueO5 z29q3J7cYi4bSPe24mlQ1qpnoNqCKQuoUYd/5GOWvQ92b0t8r2dpHMgHBEu9q989FLTq SxPIDFpKTZn3ftivmVDAbZAdImj4T9nz/6g3v3xokvtIFQx7MqlaCbpJyTTCGHSv4/us uYmA== X-Forwarded-Encrypted: i=1; AJvYcCVEr/AlWpYPhfZKU9X7STSubgQO2ORxUqJwqqqYQJpSfYKMgXMsTRdzyv7GZL3qPjTZpyYv3P3OGFPt1YzEyvppf8aTIA==@freebsd.org X-Gm-Message-State: AOJu0YzDCI+2d2niDFMCV+cgkcTzfVQ8D7wBF/C7tFVxPXZGdsChnj3L dZYRx72hfqoQL2sKL2t4qrBjWW497Spz/2OXaajAXRJKIERFHakeL+3c X-Gm-Gg: ATEYQzz1tn6PuFMPGBKaJIeYEz7hTOGbIQ1ZMUf5e5MBQkIws/vRYgpFQOsOoQCL7Rs l7vK317o5H8gpzTab1ljd9mfJ2tvgW58JetScD5FIehNq5aWi4nNSCIHIWx/t62mQYQ08ds0++x H4HPPJuszSXKeODBchPMFUVrFAOftWGTwW/hfzO5cnpg+QcT2z2Fm1ICdpgt9mecmNS91/il/68 F9sEAezNBxnSdTVFtRBUEqMQAitxVz5TZyyR/RRM8NFU3bfb0fqNMK3JME0cNLSd1ZHfv3QF0Q/ 84ljoo+bbQo/o5u585M/yc33KDxYzLtgUP6T2+ByaJxdMhR7BWz25GCmFhRpsObKqzEghwEj5GE PPakUgBwkr5Kxb4lrtAAQNca7hEcsRud0bjL42cygRe8EGcRYxWWlAS8LntJByyJMzgYyQd/QO7 mSru0scGvrAsskYmIz/3P0TicPloxDsMuXryR3mBvrQ+Q= X-Received: by 2002:a17:902:ec8b:b0:2a7:c2d5:bcd7 with SMTP id d9443c01a7336-2ae2e3f0474mr70879435ad.20.1772351392684; Sat, 28 Feb 2026 23:49:52 -0800 (PST) Received: from smtpclient.apple ([185.219.141.153]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8273a0107f5sm9322195b3a.45.2026.02.28.23.49.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Feb 2026 23:49:52 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_A57004A8-E579-44B6-9550-BF9AD07BF702"; protocol="application/pgp-signature"; micalg=pgp-sha256 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.1.3\)) Subject: Re: git: 1f2f5eba24aa - main - asmc(4): pull 32-bit support for the driver From: "Enji Cooper (yaneurabeya)" In-Reply-To: <86y0kdngqs.fsf@ltc.des.dev> Date: Sat, 28 Feb 2026 23:49:41 -0800 Cc: Enji Cooper , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: <4A796B89-DBE0-4845-947E-65C5B95C0650@gmail.com> References: <69a1f40e.1eb9e.56768185@gitrepo.freebsd.org> <86y0kdngqs.fsf@ltc.des.dev> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fNvNg1HMRz3Vfb X-Spamd-Bar: ---- --Apple-Mail=_A57004A8-E579-44B6-9550-BF9AD07BF702 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 28, 2026, at 5:24=E2=80=AFAM, Dag-Erling Sm=C3=B8rgrav = wrote: >=20 > Enji Cooper writes: >> commit 1f2f5eba24aa53e180a4eb46b772410e5a782469 >> Author: Enji Cooper >> AuthorDate: 2026-01-05 03:36:55 +0000 >> Commit: Enji Cooper >> CommitDate: 2026-02-27 19:44:08 +0000 >>=20 >> asmc(4): pull 32-bit support for the driver >>=20 >> The asmc(4) driver should work for 32-bit Intel-based Macs, in = theory, if >> the model details were added to the detection list. That being = said, >> 32-bit Intel Macs were only released and available to the general = public >> for 8 months [1], so the value in maintaining i386 support in the = driver is >> reduced due to limited hardware access. >>=20 >> Remove 32-bit support for the driver officially to make it clear = its use is >> not supported. >>=20 >> This should fix building `NOTES.i386` by proxy as well. >>=20 >> Relnotes: yes >> MFC after: 2 weeks >> Fixes: f224591746b ("Add ASMC_DEBUG make option") >> Fixes: 8342d9f7b5f ("asmc(4): Stop building it on i386, = as...") >> Differential Revision: https://reviews.freebsd.org/D55544 >=20 > Please remember that the bugs this fixes have already been merged to > stable/15 and stable/14. Oof =E2=80=94 fair. I=E2=80=99ll wait a 3 days instead of 2 weeks and = merge. -Enji= --Apple-Mail=_A57004A8-E579-44B6-9550-BF9AD07BF702 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmj75UACgkQGpE5DjPs NJj0kw//QN7+H0sA4d5e8wBBkrq5NM6JOae5saXuafBSD3UvnKaolXEFUhA0u7Kl U/hu2/S3A7M8nIgmbNPecukXhcY0aq0ivnY2Is4skTANd46yf909T649Faty8724 1O7k4PkGK2bqRUyFsGJ8SufqSwlnsoYddXYhrNQY95WEwXncb5+zsuKsGXffljC5 hCzvlQE9YvRm819B+V0IkvnA3zlsH3LWgX4aYng1cotNa2rCR+/M4G7KdbR8h+To ub8NelSVzjD+jZiN/yjEnnT/rthUDnxYaCk4zgKWvQbZk/x8H4jBjloy72a73nzv +gJ4e3na7/LYkZNdnRwpWdtN1fUYE8LvGgMR58oy2ZS7YlAxvk7Zh0N4W7HiCigD YCEPxmVbmyakrb9R+OBvXRI/EmDhUlG+1z+8KsL7saNB0dwksDZjksseRnJwZ+QY wywqq8PwfyY1CKBm+yxbMKuYBcvjuTFFcG2xgG7yxr03adLghV8JaDFD2FLv/Hca gRpONYO9AiSm/3VF+6GVqZwha3cylu1cl4B0BKM5u7rxuHCiEAZ0PS83ZM3zFevu ZSsP73BDrR7I08caczIxpE52S1XWZjWZi/L2DdT0oRgcPPVZXTaum+w4VJT3Ukbm gat0ZaA4B9h0PU2zSyUqEBKhZ66KUY+Oj0REKu+SLm707kBIaic= =zpdf -----END PGP SIGNATURE----- --Apple-Mail=_A57004A8-E579-44B6-9550-BF9AD07BF702-- From nobody Sun Mar 1 11:28:59 2026 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 4fP0FR3bKjz6SnDM for ; Sun, 01 Mar 2026 11:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP0FR2lRFz3sny for ; Sun, 01 Mar 2026 11:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772364539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MZBBIHPmwoOzK6kQq6a1AR9x82e0OdoWYjFnjf8WMxs=; b=XaDzOXYDHkcUH5tQA3FCKhyDh5on2281okdE+34uCe/CKN+VYC930qVH7DynKtI45UJ88K nK5j1kxCmTEcFoZZtA/zqrIi4n6L0JDHhjJo+5trofZjcGFDh9MInkhrzh8MImdvEoM9iP hE99NlFovGLZsOkdVt9zvfJScf4igUKw2amc4kz+NnA3ECTSI2B30bpV7v9qWy+CY3q6Qk 5HYDfXwUPQcLUeadmiON+K4jJ5/EwbOcGZgGAK03ffQsKLt1IQkC5sPkUvFHAdJcXiKz72 Zp6L1fsDO66hWSckB9CQNl+J6g7qkZOS/i7glq7nBVclPsMStcAQ9jGkrXUTsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772364539; a=rsa-sha256; cv=none; b=kiSJoVRgCVMfo/BUY5m++6cS+o9kWoMLUJDxj1FdpxqDYM0f7vYBXgFHxreicUVdwmbE3H Q7kTTSHkEpxhbaTccYTtRuZdfMXtO9wVvzdXcQpJfKgsDg6r7h7eiRvYtiskEhlEDZ6ak9 IN98Snn19INVXKZtOXx37vyOBwGm8ZRcIW0sW7CO+oRWpTMlz4lzx/mq2eokvM3VkP2kBc fszHVvipHexdc0O8VhrOSrLJdKZeeIZO6CcEJ/kRHJ2p7imUzd0WKq5iy85mIKfOz1un8u A+vF06rT+P6WiQlgy/Zyza4rMIszF9lSWX4AGpvruJ61RhtaO6+FXnN0U2mIZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772364539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MZBBIHPmwoOzK6kQq6a1AR9x82e0OdoWYjFnjf8WMxs=; b=R4rLhIBFt4YHkyxjch4uHCvbtcxUfJExCr0nK5/2BTzB/JyQ6zOaBhl7vUlKvaxGFYI3rL 9jJ2ahgsdtk9H6jAIUX6DLxT/EQ3uGoOLKfJpkx8NYPYl3qJO7rLKOhnOzUTwSjN/wHI8H 5iamQKXJYQNJZoT4iSX4pRROqaV8KTWdhBC5J46o8YNzbFnrdwWEKYRvJEdAsTA1QaykqZ OZOzKIln5S+DcmGB1I+yYZH2mgS0NVnsGpEkbEUr3b8BldmW4ruitNB2pqWG0Re3ufBYac +TdLgsrFAkNJlRm7vPFkTpEwvMqun7oyiRyoQuwBrX83KDuXZrjIQNzJCNEWcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP0FR2JwTznHP for ; Sun, 01 Mar 2026 11:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 398e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 11:28:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 7c2c2c2a2253 - main - ed: add unicode test cases to ATF test suite 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c2c2c2a2253370c88fe428cf1c0ecebd68fe864 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 11:28:59 +0000 Message-Id: <69a422fb.398e4.1e4447d5@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7c2c2c2a2253370c88fe428cf1c0ecebd68fe864 commit 7c2c2c2a2253370c88fe428cf1c0ecebd68fe864 Author: Baptiste Daroussin AuthorDate: 2026-02-17 16:38:29 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-01 11:25:16 +0000 ed: add unicode test cases to ATF test suite Including examples in Cyrillic suggested by kib@ Differential Revusion: https://reviews.freebsd.org/D55364 --- bin/ed/tests/ed_test.sh | 333 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 333 insertions(+) diff --git a/bin/ed/tests/ed_test.sh b/bin/ed/tests/ed_test.sh index c67df8ae9f65..d4b18fa92ca0 100755 --- a/bin/ed/tests/ed_test.sh +++ b/bin/ed/tests/ed_test.sh @@ -1687,6 +1687,322 @@ z CMDS } +# --------------------------------------------------------------------------- +# Unicode support +# --------------------------------------------------------------------------- +atf_test_case unicode_list_multibyte +unicode_list_multibyte_head() +{ + atf_set "descr" "l command displays multibyte UTF-8 as-is"; +} +unicode_list_multibyte_body() +{ + + export LC_CTYPE=C.UTF-8 + printf 'café\n' > input.txt + atf_check -o inline:'café$\n' ed -s - <<'CMDS' +H +r input.txt +l +Q +CMDS +} + +atf_test_case unicode_list_cjk +unicode_list_cjk_head() +{ + atf_set "descr" "l command displays CJK characters as-is"; +} +unicode_list_cjk_body() +{ + + export LC_CTYPE=C.UTF-8 + printf '日本語テスト\n' > input.txt + atf_check -o inline:'日本語テスト$\n' ed -s - <<'CMDS' +H +r input.txt +l +Q +CMDS +} + +atf_test_case unicode_list_mixed +unicode_list_mixed_head() +{ + atf_set "descr" "l command displays mixed ASCII/UTF-8 correctly"; +} +unicode_list_mixed_body() +{ + + export LC_CTYPE=C.UTF-8 + printf 'hello café 世界\n' > input.txt + atf_check -o inline:'hello café 世界$\n' ed -s - <<'CMDS' +H +r input.txt +l +Q +CMDS +} + +atf_test_case unicode_list_invalid +unicode_list_invalid_head() +{ + atf_set "descr" "l command escapes invalid UTF-8 as octal"; +} +unicode_list_invalid_body() +{ + + export LC_CTYPE=C.UTF-8 + printf '\200\201\376\377\n' > input.txt + atf_check -o inline:'\\200\\201\\376\\377$\n' ed -s - <<'CMDS' +H +r input.txt +l +Q +CMDS +} + +atf_test_case unicode_list_wrap_cjk +unicode_list_wrap_cjk_head() +{ + atf_set "descr" "l command wraps correctly around double-width CJK"; +} +unicode_list_wrap_cjk_body() +{ + + export LC_CTYPE=C.UTF-8 + # 69 A's + 日本 (2 CJK chars): 69 + 2 = 71 cols for 日 (fits), + # 71 + 2 = 73 for 本 (exceeds 72), so 本 wraps to next line. + printf 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA日本\n' > input.txt + ed -s - <<'CMDS' > output.txt +H +r input.txt +l +Q +CMDS + printf 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA日\\\n本$\n' > expected.txt + atf_check cmp output.txt expected.txt +} + +atf_test_case unicode_print +unicode_print_head() +{ + atf_set "descr" "p command passes through UTF-8 correctly"; +} +unicode_print_body() +{ + + export LC_CTYPE=C.UTF-8 + printf 'café 日本語\n' > input.txt + atf_check -o inline:'café 日本語\n' ed -s - <<'CMDS' +H +r input.txt +p +Q +CMDS +} + +atf_test_case unicode_number +unicode_number_head() +{ + atf_set "descr" "n command displays line number with UTF-8"; +} +unicode_number_body() +{ + + export LC_CTYPE=C.UTF-8 + printf 'café 日本語\n' > input.txt + atf_check -o inline:'1\tcafé 日本語\n' ed -s - <<'CMDS' +H +r input.txt +n +Q +CMDS +} + +atf_test_case unicode_regex +unicode_regex_head() +{ + atf_set "descr" "Regex search matches UTF-8 characters"; +} +unicode_regex_body() +{ + + export LC_CTYPE=C.UTF-8 + printf 'café\ntest\nüber\n' > input.txt + atf_check -o inline:'café\n' ed -s - <<'CMDS' +H +r input.txt +g/é/p +Q +CMDS +} + +atf_test_case unicode_regex_charclass +unicode_regex_charclass_head() +{ + atf_set "descr" "Regex character classes work with UTF-8"; +} +unicode_regex_charclass_body() +{ + + export LC_CTYPE=C.UTF-8 + printf 'café123\ntest456\n' > input.txt + atf_check -o inline:'café123\n' ed -s - <<'CMDS' +H +r input.txt +g/[[:alpha:]]*é/p +Q +CMDS +} + +atf_test_case unicode_substitute +unicode_substitute_head() +{ + atf_set "descr" "Substitute replaces UTF-8 characters"; +} +unicode_substitute_body() +{ + + export LC_CTYPE=C.UTF-8 + printf 'café\n' > input.txt + ed -s - <<'CMDS' +H +r input.txt +s/é/e/ +w output.txt +Q +CMDS + printf 'cafe\n' > expected.txt + atf_check cmp output.txt expected.txt +} + +atf_test_case unicode_substitute_cjk +unicode_substitute_cjk_head() +{ + atf_set "descr" "Substitute replaces CJK characters"; +} +unicode_substitute_cjk_body() +{ + + export LC_CTYPE=C.UTF-8 + printf 'hello 世界\n' > input.txt + ed -s - <<'CMDS' +H +r input.txt +s/世界/world/ +w output.txt +Q +CMDS + printf 'hello world\n' > expected.txt + atf_check cmp output.txt expected.txt +} + +atf_test_case unicode_global_substitute +unicode_global_substitute_head() +{ + atf_set "descr" "Global substitute works with UTF-8"; +} +unicode_global_substitute_body() +{ + + export LC_CTYPE=C.UTF-8 + printf 'à la carte\nà bientôt\nhello\n' > input.txt + ed -s - <<'CMDS' +H +r input.txt +g/à/s/à/a/ +w output.txt +Q +CMDS + cat > expected.txt <<'EOF' +a la carte +a bientôt +hello +EOF + atf_check cmp output.txt expected.txt +} + +atf_test_case unicode_join +unicode_join_head() +{ + atf_set "descr" "Join preserves UTF-8 content"; +} +unicode_join_body() +{ + + export LC_CTYPE=C.UTF-8 + printf 'café\n世界\n' > input.txt + ed -s - <<'CMDS' +H +r input.txt +1,2j +w output.txt +Q +CMDS + printf 'café世界\n' > expected.txt + atf_check cmp output.txt expected.txt +} + +atf_test_case unicode_append +unicode_append_head() +{ + atf_set "descr" "Append preserves UTF-8 text"; +} +unicode_append_body() +{ + + export LC_CTYPE=C.UTF-8 + ed -s - <<'CMDS' +H +a +première +deuxième +. +w output.txt +Q +CMDS + cat > expected.txt <<'EOF' +première +deuxième +EOF + atf_check cmp output.txt expected.txt +} + +atf_test_case unicode_cyrillic +unicode_cyrillic_head() +{ + atf_set "descr" "Cyrillic: append, substitute, print, regex search"; +} +unicode_cyrillic_body() +{ + + export LC_CTYPE=C.UTF-8 + ed -s - <<'CMDS' > output.txt +H +a +Привет +. +s/ривет/ока/ +1p +a +Строка +. +1 +/а/p +1,$p +Q +CMDS + cat > expected.txt <<'EOF' +Пока +Пока +Строка +Пока +Строка +EOF + atf_check cmp output.txt expected.txt +} + # --------------------------------------------------------------------------- # Registration # --------------------------------------------------------------------------- @@ -1735,6 +2051,23 @@ atf_init_test_cases() atf_add_test_case newline_insert atf_add_test_case newline_search + # Unicode support + atf_add_test_case unicode_list_multibyte + atf_add_test_case unicode_list_cjk + atf_add_test_case unicode_list_mixed + atf_add_test_case unicode_list_invalid + atf_add_test_case unicode_list_wrap_cjk + atf_add_test_case unicode_print + atf_add_test_case unicode_number + atf_add_test_case unicode_regex + atf_add_test_case unicode_regex_charclass + atf_add_test_case unicode_substitute + atf_add_test_case unicode_substitute_cjk + atf_add_test_case unicode_global_substitute + atf_add_test_case unicode_join + atf_add_test_case unicode_append + atf_add_test_case unicode_cyrillic + # Error tests atf_add_test_case err_append_suffix atf_add_test_case err_addr_out_of_range From nobody Sun Mar 1 11:29:00 2026 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 4fP0FS44Mzz6Sncn for ; Sun, 01 Mar 2026 11:29: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP0FS3VVWz3srK for ; Sun, 01 Mar 2026 11:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772364540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Igtu86OiRk7VNAX0qXm1LBrK68m5paYOv6sLAQIX3BM=; b=UAzDPm/o0fr3gMK6hh0UWKa1MGmWQ/C4NrT9uaNVKQ7LAVC82ol/83vR1U+ndtyR3gkjvV Px1mgFO1b9t+BD3FzD5ClqUqHBjIsPvBHHQcJK4CdJYtQ6buA47XsdwtJG6F2w9nTUrXWJ KbSqmOJQYbBnKkT2ID0CjRB6QyXyOsKlmY7oYuxjC2GTODcDSotGTtbhFH2l9tyuAUMudQ 4AiSQCWJtk2Z9N5USPUyYQY9eGxhieSD34v3wvqCiHr+zU3vlABxvZ6dilnn74gI/vgN1G qHWW14/kn4dmKgw93m6/mHYAdL/4/ibxceQx0TqXy6uxbhP7hyXdtihkKP10UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772364540; a=rsa-sha256; cv=none; b=pvAlL1cXqU3NNhVhw3wVHNM6nJbxpGNfnk+ZxYDyGPJ9FIVPl2DI7hLT11mQUWdpPILU70 Q9cRfxmWGohopkxaxuHiB8wQM3dBm8thF5KED8GRixmpLJzhTPJg/51fs0y7+7CScU7CU9 KkHfK5MYYwOGu7rGDzxAk0c3nrWShih1Xvamfq/N5EvCtuGCtE+fCzWvw1mJ7hLVbzd5Ze zGDiSR13t0EGlqkXDrb9fFeI48jxg5jNZ2c3gMs1XFhiRqA8N5GiRb7rLjRHF+aST8CEXT n75+NFPpP0+s9KJd2srTkJDLB7DJYzBGmpCjSAqhII98vmEDZgMQtCOETmwrQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772364540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Igtu86OiRk7VNAX0qXm1LBrK68m5paYOv6sLAQIX3BM=; b=Lsfg5usHka3Xjp9YNC1b2Y8l4K+cJa+vSBzb6xUFnK/H7GDyeqB6dJbTfIfT4WvtUidM6z GjklnxbnXPS4hFO4Xg+PoKhsRAEKI1IVVF3wY7o0BjfTu1EyDh5WKKVVa52EMH7f/xdpjI 9qp/OHDzcrvPSyHJivSf+RiqJEW05nn/oQ6AnkR2a82GOdJOEpKSDiByoxERnXO1uRtMTT RNdKMZHRu01/lxH5hjs89tvvLA2Rg+5w5JIWWP3tED6HYzQUTuyDKYcZPDlfqGlteMNevL QaYyCNSCl/DQ+DIpZ0qhMy3JnH76MTZoPJjMmhVqA22d0dTrlx5WzDjF0nCt0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP0FS345vzmx4 for ; Sun, 01 Mar 2026 11:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39a3b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 11:29:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5df6aca10906 - main - ed: add unicode support for the l (list) command 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5df6aca10906f669bc7095ff735eba6b8fe95ff0 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 11:29:00 +0000 Message-Id: <69a422fc.39a3b.73b7b4c1@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5df6aca10906f669bc7095ff735eba6b8fe95ff0 commit 5df6aca10906f669bc7095ff735eba6b8fe95ff0 Author: Baptiste Daroussin AuthorDate: 2026-02-17 15:25:46 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-01 11:28:29 +0000 ed: add unicode support for the l (list) command Use mbrtowc()/iswprint()/wcwidth() in put_tty_line() so that the l command displays valid multibyte characters as-is instead of escaping each byte as octal. Column wrapping now correctly accounts for character display width (including double-width CJK characters). Invalid or incomplete UTF-8 sequences and non-printable characters are still escaped as octal. Differential Revision: https://reviews.freebsd.org/D55365 --- bin/ed/ed.h | 2 ++ bin/ed/io.c | 70 +++++++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/bin/ed/ed.h b/bin/ed/ed.h index e1e41cf3fe40..fdfaf47acb4f 100644 --- a/bin/ed/ed.h +++ b/bin/ed/ed.h @@ -36,6 +36,8 @@ #include #include #include +#include +#include #define ERR (-2) #define EMOD (-3) diff --git a/bin/ed/io.c b/bin/ed/io.c index b3262ea9e217..3a1b6d8bb443 100644 --- a/bin/ed/io.c +++ b/bin/ed/io.c @@ -298,13 +298,49 @@ put_tty_line(const char *s, int l, long n, int gflag) int col = 0; int lc = 0; char *cp; + wchar_t wc; + mbstate_t mbs; + size_t clen; + int w; if (gflag & GNP) { printf("%ld\t", n); col = 8; } - for (; l--; s++) { - if ((gflag & GLS) && ++col > cols) { + for (; l > 0;) { + if (!(gflag & GLS)) { + putchar(*s++); + l--; + continue; + } + /* GLS mode: try to decode a multibyte character */ + memset(&mbs, 0, sizeof(mbs)); + clen = mbrtowc(&wc, s, l, &mbs); + if (clen != (size_t)-1 && clen != (size_t)-2 && + clen > 1 && iswprint(wc) && (w = wcwidth(wc)) >= 0) { + /* printable multibyte character */ + if (col + w > cols) { + fputs("\\\n", stdout); + col = 0; +#ifndef BACKWARDS + if (!scripted && !isglobal && ++lc > rows) { + lc = 0; + fputs("Press to continue... ", + stdout); + fflush(stdout); + if (get_tty_line() < 0) + return ERR; + } +#endif + } + col += w; + fwrite(s, 1, clen, stdout); + s += clen; + l -= clen; + continue; + } + /* single byte: ASCII printable, escape sequence, or octal */ + if (++col > cols) { fputs("\\\n", stdout); col = 1; #ifndef BACKWARDS @@ -317,24 +353,22 @@ put_tty_line(const char *s, int l, long n, int gflag) } #endif } - if (gflag & GLS) { - if (31 < *s && *s < 127 && *s != '\\') - putchar(*s); + if (31 < *s && *s < 127 && *s != '\\') + putchar(*s); + else { + putchar('\\'); + col++; + if (*s && (cp = strchr(ESCAPES, *s)) != NULL) + putchar(ESCCHARS[cp - ESCAPES]); else { - putchar('\\'); - col++; - if (*s && (cp = strchr(ESCAPES, *s)) != NULL) - putchar(ESCCHARS[cp - ESCAPES]); - else { - putchar((((unsigned char) *s & 0300) >> 6) + '0'); - putchar((((unsigned char) *s & 070) >> 3) + '0'); - putchar(((unsigned char) *s & 07) + '0'); - col += 2; - } + putchar((((unsigned char) *s & 0300) >> 6) + '0'); + putchar((((unsigned char) *s & 070) >> 3) + '0'); + putchar(((unsigned char) *s & 07) + '0'); + col += 2; } - - } else - putchar(*s); + } + s++; + l--; } #ifndef BACKWARDS if (gflag & GLS) From nobody Sun Mar 1 11:38:16 2026 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 4fP0S840wqz6Snnj for ; Sun, 01 Mar 2026 11:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP0S83CHRz3trc for ; Sun, 01 Mar 2026 11:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772365096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wpDKo/HeC0lU0r1QJZ/LoNXkm+u6etFw2CdRdFxfOMk=; b=nkehZhbivznEN1qnUWwaI7sMQI5PbS53fRMVMyFxI03hIIRohS22NkZ2mS8FJEGuR4poRA WxN7GJLC1egsQ8vPDX7S5/eCLQ6Y+qjmeUGS7IKSsjaDwvW7rGzG3DdLOOd90DY+SyVPLU 9HDR03Twt+Qhmk4Y4O3dXezYt5j+fVTa4Dp5NuFwpJr5gkYzJ3I7YYM6j9gkvIKIFSXu7f 1Apl50vW7+3hPj3WwC+kJwmhSjXThKkH50XztfVpyIdar/PYQ3pgV/mh4EMtb4ufCVtFX0 WLOQoVPd3Q0fLNEG9sTnVP9rz9cINuGPMkQhroF7/CJGvAHn3X8qc2FIDaJ9Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772365096; a=rsa-sha256; cv=none; b=vLvCj/jq2Xcr51vYo2C3nMWavd3Mz96I/7pyocinWemBNS7+QciwPZ75pPLtG3kVOjOvMw 3OVZVMZhlMFex6EoIuuam57q5E3y1Hj5V9HYgUTlW7EKwt4c+/Lr8Qf+SYKEScelNBJvXl 7eAYxe+3VeeFgoICSMTYEVPpKFXLYLeHgyr1ryTMUGh+hxDapu5sJzyUbiCd1fJuzn0gZQ 3XxAoB+1qtAbQO1vj++XibaRHyCYLogCCe9lF1/m/8fipjQLKadURe31xVdQVEHFsnvk0d oskjA5za2g9EKFJB7Ye3PEbdFgtmLLu6hu0KwgrTFOgEQYgy+kyf2AwB3DfHfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772365096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wpDKo/HeC0lU0r1QJZ/LoNXkm+u6etFw2CdRdFxfOMk=; b=xte6X1YDWWZvmzBEW/lxpIRPVvQEiiMsoaPJrwuKycEzz5nW6fSS8wQAhZx6CKIXXxzw+h 3sLcjle0BSlqvh2vtuOA/7lC26OuycgAyIPGy/Ce4+4BjFUXQ01rDEMP6E18Uf5HelIE4U Oex3sxYERVTsgvnOFnfV3Hc5mfoJ0vCu7nViRj+lcN/Cx9d8EIT1EDcqO67CBopWiZg1u3 g1+p7Fy2coqCQCYjq+f6GpJ3cf9Z1Zc2N/2cS23/qQk7+aZGGXkkyyGUQM7H9ZIyv4E4VK trgQTTTLwRyuBX6Yo9jLneSndL1oEOb3Mbup6MqMrI4adaLO+/kN+niPd1rT1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP0S82WQYznNg for ; Sun, 01 Mar 2026 11:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a434 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 11:38:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5ddfd1db271c - main - diff3: bump version to the date when the GNU diff3 compat was reached 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ddfd1db271cc675997a942da599c342ccb53afa Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 11:38:16 +0000 Message-Id: <69a42528.3a434.6dec3867@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5ddfd1db271cc675997a942da599c342ccb53afa commit 5ddfd1db271cc675997a942da599c342ccb53afa Author: Baptiste Daroussin AuthorDate: 2026-03-01 11:37:24 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-01 11:37:24 +0000 diff3: bump version to the date when the GNU diff3 compat was reached --- usr.bin/diff3/diff3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index c33e3275d006..fce4d353af69 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -157,7 +157,7 @@ static void increase(void); static void usage(void); static void printrange(FILE *, struct range *); -static const char diff3_version[] = "FreeBSD diff3 20240925"; +static const char diff3_version[] = "FreeBSD diff3 20260213"; enum { DIFFPROG_OPT, From nobody Sun Mar 1 11:48:16 2026 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 4fP0gl0jVWz6SqJZ; Sun, 01 Mar 2026 11:48:19 +0000 (UTC) (envelope-from des@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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP0gk75Nxz3vyT; Sun, 01 Mar 2026 11:48:18 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772365699; 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=DzSNYQtUSciN+400OBVCHzF0R0qbJkOjZUozLAN7TPg=; b=Q/gHrdunR5bfcGU/xFTd3WSBdKe3kmdohcSj79PeacFs4HhMYfgzaGM6rzfjm69YwM4kKG N31poBPBG+TGPXo06BM+EbHW6d+R2pf6uoRHVZ0MemTJ0mc+j9rM47W8Kq+5eDARa1n0PY hYhSPhDu+mUi2YNeUiGzNOA/ssPxEfnUGu3JFmcHa26GXHaUEoWHTVdqj6pi2Q+7jnrXfO pLXjmcBAfpE1vqKb5dY4Kg+CwadVPlh+IpoAmMDIgBmN5wFKaJdfXe/cXo5gBTlW0K20E8 foL+IDkVCloliBG1IjHl/e+NCnQGVxK9Wfg+ETO39nBN91l+RdGLsSnIvqVrAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772365699; a=rsa-sha256; cv=none; b=uWcDEUn/XFrP29/rqjsndld3WyGN0WyrBY9+ZXxhifouOL3nekKBWh1rIMlPZSZ2ZWyvDU NXqK1Mc9PBGsMCVmyNeyb2LUtYBYCweOgGShAL6JRnPPgyTVa2dX5A2m3XhjRWUdQYrtY/ AZR5dX52xYpwmVW6024/Pxaq/9kMoPGIIgSdgcIfHJ3BvMFfxvqFFMG6BFSIKYwIlvkeW+ vhshxIeQwxcDOR1FF3cfZt9v8K5IbY1L+7Z8AmkesmYcOeoQbwjfirwZMXXTjvV4OjVsCD 7EwPPqoSPMm47Bw1U9zhcdWFCSWRJ6GAFypJydb/noALipih+AB+TvOu/wTfkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772365699; 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=DzSNYQtUSciN+400OBVCHzF0R0qbJkOjZUozLAN7TPg=; b=SCsIIZxkTddsPX+I50f/IKiR6+WE5pq49d9GW6dablGnscCY26iVqLl3qFujcknICW15XO qHBR3IHgHhW1cClXPIsMZNoq5F2v31I053hnISaATlVofMlUgTCSuo067xujQj38HGuH9E 1wXDwJeL8ZkqcqiojmboAED2dCbscS/ALeamCXB3VS/R4iioh1PTq7pc6/S5ptcxCn/waZ Sd7mPp6D1SskBiDqLT3ljcRlyoubsYCeTIhczdHlw44kBIzc373Rv0M4TMuwNEo8DS/xY0 lfnmJjTSvAUn9f59PNJsOdDrVCTwT1Tqi3EGjFgCNxAv7mzum3dmUNCpx6K6og== Received: from ltc.des.dev (lfbn-nan-1-698-103.w86-236.abo.wanadoo.fr [86.236.35.103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fP0gk5SHNzDcM; Sun, 01 Mar 2026 11:48:18 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 01DA4F76A1; Sun, 01 Mar 2026 12:48:16 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Enji Cooper (yaneurabeya)" Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup In-Reply-To: <5A228777-56E5-49AA-9F20-99543F397059@gmail.com> (Enji Cooper's message of "Sat, 28 Feb 2026 23:48:21 -0800") References: <69a330d5.44fd2.56809847@gitrepo.freebsd.org> <5A228777-56E5-49AA-9F20-99543F397059@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sun, 01 Mar 2026 12:48:16 +0100 Message-ID: <86tsuzojnj.fsf@ltc.des.dev> 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 "Enji Cooper (yaneurabeya)" writes: > It looks like the diff3(1) code came from OpenBSD (at one point in > time). Are there any plans to converge/merge with that codebase in the > future? Theirs doesn't work. Ours does, and that took a lot of work. They're welcome to merge our improvements. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sun Mar 1 16:36:29 2026 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 4fP74F56Wxz6TFjQ for ; Sun, 01 Mar 2026 16:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP74F4KqGz3XR8 for ; Sun, 01 Mar 2026 16:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772382989; 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=aQIz2+qpxo2YYCLpag+jInYKLdH2eLa2gC9QhJjLKsA=; b=pnW6g3bqOym5/3dew8qBn2zBYPH7XKEx341e8V7TLS68e6Y8d0MRhwOm1USaPHv4xVxYeg xRkQeMAUSRDzSTtMyMnwAZFNV1mlXvR7sbMzDAMA1foA1N1Z+Lz9vbUZEpAxJTtcTH3o40 mFYoznsXTkyEKphjIGsVOCMgMDzUEcNH2XxzWZcN4ojNSCd1xWGsI30AhzyqorvAIL6cmN I2l78TNQ421UjAtvtbdwnJOMvAnB7O0iHWKhoCC7k4hPRHQo6bwkwZSyMpp2RdYmbZUrHy wHkbWQy7t9251asjZTbDvPU49Z2/PGXZxQthwsQNGmCiVhB8p3XT9kK5jQYG2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772382989; a=rsa-sha256; cv=none; b=Znmshm8xI54Jk/fMgJvL5hwXFlJuZ+LNY3q2FrAm6W06cqWfCNoRUjbaeQ1vGkfkbvbjpO W7DqLyjtFSR/7zeY8ExQVYrfzL1uVqHb5ZrfvJpocqnziJI4mEoNj4nnOprkvzDw9rKwb4 nnHwy1HCXt/TlBh3/COgFPqIhHdtfvNzBYwFPHTg1KDi+vd0Imgab0NpcuIHSW/HMrGSmr yGjcCi7LKQ+wHHDIcnzOB4HdsFB/bpQ4Y2r4qFoMXyvZV9tlNq9SilxNYiqakAnmlRVtxy tCxLK/yAIUZHMKYTRZyd9QAE8IcZVCpxCzaGllKBXXXu1l4RdJkSWpngQ25X8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772382989; 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=aQIz2+qpxo2YYCLpag+jInYKLdH2eLa2gC9QhJjLKsA=; b=nieKKeRWoNSTuIY2ascYcYxBQQNrTt3aHVYHeUlCSW1tf7Tf5wYTp6+BasZb/RyolyrJY2 jJAvMjauTPZJDLGOolUF7MdlH5tcururDrVyts+k8LDLzMDreOMVowoRwW5wtI9+M275wq CvrTlP8S/qHuXs52ygg6s23ZBVTJgX3PNdfyeVVq8df8yar8Xw6XKzL6338meqo/u56aTH DGeAktwX5hldrkRUiSL1zKA2pBAo77hi1Y2/Al85z3yjsMH5Bw7SIaUfcni8sE+Sp0JOQZ FmG4qlq4kWvCYpEHtTvRTXvelkeen8oG2ntKNpwY+aEIrJX8umwWkABIqYphJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP74F3V6tzxFp for ; Sun, 01 Mar 2026 16:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a5ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 16:36:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Faraz Vahedi From: Warner Losh Subject: git: 4ba5c9d015f0 - main - paste(1): Utilise STAILQ from in lieu of the home-rolled linked-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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ba5c9d015f02eb1fda30de26c23690dd41731fc Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 16:36:29 +0000 Message-Id: <69a46b0d.3a5ab.5275dbf3@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4ba5c9d015f02eb1fda30de26c23690dd41731fc commit 4ba5c9d015f02eb1fda30de26c23690dd41731fc Author: Faraz Vahedi AuthorDate: 2024-10-08 09:41:42 +0000 Commit: Warner Losh CommitDate: 2026-03-01 16:36:15 +0000 paste(1): Utilise STAILQ from in lieu of the home-rolled linked-list Signed-off-by: Faraz Vahedi Reviewed by: imp, oshogbo Pull Request: https://github.com/freebsd/freebsd-src/pull/1443 --- usr.bin/paste/paste.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index 8114a85a869a..fa8be54ebe53 100644 --- a/usr.bin/paste/paste.c +++ b/usr.bin/paste/paste.c @@ -33,6 +33,7 @@ */ #include +#include #include #include @@ -106,43 +107,43 @@ main(int argc, char *argv[]) } typedef struct _list { - struct _list *next; + STAILQ_ENTRY(_list) entries; FILE *fp; int cnt; char *name; } LIST; +static STAILQ_HEAD(head, _list) lh; + static int parallel(char **argv) { + struct head lh; LIST *lp; int cnt; wint_t ich; wchar_t ch; char *p; - LIST *head, *tmp; int opencnt, output; - for (cnt = 0, head = tmp = NULL; (p = *argv); ++argv, ++cnt) { + STAILQ_INIT(&lh); + + for (cnt = 0; (p = *argv); ++argv, ++cnt) { if ((lp = malloc(sizeof(LIST))) == NULL) err(1, NULL); if (p[0] == '-' && !p[1]) lp->fp = stdin; else if (!(lp->fp = fopen(p, "r"))) err(1, "%s", p); - lp->next = NULL; lp->cnt = cnt; lp->name = p; - if (!head) - head = tmp = lp; - else { - tmp->next = lp; - tmp = lp; - } + + STAILQ_INSERT_TAIL(&lh, lp, entries); } for (opencnt = cnt; opencnt;) { - for (output = 0, lp = head; lp; lp = lp->next) { + output = 0; + STAILQ_FOREACH(lp, &lh, entries) { if (!lp->fp) { if (output && lp->cnt && (ch = delim[(lp->cnt - 1) % delimcnt])) From nobody Sun Mar 1 16:36:30 2026 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 4fP74G5nFhz6TFvH for ; Sun, 01 Mar 2026 16:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP74G4JdHz3XP8 for ; Sun, 01 Mar 2026 16:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772382990; 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=ztmBm38jg4NyTlikWH5wg1uyDbmAJUzdCS4uJBPdWgs=; b=grNWTMbn1Aj6bon8Jb74IJKU9ju4nrDEz62QwA9jlRSFidh1q0BcKfGpj7NKyRg5TF6M5R +cOoySpFNsG4Vfw5cjRBU4yNsOBpe2Ont8i8QC+U9TajRvTFRnPqeWifcvPqUOQn/RjQDU auxke0QGdP2nceFrfPILj9u2tD4YqREx/BjSxwyavq3FjCask72loAihli8t2FwiYiW3QC HRDRnOzN6lwWWSUHszPKZjrncortBS0Z9V3Ls0VtkngUDsdJ4vb4Wcu1C/1VrQ2gVnLdVd PsZHZEe368sD9zKkRXpE0iXc54BFiL9585u0ytje8x/kuWUAoTYnQ6QkwRs2sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772382990; a=rsa-sha256; cv=none; b=A/1bCD8gvBSxb2MXnGYHRKTHJJiiIaTrQLhzU/48q37kpoWeefLvMNMTOXKQRUrEg+mUaa b6cCCIkWsFUHsz/EXyWe2oSudkWtSRFYVah7Ozd70Kywsdwk5UJKelyYic/35Qy42ZUmJx lYp1frGnnhUaJ+aAmm0tBou2pa5OfOGcDq6x7AZUv9vzEMfAfjmIwApF/my1J48mcThWXk JxniGozsGsxNi2U41rU4gZm1Cdck7AnqN8JsKQmpcJzVS5/rMeViuGgxqSqlROPpimGPxE 24PneahFA+Z+2Zl+r8I5v1yNjP+6gaq2uFvNu+vxvBCCyb8vuWf9WgBSr6lTHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772382990; 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=ztmBm38jg4NyTlikWH5wg1uyDbmAJUzdCS4uJBPdWgs=; b=BY59kOZCiCzP5vO52oiiSxXHGqh+yHH8bvFC6xbJQrJrL9cb7ZxHG/UbDUMJYzTnXK6wit DwE6OG+XlN5n+3upyK+FExztvhbedDNp2DI/3JRK1H/Etw0WV4mLrTxVNAJboAcH78rtkF cT3Il1bsPih/Fu6BA4TDk5ekyapPO2Y3WPGeb5ftFRHdu7YCfaDY3jJAMOoEm4cgwJBSlT k6OpxzluBSkFq2yd6IA5BG41mMvZFfp1Giw/VrPeV/BSC8kiT5zXcPaO8/mDA5gdeSe1jO YQyr5a3WSZXHPycRClCiFZJ+ziOT37zjKbtGBk1RTeKiAUSHCjdc7EXqvtCX6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP74G3s9bzxQd for ; Sun, 01 Mar 2026 16:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a995 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 16:36:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Faraz Vahedi From: Warner Losh Subject: git: 2e01fc43f23f - main - paste(1): Make small modifications to improve readability 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: 2e01fc43f23f0e960dc08984ffaff2d1e6ad5cea Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 16:36:30 +0000 Message-Id: <69a46b0e.3a995.5c297bcd@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2e01fc43f23f0e960dc08984ffaff2d1e6ad5cea commit 2e01fc43f23f0e960dc08984ffaff2d1e6ad5cea Author: Faraz Vahedi AuthorDate: 2024-10-08 18:09:39 +0000 Commit: Warner Losh CommitDate: 2026-03-01 16:36:15 +0000 paste(1): Make small modifications to improve readability Signed-off-by: Faraz Vahedi Reviewed by: imp, oshogbo Pull Request: https://github.com/freebsd/freebsd-src/pull/1443 --- usr.bin/paste/paste.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index fa8be54ebe53..39e2577200bb 100644 --- a/usr.bin/paste/paste.c +++ b/usr.bin/paste/paste.c @@ -99,10 +99,8 @@ main(int argc, char *argv[]) delim = tab; } - if (seq) - rval = sequential(argv); - else - rval = parallel(argv); + rval = seq ? sequential(argv) : parallel(argv); + exit(rval); } @@ -118,7 +116,6 @@ static STAILQ_HEAD(head, _list) lh; static int parallel(char **argv) { - struct head lh; LIST *lp; int cnt; wint_t ich; @@ -244,7 +241,8 @@ tr(wchar_t *arg) default: *arg = ch; break; - } else + } + else *arg = ch; if (!cnt) From nobody Sun Mar 1 16:36:31 2026 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 4fP74K0p5xz6TFjR for ; Sun, 01 Mar 2026 16:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP74J2jMZz3XJt for ; Sun, 01 Mar 2026 16:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772382992; 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=HCxszVFOsMCwHEZLlCZswBBfY2OBE7UWzwB92wSktiU=; b=u2ukrDUct+cY7H8CNTJBqrvxw/a9GHgGiG3ZjLigxNbRhMNVht2JNoTXH0V3IhjDfyvdX0 rEjQhAwRl+j48wDos21ZjexrQAO6gIGXCEtoQkHBN4k42V+PjVd+TsTz5k0FCiJ13tJtLr wHfsc4lVGfFTFOo97h+t5pAEgSmMBPaYMw1/qO4XaucCtvk4I3v/bTaDA5eu8x+H6RA6vm HSB2AQlGnbkHQbPv/PfWnkkHjDR5r+K4DYFEEbLMSyQin21Dk2ytEVI3LpT8fqzlOoeyvg W/ZUVOgFPKP8kffCbs9uOHkz+5h6cjgaDwBAmyZZHHRSFnvNes+N7Tb3fgN0Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772382992; a=rsa-sha256; cv=none; b=rfqgXpX13/MWrbiLlu8H8zdENA+4sMmYb616LeEl44vius2q4MtWv9qgKaFOxUEq2B3Z70 Eot9om0jcOGFicC/CVJluuUNLpgKxVsgFuJcZnyEgxpMTtgYElpuBYxL+ujWmCYYSBxszE jtI9FjalwQiVXAPAgrscxC5IWQwY2T8ly3boUiajt/rPnl+EIknuRBXmgZGIMD2IXy4n3q rEtxpCmclnJl3m36BIWyco24nF43aPxg1h9UMl8+1ls7rD7Z4ZrIbldzbi/ZdzTJzOxQqi FZHmGxPhK8onbseHG7tEy1N7p/+R4RgCP+8T6j2F0qQ5Msvc1MUrxhOCZsbYTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772382992; 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=HCxszVFOsMCwHEZLlCZswBBfY2OBE7UWzwB92wSktiU=; b=EpYUXUD7q9NumvnKzfAa9bQ5R/SrfGL1iy4ZESp2bFHvcLUKo52h6CWsxl53EWZBMSHrjD NWrcT9ox9HMNlFuMOb/IGohhvnXposd+KKFlBajjm0yRNWIX1whD6QtHcyBPHj8lHW5ldy 224jIgcKubOeLJ0P3GHMw4JbYp/THTuExIobS12pm2sQcvsNU4YYFk+WrTXhCgvrwr8ijg ho3rsOT6mWEUwuxUiCxWcla0a1Kl6zLkb8XS97+4ZMF4dEKQ8zSQZRBb4wGfGa8YXvzJRZ Viq1NajlJxUz9Co9Vn9pCzcTa1cQJ0NPoLgiWMH3ovZkw//URTB7q97nD59xcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP74H4cvTzwwh for ; Sun, 01 Mar 2026 16:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a99a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 16:36:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Faraz Vahedi From: Warner Losh Subject: git: 452ee04d62e2 - main - paste(1): Capsicumise 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: 452ee04d62e22fe923a0b616076715dad0166c98 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 16:36:31 +0000 Message-Id: <69a46b0f.3a99a.a05274e@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=452ee04d62e22fe923a0b616076715dad0166c98 commit 452ee04d62e22fe923a0b616076715dad0166c98 Author: Faraz Vahedi AuthorDate: 2025-08-06 13:31:06 +0000 Commit: Warner Losh CommitDate: 2026-03-01 16:36:15 +0000 paste(1): Capsicumise Signed-off-by: Faraz Vahedi Reviewed by: imp, oshogbo Pull Request: https://github.com/freebsd/freebsd-src/pull/1443 --- usr.bin/paste/Makefile | 8 ++++++++ usr.bin/paste/paste.c | 32 +++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/usr.bin/paste/Makefile b/usr.bin/paste/Makefile index e4f9e6d817b5..33fcb91db84d 100644 --- a/usr.bin/paste/Makefile +++ b/usr.bin/paste/Makefile @@ -1,3 +1,11 @@ +.include + PROG= paste +.if ${MK_CASPER} != "no" && !defined(RESCUE) +LIBADD+= casper +LIBADD+= cap_fileargs +CFLAGS+= -DWITH_CASPER +.endif + .include diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index 39e2577200bb..cc029e20ea9c 100644 --- a/usr.bin/paste/paste.c +++ b/usr.bin/paste/paste.c @@ -34,9 +34,12 @@ #include #include +#include +#include #include #include +#include #include #include #include @@ -45,11 +48,14 @@ #include #include +#include +#include + static wchar_t *delim; static int delimcnt; -static int parallel(char **); -static int sequential(char **); +static int parallel(char **, fileargs_t *); +static int sequential(char **, fileargs_t *); static int tr(wchar_t *); static void usage(void) __dead2; @@ -62,6 +68,8 @@ main(int argc, char *argv[]) wchar_t *warg; const char *arg; size_t len; + fileargs_t *fa; + cap_rights_t rights; setlocale(LC_CTYPE, ""); @@ -99,8 +107,18 @@ main(int argc, char *argv[]) delim = tab; } - rval = seq ? sequential(argv) : parallel(argv); + fa = fileargs_init(argc, argv, O_RDONLY, 0, + cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_FCNTL), FA_OPEN); + if (fa == NULL) + err(1, "unable to open system.fileargs service"); + + caph_cache_catpages(); + if (caph_enter_casper() < 0) + err(1, "unable to enter capability mode"); + + rval = seq ? sequential(argv, fa) : parallel(argv, fa); + fileargs_free(fa); exit(rval); } @@ -114,7 +132,7 @@ typedef struct _list { static STAILQ_HEAD(head, _list) lh; static int -parallel(char **argv) +parallel(char **argv, fileargs_t *fa) { LIST *lp; int cnt; @@ -130,7 +148,7 @@ parallel(char **argv) err(1, NULL); if (p[0] == '-' && !p[1]) lp->fp = stdin; - else if (!(lp->fp = fopen(p, "r"))) + else if (!(lp->fp = fileargs_fopen(fa, p, "r"))) err(1, "%s", p); lp->cnt = cnt; lp->name = p; @@ -181,7 +199,7 @@ parallel(char **argv) } static int -sequential(char **argv) +sequential(char **argv, fileargs_t *fa) { FILE *fp; int cnt, failed, needdelim; @@ -192,7 +210,7 @@ sequential(char **argv) for (; (p = *argv); ++argv) { if (p[0] == '-' && !p[1]) fp = stdin; - else if (!(fp = fopen(p, "r"))) { + else if (!(fp = fileargs_fopen(fa, p, "r"))) { warn("%s", p); failed = 1; continue; From nobody Sun Mar 1 17:06:28 2026 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 4fP7kr47BKz6TJKC for ; Sun, 01 Mar 2026 17:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP7kr2lP3z3dJQ for ; Sun, 01 Mar 2026 17:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772384788; 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=Herdu/JSLr6GBcN8Hhd/dsfu3/sBzlw8596Ta6m821U=; b=iBVP6efsc4qAuZ7Fsxr0xX5CYvmbW9fjzHAayhfNI+kwhlplvLfd59jawCOULVyNt1UtRo svnHwDJFjgQMwTIHmdtn27sa4bOs7tynZZJ93RxCfDyq4iz3U9qeppFfgiml2/q3pRtNy4 t2HhvbOIcdOkc3vhJFwhcZUV22qnM9C6PqnyKpp2uB8Rn4wBxgmQaB4ppzHUPLncU3O3mn vcps9Ks1spJBB5k6z+dk2bt7nI5KEPBvRN3y/9hWf4QumFvoQSlp1WSduGGUkHv0E3bGzb 4M+LUNOwWFrgtEF8FXZHvV78L5LB7lTO/zeY8KXn/c2iRAmgZfw35hevIHMJsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772384788; a=rsa-sha256; cv=none; b=DELKNGiGmV9+GDGZ0+w3sx1ifEEmyRtJPc3BRM8gpshNTYX/7muD+2maY9Z6GAizJQgydM Pao8hMDlWYxk/rNa7gs7sQb3c/wk+1NNsEsySTmwNQH5eEHJprQDKgZFvmZUbyWNKWrkyT UCgbbHQa2CU7W77i4Q/Z9+tBzyZoKehCb3xqzw/y0p4npv5bmRlu5UdNiuJ0rOcruECU/9 b+MlGdN6gwbwVvE+/4A0CiptZsS5HoqmRjxrw1KapMZigT46/hgLqdliLABbr1ACEFmjgl DCFh8q+szMkk8xAMwtiIE0FW2TXichiYrqCVq/W5ufvUmKzfBVhx8TWzNwOEZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772384788; 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=Herdu/JSLr6GBcN8Hhd/dsfu3/sBzlw8596Ta6m821U=; b=XAfDQlJ7YYSXS/iSLmnQOsde38b48UdfihXqOVnwS1bwntlTW7ATAcsNpeZasa0XZRItwq uU0DNzudQZ0536sFTQviPDEIP5Bcx0eQIHgKO6V/dhH0q87xG34f5MXAX/yFJUstJYdGII l1oQLKNmQHTDaP71mbajaGdQqzec+BIBzGLMruFSWKFszvjRc7EPcnCnuPuuXGDIt6XbHl vzpr45S+EtckSOfiTcOQx5X1CiUHBQmhBj9DIRAUHCpedpntoNev4/NLq5hubna9yPZc7i xg7iSv7du1RdyimqJXOtaHRav/8S9MwR9gHX86YZ73mELJ9MCI8o5vs9o6Gb9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP7kr2H7MzxTL for ; Sun, 01 Mar 2026 17:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ce5e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 17:06:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Faraz Vahedi From: Mariusz Zaborski Subject: git: 4a4c88533712 - main - from(1): Capsicumise 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a4c88533712f98a6b8fa04acb319f26aecccc3c Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 17:06:28 +0000 Message-Id: <69a47214.3ce5e.51938112@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=4a4c88533712f98a6b8fa04acb319f26aecccc3c commit 4a4c88533712f98a6b8fa04acb319f26aecccc3c Author: Faraz Vahedi AuthorDate: 2024-11-01 11:03:56 +0000 Commit: Mariusz Zaborski CommitDate: 2026-03-01 17:03:13 +0000 from(1): Capsicumise Signed-off-by: Faraz Vahedi Reviewed by: imp, oshogbo, markj (previous version) Pull Request: https://github.com/freebsd/freebsd-src/pull/1491 --- usr.bin/from/from.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c index fb194dcc72d0..da9c6a7583ca 100644 --- a/usr.bin/from/from.c +++ b/usr.bin/from/from.c @@ -31,6 +31,7 @@ #include +#include #include #include #include @@ -102,6 +103,9 @@ main(int argc, char **argv) else if ((mbox = fopen(file, "r")) == NULL) { errx(EXIT_FAILURE, "can't read %s", file); } + if (caph_limit_stdio() < 0 || caph_enter() < 0) { + err(EXIT_FAILURE, "capsicum"); + } for (newline = 1; fgets(buf, sizeof(buf), mbox);) { if (*buf == '\n') { newline = 1; From nobody Sun Mar 1 17:06:29 2026 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 4fP7ks4Q0Mz6THVW for ; Sun, 01 Mar 2026 17:06:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP7ks3cHkz3d7B for ; Sun, 01 Mar 2026 17:06:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772384789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rme+xbaLX2T7YMAs3F06iQmdm/X7DeJQVEKEjXbeUjE=; b=owZuQ32txYKSlTa9nDyeBmOWGG4tBaJsrOmv2JtrICN4kB8Ce/RPeWuu388cj2gw30raJT oBnvk16JsyzyooEQfCVfiemkC+7lzRnpaeIkNJPMAGSgcedfya51TrolE+0cmMMioeZw/+ REmrWioaN7jcY91UI3SsNJwY9MjlHuxZfpNa+j/C+PLKuLrTav6AemAVhiIK4duUjIbwbK KU9ZQIj+RvYsvNDvMcxiB4GvWVjSEUEP4j2ue+TYHJWAgxWCOGUchYwRhwM9o0d2Vz7R8x tkdnbefe4bnAqOUfKBCseQP1uj3PCj50j9ihXLP0Uz2A0KoaNPT2x1R+errM6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772384789; a=rsa-sha256; cv=none; b=G80JhPGYgNLCO/RHceVd6YFWhVMFSIuF5/n/4xob+kzIYJAeYtTbPG55DOwSMUgfpbpILS WFWc+F6FG3ENwU3LGluVFyPvFi6QpdaQeMZpSetwoP7UR+jBDoMwCFHhJTn5oXPexyTeY3 r3eXTMLSaNqtDKvO4rF+BjxsiQpEtHNJpAQwH5fWIqcQPn+SBoJKxL7K0c6JxRXR52IOOQ S3ZReOcNrYY8loUIcO53+Yx5XfSFSMxUEHOU1D/3zoUS6eJ3bx5vM+6YdAwxUz5PzcTdHL 4TMtUkDHaMpHrlElTbU+a37AP95azW3rUxMRqj52Gp2cNE0s7IpXSi09P0UU2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772384789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rme+xbaLX2T7YMAs3F06iQmdm/X7DeJQVEKEjXbeUjE=; b=ieXnzuDNW2jGAf9wsKD4nJUuDi3Kdj8PmtQeTt2g+3ZNj79JKqpkmmzxQuSox6eDquVE8r xINHOBHY1LmQBO9DH9Q2QGWSO+/G68GH5Une5wau03SbaJuAm9KOiasRTfd6GIWeJltB41 M3bcrGK28iqblVI6rAcd8+/2XLZAGMbnnFEJLjH+2f9GbmtIDyZ9kBuHSeZaVvbPaoM5jB DwEuCMQUYsVhTJyh8p5kNI+kR36e0O6VfxGWBXTA9Gqcdg3NLsMhV7GuIBWcaI7kuA8UNx vlwaSyA5AKpMspm08HiEw+FNvyVFF8Jrov3W4HD3x5gExEPSUBlCR8aice3VuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP7ks30Rdzxyq for ; Sun, 01 Mar 2026 17:06:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3da88 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 17:06:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: ffe7d45d295c - main - from(1): style fixes 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffe7d45d295c553ed90ad3b5cc67111450063741 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 17:06:29 +0000 Message-Id: <69a47215.3da88.34c22ad3@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=ffe7d45d295c553ed90ad3b5cc67111450063741 commit ffe7d45d295c553ed90ad3b5cc67111450063741 Author: Mariusz Zaborski AuthorDate: 2026-03-01 16:56:37 +0000 Commit: Mariusz Zaborski CommitDate: 2026-03-01 17:03:13 +0000 from(1): style fixes No functional changes. --- usr.bin/from/from.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c index da9c6a7583ca..63eb69daf36a 100644 --- a/usr.bin/from/from.c +++ b/usr.bin/from/from.c @@ -99,7 +99,7 @@ main(int argc, char **argv) /* read from stdin */ if (strcmp(file, "-") == 0) { mbox = stdin; - } + } else if ((mbox = fopen(file, "r")) == NULL) { errx(EXIT_FAILURE, "can't read %s", file); } @@ -122,7 +122,7 @@ main(int argc, char **argv) } if (count != -1) printf("There %s %d message%s in your incoming mailbox.\n", - count == 1 ? "is" : "are", count, count == 1 ? "" : "s"); + count == 1 ? "is" : "are", count, count == 1 ? "" : "s"); fclose(mbox); exit(EXIT_SUCCESS); } @@ -142,14 +142,14 @@ match(const char *line, const char *sender) for (first = *sender++;;) { if (isspace(ch = *line)) - return(0); + return (0); ++line; ch = tolower(ch); if (ch != first) continue; for (p = sender, t = line;;) { if (!(pch = *p++)) - return(1); + return (1); ch = tolower(*t); t++; if (ch != pch) From nobody Sun Mar 1 17:06:27 2026 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 4fP7kw70vnz6TJ6F for ; Sun, 01 Mar 2026 17:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP7kw4dlcz3dKb for ; Sun, 01 Mar 2026 17:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772384792; 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=ySY3wWKSQIUfL1VbaoDeyR/J7SPrZhvI4UCBkJenqY8=; b=UV/q9YxtK+47FR87aQMCkJYQ74DB2NoXquFm87VcvtuJ1NZozQKm1oF68hibpTUU6l8/37 urR3Crt0oGVm439HsWDObJnOLho6Bl2K622sTzZCORZI+5uhQ/MFsAAzc2I9osV4SjyDJV rr6OEcp9Vyj22Au7I1eEdkUb+ZvS53H7rw1wmguX3Gj/xAqOogbZsFRzL+ji+VG57QoRJs HE+jYUtc9DX+Lq/qw62kbIo/Tl0O5mqfBqXc7djRcq50Dx2ZA3GYt4OcdP6iB3I/LpYj53 01ZaHXcZER3e9PklK69GzYBKGsHN5K7aniGTBv315Xokq+i+VlqVlPonfgHAsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772384792; a=rsa-sha256; cv=none; b=D+7hKB5H+Xs2M5VUmljMSVgutB1rQIaFU0zpDv0pkMXzuenn4xLZysCSjrNBfvxA77cLa/ uuJoE0+WQWkjXCcByECpIAqeikj2OcC2mhk2EUcBkP9Q8BALwR/NSQ2LY5XSaUn2SRF/Ho zpBkex4TFBQya4T8/dQzUpOIrii20e2ZCRRI/B8k3r1yboLvOtUVkvH1BAlfA1x7TC0s1T OnI8/KpJEYOIEkzVV7tGrCcyIxpVRhnOl4mODaelbuFvkNOOjj/2rCrFJvkEBOEyr/Xth4 Owduq9WXxKo3lsWHW29x/zG/a5/YvQYwFAzDibq60LO5N3r5r0sphRVQcNzUgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772384792; 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=ySY3wWKSQIUfL1VbaoDeyR/J7SPrZhvI4UCBkJenqY8=; b=E6yY7IxPS7wXg6l6DjLB2rLPuQvRiwZs3PI8BxVk09IdapEHi/4s1LUt2eOTcVnOwvY+uv A8bzBFC60DhO2mlyJMtypgFwKDW33FZxAar4EZvp7oqYQLSyKx6P2IHVUT48fq47ZpgQIc Rtao76SYvAciFf8xJ5xIroCDKhszDKX0wHkgWlsg5QsxLMgoKH/bhLzR2CaYM4Idqus+Di /RXMlE6CnTY/wdgdq1ryy7QJpuoIp9eOdQSpe6O1InJ/Rv72y9ktxt2u4h2g8Jz4dGf97s 5q5BqNwlGqb5GMNtMpxImMEaKdHfkD2Z11O3xhhs+6hs/jnIJparoN6K1N/RgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP7kw3j0gzyBH for ; Sun, 01 Mar 2026 17:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dbbd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 17:06:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Faraz Vahedi From: Mariusz Zaborski Subject: git: dde5113f470a - main - from(1): Replace magic exit codes with standard macros 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dde5113f470af34bf917ca2690d89c94dc8d6db0 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 17:06:27 +0000 Message-Id: <69a47213.3dbbd.32c6f3f7@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=dde5113f470af34bf917ca2690d89c94dc8d6db0 commit dde5113f470af34bf917ca2690d89c94dc8d6db0 Author: Faraz Vahedi AuthorDate: 2024-10-26 15:28:07 +0000 Commit: Mariusz Zaborski CommitDate: 2026-03-01 17:03:12 +0000 from(1): Replace magic exit codes with standard macros Signed-off-by: Faraz Vahedi With minor changes from committer. Reviewed by: imp, oshogbo, markj (previous version) Pull Request: https://github.com/freebsd/freebsd-src/pull/1491 --- usr.bin/from/from.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c index 031803ebae16..fb194dcc72d0 100644 --- a/usr.bin/from/from.c +++ b/usr.bin/from/from.c @@ -30,6 +30,7 @@ */ #include + #include #include #include @@ -99,7 +100,7 @@ main(int argc, char **argv) mbox = stdin; } else if ((mbox = fopen(file, "r")) == NULL) { - errx(1, "can't read %s", file); + errx(EXIT_FAILURE, "can't read %s", file); } for (newline = 1; fgets(buf, sizeof(buf), mbox);) { if (*buf == '\n') { @@ -119,14 +120,14 @@ main(int argc, char **argv) printf("There %s %d message%s in your incoming mailbox.\n", count == 1 ? "is" : "are", count, count == 1 ? "" : "s"); fclose(mbox); - exit(0); + exit(EXIT_SUCCESS); } static void usage(void) { fprintf(stderr, "usage: from [-c] [-f file] [-s sender] [user]\n"); - exit(1); + exit(EXIT_FAILURE); } static int From nobody Sun Mar 1 18:07:29 2026 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 4fP95J4GlDz6TRWV for ; Sun, 01 Mar 2026 18:07:32 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) (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 4fP95J260tz3lL3 for ; Sun, 01 Mar 2026 18:07:32 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-824c9da9928so2088053b3a.3 for ; Sun, 01 Mar 2026 10:07:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772388450; x=1772993250; darn=freebsd.org; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:from:to:cc:subject:date:message-id :reply-to; bh=SFZXgfDPp2goYleTOPmGRGo3YmCTEYJxbhm00F+yfYg=; b=R0xr/tT1SpnOFzeJ9Egqjv8/ub9be3sMIvOvFhCgDYcDmL/5NnFOF/a/xHnbu1+H5G kEzmd8z9AzKtZOZAc+SejgDYfGcLPT3s8p1P2sD0jOeHDw349BljGIxPeu3+lT+p6gNb GyS4Yw3teUab0OW5qYwi26noeVXr0IuPta0Bbcli0CDlnFDnl+VQLTntME9sdDDW2/EN 4z2CF+ifrQKLncZeReaqOqmdIE4B3ylh9cSmAVT0cFSvOTzXuLkC/C3qCKAFv8rNuBHx ZiVrFW/RpUTqBpQFHt0xAYdw5sFxgi5jshhAvRgPcMH9g/kkTbmNkSobn1j/jrT19vx8 QvFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772388450; x=1772993250; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=SFZXgfDPp2goYleTOPmGRGo3YmCTEYJxbhm00F+yfYg=; b=IBMsYysIgSRSW5NqyuMjhFWDGfSipoE8Z3oouaLgKZ3ChzDuWd2sKuDH8Va/ibSwh3 pzFy8jdAFUKa3vcyi+QjBUnOH+WhqlHetkWFlB/7CEnc5anNWDlyMGWgEijYJlaPACTM PsR3EHiDyaCLq+fwYnEfL4zVq8BnlqzWD4Q2V/2xxtsZr3wDdwi5NV6IG+VGJm8JVRFV x4C6pKPyXc3wZWlM16/2Yf8HKyOAA/LQsuVWcQVDxLf5zMFFnQDhrgJQS85fuWctyQOU YqBV0nn51bLKDKXKpShEhgdhWCOVveBMDp2SafPTgoGZY/3LGaSaIadsco5SSh1KJzv4 l2rQ== X-Forwarded-Encrypted: i=1; AJvYcCVRAKvYECOCS9981HID3WrW1BYk3n2nb/BLhoMH1PR0EOf9NWX1xDBFymdsqiSSOWp5DSVCwUU+wbYoiqDNWZQ4AgzROA==@freebsd.org X-Gm-Message-State: AOJu0YwWc/I8E1hJzcEUdgf+aLXVyKl/m9Fe00BvaoWRsPsyJ3/Ewevs nOtaVwBd5yU35zYbsHVlsF76+z/DrWSA58Hh60KX1pTw0AcVKqVFcbiG X-Gm-Gg: ATEYQzzJC48tO+o3boadI+OisMcZAO0/S3/z4EVur88oTK4q05iPfHoCu4KIZaQuP7t UxCpNA3GUqX9cYwy3xy9UfRDxhQXHNlVCNONjeVMjLhv6sUqY/IAVRGfwtD9Cq/6bptO0w3wWCX tYEhK+yh3KLr0Kr3VHrXApc3KdCllRYUHjFMfUhbsFuSLWybAgxMVcTe4/Z2BwI2mIcFkmU7HnG Lb5IhetkgdUM3nxnKBLqjpOUQJb4t6oKGLHZ8NtNP0Oikv+Q7kBJ23MgUl3e3nXnh+cJuu8K7KN 6z3aSfQLOyKP+NCXSF3P7V3L6B8ZeJlSIYDXg+3O+uHg7Lq6iq+bhGDyDaI61sk5BBR67b8dN0l t4QyGIwlscWacs7NnSze22LcxdptMlqXZKvQulMrJgxNJkPChHWXpNPgBv1auGsE5EzcFy2Q18h 3/KKnY+5673flnYDerRf1eiu+1EEujCfkWu/AjdgGHSFYFjA== X-Received: by 2002:a05:6a00:3e1e:b0:823:f74:662f with SMTP id d2e1a72fcca58-8274da093aemr8620723b3a.51.1772388450032; Sun, 01 Mar 2026 10:07:30 -0800 (PST) Received: from smtpclient.apple ([162.118.1.182]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d8805esm11308424b3a.16.2026.03.01.10.07.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2026 10:07:29 -0800 (PST) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Enji Cooper 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 (1.0) Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup Date: Sun, 1 Mar 2026 10:07:29 -0800 Message-Id: <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> References: <86tsuzojnj.fsf@ltc.des.dev> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org In-Reply-To: <86tsuzojnj.fsf@ltc.des.dev> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: iPhone Mail (23D127) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fP95J260tz3lL3 X-Spamd-Bar: ---- > On Mar 1, 2026, at 03:48, Dag-Erling Sm=C3=B8rgrav wrote= : >=20 > =EF=BB=BF"Enji Cooper (yaneurabeya)" writes: >> It looks like the diff3(1) code came from OpenBSD (at one point in >> time). Are there any plans to converge/merge with that codebase in the >> future? >=20 > Theirs doesn't work. Ours does, and that took a lot of work. They're > welcome to merge our improvements. Thank you very much for the reply, the explanation, and all of the hard work= making core utilities like this function. I wasn=E2=80=99t aware that their version didn=E2=80=99t really work; the RC= S Id in the file was ancient, hence the question about reconciling with Open= BSD (I thought there was a chance that we could maybe leverage some of their= code/fixes in the future to reduce maintenance effort). About the sysexits change: is there a reason why it was made? I=E2=80=99m as= king because another recent change made by an external contributor introduce= d sysexits use, whereas this change removed it. I want to understand more of your thought process and which way userspace co= de should be moving in for the sake of consistency, so I can follow similar r= ules as needed, enforce them in reviews, etc. I don=E2=80=99t want to clash w= ith other developers unnecessarily (I remember sysexits being a point of con= tention with some developers in the past). Cheers! -Enji= From nobody Sun Mar 1 19:03:47 2026 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 4fPBLD19V0z6TW3q for ; Sun, 01 Mar 2026 19:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPBLD03LWz3qgL for ; Sun, 01 Mar 2026 19:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772391828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vKNy/pbPnCHtUnIWMWcUkBQYXC+kvXJ/arYiJATPI4I=; b=gjsWbba+XnzoegUh9XQqDwtqcxXVXvniBiNhAAO0yEw6f6chftGNZ3YttBUqow9EE8Ot89 GKf6E/GBK17QZtyRjBo83/hV5H5hD93rBPRNUGJhLstZdKe8hw1tpbMPXh2wYiE/R21xER Qqm+72gnN0XEJRe/rkikcp0S+7QOyMVHrtN0fdoAXfUJm8YrPUnpz+5TlhbOxWf56guNdN vCMHwfZ5wl9SqNXlD2UYjBvFhxYQJ8uMH3CgnmscNw/c/6nwS/6eHUNqnAlXaVTVGz5OeM 7iYf+1Vsx9z+N8vZ/183v27gy9+4HrJoHXTZRAraxe5KvobUZY1ibo7T3KE7dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772391828; a=rsa-sha256; cv=none; b=hRzP1GtxVMIqTS4OdZNr2ToHuwUFeAd/XH21t94Kz2BsUrab4dWVoi1n5nx2j/Q/fBAoJF 49CT5akPZEZf6JRM3XhRdt3ffKMMyE+BjyRlIGNclAyx6p+PtFjUnx1UiVm3YuySSfOFfK qRrqfGKdkzvLcKFwEZOpuGIhyQLX9OTJX5oj4W3ODSRZk2wnnX4Y3cYXfE0VImgnkV25r3 6J0nIKt0MHchqi0O4mWV1Be2PKZeh8JJD5Qbbj9BB0glwEtOTSiTfIR1KjvLWpj28D2Drs 4UICzg5fPxcqr10x8SEC4hKnghdKYG5rupMrcCHjGET8qA+8W6yoXNG2sNotqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772391828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vKNy/pbPnCHtUnIWMWcUkBQYXC+kvXJ/arYiJATPI4I=; b=mZ7BROtE8foR32rKaPS3FE1KnXeE9noVK5n9RQwXTboAUqiCfwk2jtMEMJmK/5X7UnGcVM YC6wBNfEZIAe/8VH0JBNzB6KR4gz4jszrzCsuNbvHsYp48Ikk0JZU4TZ+yKMuIIDUj1vfl 2fLmJPBU7dQekiJE+iRB+TCrj7pHb5TEyzj6PjGjh7TcYrqIQX6AQg7kvcFmjAMxzjLavt YjMuB0TcMPrXsA1kudkuU7498bYlt+ogsB/OTPbn0v2rzOxpS6ysk8DSfbfg9Co2MT2wYL uMFdNOvpCTWSnvNuygUzBD2S+2ihp+om/SUyL8P65aXFSoadbPqli80E7L+QUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fPBLC6kCNz125f for ; Sun, 01 Mar 2026 19:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1965b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 19:03:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: e81e724358e4 - main - asmc: output the SMC firmware revision 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e81e724358e43dcf951e244a9df9df3eaa983fe9 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 19:03:47 +0000 Message-Id: <69a48d93.1965b.3c23c832@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=e81e724358e43dcf951e244a9df9df3eaa983fe9 commit e81e724358e43dcf951e244a9df9df3eaa983fe9 Author: Enji Cooper AuthorDate: 2026-03-01 18:54:56 +0000 Commit: Enji Cooper CommitDate: 2026-03-01 19:03:38 +0000 asmc: output the SMC firmware revision on attach The SMC firmware revision can prove helpful when determining why the behavior of a given controller varies from the maintainers' expected behavior. This should be a sysctl (eventually), but for now dumping out the information via `device_printf(..)` suffices, given that only one asmc(4) compatible device can exist in an Apple platform at any given point in time. This will become a sysctl in the future after additional improvements are incorporated from OpenBSD and NetBSD. MFC after: 1 week Obtained from: https://github.com/openbsd/src/ (sys/dev/acpi/asmc.c @ 142d064) Differential Revision: https://reviews.freebsd.org/D55577 --- sys/dev/asmc/asmc.c | 11 +++++++++-- sys/dev/asmc/asmcvar.h | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index cf977071cc69..726d52874026 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -51,6 +51,7 @@ #include #include +#include #include @@ -935,11 +936,17 @@ asmc_init(device_t dev) { struct asmc_softc *sc = device_get_softc(dev); struct sysctl_ctx_list *sysctlctx; + uint8_t buf[6]; int i, error = 1; - uint8_t buf[4]; sysctlctx = device_get_sysctl_ctx(dev); + error = asmc_key_read(dev, ASMC_KEY_REV, buf, 6); + if (error != 0) + goto out_err; + device_printf(dev, "SMC revision: %x.%x%x%x\n", buf[0], buf[1], buf[2], + ntohs(*(uint16_t *)buf + 4)); + if (sc->sc_model->smc_sms_x == NULL) goto nosms; @@ -1039,10 +1046,10 @@ nosms: sc->sc_nkeys = 0; } +out_err: #ifdef ASMC_DEBUG asmc_dumpall(dev); #endif - return (error); } diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 97e5076455c9..5afc1012849c 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -78,6 +78,9 @@ struct asmc_softc { /* Number of keys */ #define ASMC_NKEYS "#KEY" /* RO; 4 bytes */ +/* Query the ASMC revision */ +#define ASMC_KEY_REV "REV " /* RO: 6 bytes */ + /* * Fan control via SMC. */ From nobody Sun Mar 1 19:05:46 2026 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 4fPBNc1TLhz6TWZg for ; Sun, 01 Mar 2026 19:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPBNb753gz3rK4 for ; Sun, 01 Mar 2026 19:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772391952; 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=o6lcWvRbYE5eOBcjRAVHXEvObLuCWxOn/q8ZtR0D4BU=; b=szY8hveFuoMyABfOsIu5DrGOkHLGtltHhf/NgB54Z8Dl8hY10k4gAHdM/tMOKzcacis2aa 3zRTiw99cJeGBEWaNGXsLrmUiWxJTgPaP5Tjl8v4ZPCTe/Jd5TM+kMnNNLNjUK8v63TG6z v6G6YYk21BqciLGrzE99qtB4030W2e8OmraIEF3ZDU6kJiajkefi3RG/cXr9Nk3g2OFDos 7TyB+zJewEM2+zgaSMQm5VXX8R3wx0IBPCwXAlcwiryGLQIzExFhoZrUhSbTwP4cHFczI+ Fx4PO3qylCHdi1DX4nT8PG4y6toPV0OiYCT7Suj72lfZoyII6ozyA3aMBVVNCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772391952; a=rsa-sha256; cv=none; b=k77odcoh9xf0eU6AIPEHZD08dY1QdP5BW9oAeKzC7k+ntmoffVjBVNXvq9yKDpRYkjlR0W NLwIqFvXsCrFufqyFNwQrQjz7obLN1ja13FW3+AsVWKGqLsC0syBjXV4YGJAIZgjgFgjSB Jhrd03bvp67VqdWGJByMH0bYJyKboxs7cKic3g2k+bRV2RAB0cF1Qo1mBD/JXRS/p4PfL6 lssdsBd8Bsn+3U8cYfuecS54zIjzdSv/TPBNmmVVEWl9CbZJceZSbXh0oAs3921cjXIUCe AZgMxzRyJHasz0VKetF52JJ8H87u+hgSjOp07qVySg79crjnVL7gmFRiaQ3zsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772391952; 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=o6lcWvRbYE5eOBcjRAVHXEvObLuCWxOn/q8ZtR0D4BU=; b=Nj+TjR3gDqoh95c58Gt/ttgnf4t9tUSuVbaasXhVHkNn751f1vlvW8yXVuisepNC/ySHC5 tLjIcGRfj3nZiKmPSqLqHrHsDmRC53ojHV84f0tLB+MPt8a1HYzuEg2VazL3D0pVDPglaT Ehzds6uwgEoKsfI1QXYDSrDiMYUR418BRyFJXpnvyMCibNxG0P4dRGA7whWfGNEAqlzrLk B7XKLnG0ez6fuwuMxo7w7ks0dpkjW8c9Sf7h5Umsy1SyDQH5sR+wGnBM9hdeEporCx2o6w 4xw7Nnd0VVOP4MUz3HuMdwgUknSsOW/WCwzbyPRONiMCHnbrePr7ncGKvEblPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fPBNb6dLmz11m2 for ; Sun, 01 Mar 2026 19:05:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1803f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 19:05:46 +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: 32cd3ee5901e - main - ipfw: add support for masked ip-address lookups 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: 32cd3ee5901ea33d41ff550e5f40ce743c8d4165 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 19:05:46 +0000 Message-Id: <69a48e0a.1803f.584a95d@gitrepo.freebsd.org> The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=32cd3ee5901ea33d41ff550e5f40ce743c8d4165 commit 32cd3ee5901ea33d41ff550e5f40ce743c8d4165 Author: Boris Lytochkin AuthorDate: 2026-03-01 18:54:24 +0000 Commit: Andrey V. Elsukov CommitDate: 2026-03-01 19:04:58 +0000 ipfw: add support for masked ip-address lookups Current radix-based implementation of lookup tables in ipfw does not support non-contiguous prefixes while this type of lookup is needed to write CPU-effective firewall configurations. For some of the cases we can reach the goal using a masked table lookup by adding masked (e.g. zero non-significant bits) records into a table and then zero non-significant bits in lookup key prior to making a table lookup. Obtained from: Yandex LLC MFC after: 3 weeks Relnotes: yes Sponsored by: Yandex LLC Differential Revision: https://reviews.freebsd.org/D53694 --- sbin/ipfw/ipfw.8 | 151 ++++++-- sbin/ipfw/ipfw2.c | 193 ++++++++-- sbin/ipfw/tests/test_add_rule.py | 243 +++++++++++- sys/netinet/ip_fw.h | 81 +++- sys/netpfil/ipfw/ip_fw2.c | 231 ++++++----- sys/netpfil/ipfw/ip_fw_sockopt.c | 32 ++ sys/netpfil/ipfw/ip_fw_table.c | 26 +- tests/atf_python/sys/netpfil/ipfw/insn_headers.py | 37 +- tests/atf_python/sys/netpfil/ipfw/insns.py | 179 ++++++++- tests/atf_python/sys/netpfil/ipfw/ioctl.py | 1 + tests/atf_python/sys/netpfil/ipfw/ioctl_headers.py | 41 +- tests/sys/netpfil/common/utils.subr | 3 + tests/sys/netpfil/ipfw/Makefile | 4 +- tests/sys/netpfil/ipfw/lookup.sh | 428 +++++++++++++++++++++ tests/sys/netpfil/ipfw/lookup_inetd.conf | 1 + 15 files changed, 1417 insertions(+), 234 deletions(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 867a43868ecc..2d3b0722cc42 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1,5 +1,5 @@ .\" -.Dd December 29, 2025 +.Dd March 1, 2026 .Dt IPFW 8 .Os .Sh NAME @@ -1428,8 +1428,7 @@ The second format with multiple addresses) is provided for convenience only and its use is discouraged. .It Ar addr : Oo Cm not Oc Bro -.Cm any | me | me6 | -.Cm table Ns Pq Ar name Ns Op , Ns Ar value +.Cm any | me | me6 | Ar table-ref .Ar | addr-list | addr-set .Brc .Bl -tag -width indent @@ -1441,26 +1440,32 @@ Matches any IP address configured on an interface in the system. Matches any IPv6 address configured on an interface in the system. The address list is evaluated at the time the packet is analysed. -.It Cm table Ns Pq Ar name Ns Op , Ns Ar value +.El +.It Ar table-ref : +A table lookup can be specified in one of the following ways: +.Bl -tag -width indent +.It table Ns Pq Ar name Ns Matches any IPv4 or IPv6 address for which an entry exists in the lookup table .Ar number . -If an optional 32-bit unsigned +.It table Ns Pq Ar name , Ns Ar value +Matches any IPv4 or IPv6 address for which an entry exists in the lookup table +.Ar number +and 32-bit unsigned .Ar value -is also specified, an entry will match only if it has this value. -If +specified matchess entry value. +.It table Ns Pq Ar name , Ns Ar value-type Ns = Ns Ar value +Matches any IPv4 or IPv6 address for which an entry exists in the lookup table +.Ar number +and 32-bit unsigned .Ar value -is specified in form -.Ar valtype=value , -then specified value type field will be checked. -It can be -.Ar skipto, pipe, fib, nat, dscp, tag, divert, netgraph, limit, nh4 -and -.Ar mark. - +specified matches corresponding +.Ar value-type +field for the record found. +.El +.Pp See the .Sx LOOKUP TABLES section below for more information on lookup tables. -.El .It Ar addr-list : ip-addr Ns Op , Ns Ar addr-list .It Ar ip-addr : A host or subnet address specified in one of the following ways: @@ -1681,9 +1686,9 @@ and IPsec encapsulating security payload headers .It Cm fib Ar fibnum Matches a packet that has been tagged to use the given FIB (routing table) number. -.It Cm flow Ar table Ns Pq Ar name Ns Op , Ns Ar value -Search for the flow entry in lookup table -.Ar name . +.It Cm flow Ar table-ref +Search for the flow entry in lookup table specified by +.Ar table-ref . If not found, the match fails. Otherwise, the match succeeds and .Cm tablearg @@ -1699,16 +1704,16 @@ Matches IPv6 packets containing any of the flow labels given in .Ar labels . .Ar labels is a comma separated list of numeric flow labels. -.It Cm dst-mac Ar table Ns Pq Ar name Ns Op , Ns Ar value -Search for the destination MAC address entry in lookup table -.Ar name . +.It Cm dst-mac Ar table-ref +Search for the destination MAC address entry in lookup table specified by +.Ar table-ref . If not found, the match fails. Otherwise, the match succeeds and .Cm tablearg is set to the value extracted from the table. -.It Cm src-mac Ar table Ns Pq Ar name Ns Op , Ns Ar value -Search for the source MAC address entry in lookup table -.Ar name . +.It Cm src-mac Ar table-ref +Search for the source MAC address entry in lookup table specified by +.Ar table-ref . If not found, the match fails. Otherwise, the match succeeds and .Cm tablearg @@ -1926,8 +1931,10 @@ set of parameters as specified in the rule. One or more of source and destination addresses and ports can be specified. -.It Cm lookup Bro Cm dst-ip | dst-port | dst-mac | src-ip | src-port | src-mac | uid | -.Cm jail | dscp | mark | rulenum Brc Ar name +.It Cm lookup Bro Cm dst-ip | dst-ip4 | dst-ip6 | dst-port | dst-mac | src-ip | +.Cm src-ip4 | src-ip6 | src-port | src-mac | uid | jail | dscp | mark | +.Cm rulenum +.Brc Ns Oo : Ns Ar bitmask Oc Ar name Search an entry in lookup table .Ar name that matches the field specified as argument. @@ -1936,8 +1943,56 @@ Otherwise, the match succeeds and .Cm tablearg is set to the value extracted from the table. .Pp +If an optional +.Ar bitmask +is specified, value of the field is altered by bitwize AND with +.Ar bitmask +and resulting value is being searched instead of the original one. +The +.Ar bitmask +is accepted in the following formats: +.Bl -enum -width indent +.It +In a dotted-quad form, e.g. 127.88.34.0. +This form can be used for IPv4 lookups as well as for all numeric lookup +types. +.It +As a 32-bit number, e.g. 0xf00baa1 or 255. +This form can be used for IPv4 lookups as well as for all numeric lookup +types. +.It +As an IPv6 address when specified alongwith +.Cm dst-ip6 +or +.Cm src-ip6 +field. +If used, the rule will match IPv6 packets only. +Example: src-ip6:afff:ff00:ffff:ffff:0:0:0:0f0f. +.It +As a Ethernet mac address when specified alongwith +.Cm dst-mac +or +.Cm src-mac +field. E.g. 00:11:22:33:44:55. +.El +.Pp +The +.Ar bitmask +can not be specified for +.Cm dst-ip +or +.Cm src-ip +as these field specifiers lookup both IPv4 and IPv6 addresses. +.Pp This option can be useful to quickly dispatch traffic based on certain packet fields. +The +.Ar bitmask +allows to implement wildcard lookups by inserting into table masked prefix and +appying +.Ar bitmask +upon each lookup. +.Pp See the .Sx LOOKUP TABLES section below for more information on lookup tables. @@ -2000,7 +2055,7 @@ However, this option doesn't imply an implicit .Cm check-state in contrast to .Cm keep-state . -.It Cm recv | xmit | via Brq Ar ifX | Ar ifmask | Ar table Ns Po Ar name Ns Oo , Ns Ar value Oc Pc | Ar ipno | Ar any +.It Cm recv | xmit | via Brq Ar ifX | Ar ifmask | Ar table-ref | Ar ipno | Ar any Matches packets received, transmitted or going through, respectively, the interface specified by exact name .Po Ar ifX Pc , @@ -2018,8 +2073,8 @@ See also the .Sx EXAMPLES section. .Pp -Table -.Ar name +A lookup table specified by +.Ar table-ref may be used to match interface by its kernel ifindex. See the .Sx LOOKUP TABLES @@ -4350,7 +4405,8 @@ Capture messages from .Xr route 4 socket, that were logged using rules with .Cm log Cm logdst Ar rtsock -opcode. Optional +opcode. +Optional .Ar filter-comment can be specified to show only those messages, that were logged by rules with specific rule comment. @@ -4705,10 +4761,41 @@ In the following example per-interface firewall is created: The following example illustrate usage of flow tables: .Pp .Dl "ipfw table fl create type flow:src-ip,proto,dst-ip,dst-port" -.Dl "ipfw table fl add 2a02:6b8:77::88,tcp,2a02:6b8:77::99,80 11" +.Dl "ipfw table fl add 2001:db8:77::88,tcp,2001:db8:77::99,80 11" .Dl "ipfw table fl add 10.0.0.1,udp,10.0.0.2,53 12" .Dl ".." .Dl "ipfw add 100 allow ip from any to any flow 'table(fl,11)' recv ix0" +.Pp +The following example illustrate masked table lookups to aid uniform client +distribution among multiple NAT instances: +.Bd -literal -offset indent +# Configure NAT instances +ipfw nat 10 config ip 192.0.2.0 +ipfw nat 11 config ip 192.0.2.1 +ipfw nat 12 config ip 192.0.2.2 +ipfw nat 13 config ip 192.0.2.3 + +ipfw table mynats create type addr valtype nat +# Map external NAT address to NAT instance +ipfw table mynats add 192.0.2.0 10 +ipfw table mynats add 192.0.2.1 11 +ipfw table mynats add 192.0.2.2 12 +ipfw table mynats add 192.0.2.3 13 + +# Map last 2 bits of client's IP address to NAT instance +ipfw table mynats add 0.0.0.0 10 +ipfw table mynats add 0.0.0.1 11 +ipfw table mynats add 0.0.0.2 12 +ipfw table mynats add 0.0.0.3 13 + +# In -> Out NAT, zero out all bits in a client's IP exept +# 2 least significant prior to table lookup +ipfw add nat tablearg ip from 10.0.0.0/24 to any + lookup src-ip4:0.0.0.3 mynats +# Out -> In NAT +ipfw add nat tablearg ip from any to 192.0.2.0/30 + lookup dst-ip mynats +.Ed .Ss SETS OF RULES To add a set of rules atomically, e.g.\& set 18: .Pp diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index 26baa596cc89..e0e1339a1dce 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -313,6 +313,10 @@ static struct _s_x rule_action_params[] = { static struct _s_x lookup_keys[] = { { "dst-ip", LOOKUP_DST_IP }, { "src-ip", LOOKUP_SRC_IP }, + { "dst-ip6", LOOKUP_DST_IP6 }, + { "src-ip6", LOOKUP_SRC_IP6 }, + { "dst-ip4", LOOKUP_DST_IP4 }, + { "src-ip4", LOOKUP_SRC_IP4 }, { "dst-port", LOOKUP_DST_PORT }, { "src-port", LOOKUP_SRC_PORT }, { "dst-mac", LOOKUP_DST_MAC }, @@ -338,6 +342,7 @@ static struct _s_x tvalue_names[] = { { "fib", TVALUE_FIB }, { "nat", TVALUE_NAT }, { "nh4", TVALUE_NH4 }, + { "nh6", TVALUE_NH6 }, { "dscp", TVALUE_DSCP }, { "limit", TVALUE_LIMIT }, { "mark", TVALUE_MARK }, @@ -1311,12 +1316,27 @@ print_flags(struct buf_pr *bp, char const *name, const ipfw_insn *cmd, } static void -print_tvalue(struct buf_pr *bp, const ipfw_insn_table *cmd) +print_tvalue(struct buf_pr *bp, const ipfw_insn_lookup *cmd) { + char maskbuf[INET6_ADDRSTRLEN]; const char *name; name = match_value(tvalue_names, IPFW_TVALUE_TYPE(&cmd->o)); - bprintf(bp, ",%s=%u", name != NULL ? name: "", cmd->value); + switch(IPFW_TVALUE_TYPE(&cmd->o)) { + case TVALUE_NH6: + if (inet_ntop(AF_INET6, &insntoc(&cmd->o, lookup)->ip6, + maskbuf, sizeof(maskbuf)) == NULL) + strcpy(maskbuf, ""); + bprintf(bp, ",%s=%s", name != NULL ? name: "", + maskbuf); + return; + case TVALUE_NH4: + bprintf(bp, ",%s=%s", name != NULL ? name: "", + inet_ntoa(cmd->ip4)); + return; + } + bprintf(bp, ",%s=%u", name != NULL ? name: "", + cmd->u32); } @@ -1327,11 +1347,14 @@ static void print_ip(struct buf_pr *bp, const struct format_opts *fo, const ipfw_insn_ip *cmd) { + char maskbuf[INET6_ADDRSTRLEN]; + const uint32_t *a = insntoc(cmd, u32)->d; struct hostent *he = NULL; const struct in_addr *ia; - const uint32_t *a = ((const ipfw_insn_u32 *)cmd)->d; - uint32_t len = F_LEN(&cmd->o); + const ipfw_insn_lookup *l = insntoc(cmd, lookup); + const char *key; char *t; + uint32_t len = F_LEN(&cmd->o); bprintf(bp, " "); switch (cmd->o.opcode) { @@ -1340,32 +1363,65 @@ print_ip(struct buf_pr *bp, const struct format_opts *fo, bprintf(bp, "me"); return; - case O_IP_DST_LOOKUP: - if ((len == F_INSN_SIZE(ipfw_insn_kidx) || - len == F_INSN_SIZE(ipfw_insn_table)) && - IPFW_LOOKUP_TYPE(&cmd->o) != LOOKUP_NONE) { - const char *key; - - key = match_value(lookup_keys, - IPFW_LOOKUP_TYPE(&cmd->o)); - t = table_search_ctlv(fo->tstate, - insntoc(&cmd->o, kidx)->kidx); - if (len == F_INSN_SIZE(ipfw_insn_table)) { - bprintf(bp, "lookup %s:%#x %s", - (key != NULL ? key : ""), - insntoc(&cmd->o, table)->value, t); - } else - bprintf(bp, "lookup %s %s", key != NULL ? key: - "", t); + case O_TABLE_LOOKUP: { + key = match_value(lookup_keys, + IPFW_LOOKUP_TYPE(&cmd->o)); + t = table_search_ctlv(fo->tstate, + insntoc(&cmd->o, kidx)->kidx); + if (IPFW_LOOKUP_MASKING(&cmd->o) == 0 || + len != F_INSN_SIZE(ipfw_insn_lookup)) { + bprintf(bp, "lookup %s %s", + (key != NULL ? key : ""), t); return; } - /* FALLTHROUGH */ + switch (IPFW_LOOKUP_TYPE(&cmd->o)) { + case LOOKUP_DST_IP6: + case LOOKUP_SRC_IP6: + if (inet_ntop(AF_INET6, &l->ip6, + maskbuf, sizeof(maskbuf)) == NULL) + strcpy(maskbuf, ""); + bprintf(bp, "lookup %s:%s %s", key, maskbuf, t); + break; + case LOOKUP_DST_IP: + case LOOKUP_SRC_IP: + case LOOKUP_DST_IP4: + case LOOKUP_SRC_IP4: + bprintf(bp, "lookup %s:%s %s", key, + inet_ntoa(l->ip4), t); + break; + case LOOKUP_DST_MAC: + case LOOKUP_SRC_MAC: + bprintf(bp, "lookup %s:%s %s", key, + ether_ntoa((const struct ether_addr *)&l->mac), t); + break; + default: + bprintf(bp, "lookup %s:%#x %s", + (key != NULL ? key : ""), + l->u32, t); + } + return; + } + case O_IP_DST_LOOKUP: case O_IP_SRC_LOOKUP: t = table_search_ctlv(fo->tstate, insntoc(&cmd->o, kidx)->kidx); + /* + * XXX: compatibility layer, to be removed. + * Properly show rules loaded into new kernel modules by + * an old ipfw binary. + */ + if (IPFW_LOOKUP_MASKING(&cmd->o) != 0 && + len == F_INSN_SIZE(ipfw_insn_table)) { + key = match_value(lookup_keys, + IPFW_LOOKUP_TYPE(&cmd->o)); + bprintf(bp, "lookup %s:%#x %s", + (key != NULL ? key : ""), + insntoc(&cmd->o, table)->value, t); + return; + } bprintf(bp, "table(%s", t); - if (len == F_INSN_SIZE(ipfw_insn_table)) - print_tvalue(bp, insntoc(&cmd->o, table)); + if (IPFW_LOOKUP_MATCH_TVALUE(&cmd->o) != 0) + print_tvalue(bp, l); bprintf(bp, ")"); return; } @@ -1470,15 +1526,14 @@ static void print_mac_lookup(struct buf_pr *bp, const struct format_opts *fo, const ipfw_insn *cmd) { - uint32_t len = F_LEN(cmd); char *t; bprintf(bp, " "); t = table_search_ctlv(fo->tstate, insntoc(cmd, kidx)->kidx); bprintf(bp, "table(%s", t); - if (len == F_INSN_SIZE(ipfw_insn_table)) - print_tvalue(bp, insntoc(cmd, table)); + if (IPFW_LOOKUP_MATCH_TVALUE(cmd) != 0) + print_tvalue(bp, insntoc(cmd, lookup)); bprintf(bp, ")"); } @@ -1643,6 +1698,8 @@ print_instruction(struct buf_pr *bp, const struct format_opts *fo, case O_IP_SRC_SET: if (state->flags & HAVE_SRCIP) bprintf(bp, " src-ip"); + /* FALLTHROUGH */ + case O_TABLE_LOOKUP: print_ip(bp, fo, insntoc(cmd, ip)); break; case O_IP_DST: @@ -1767,8 +1824,8 @@ print_instruction(struct buf_pr *bp, const struct format_opts *fo, s = table_search_ctlv(fo->tstate, insntoc(cmd, kidx)->kidx); bprintf(bp, " flow table(%s", s); - if (F_LEN(cmd) == F_INSN_SIZE(ipfw_insn_table)) - print_tvalue(bp, insntoc(cmd, table)); + if (IPFW_LOOKUP_MATCH_TVALUE(cmd) != 0) + print_tvalue(bp, insntoc(cmd, lookup)); bprintf(bp, ")"); break; case O_IPID: @@ -3304,8 +3361,11 @@ pack_table(struct tidx *tstate, const char *name) return (pack_object(tstate, name, IPFW_TLV_TBL_NAME)); } +/* + * Parse table(NAME, value) and table(NAME,key=value) + */ static void -fill_table_value(ipfw_insn *cmd, char *s) +fill_table_value(ipfw_insn_lookup *cmd, char *s) { char *p; int i; @@ -3322,8 +3382,20 @@ fill_table_value(ipfw_insn *cmd, char *s) p = s; } - IPFW_SET_TVALUE_TYPE(cmd, i); - insntod(cmd, table)->value = strtoul(p, NULL, 0); + IPFW_SET_TVALUE_TYPE(&cmd->o, i); + + if (i == TVALUE_NH6) { + if (inet_pton(AF_INET6, p, &cmd->ip6) != 1) + errx(EX_USAGE, "invalid IPv6 address provided"); + /* mask in a dotted-quad notation */ + } else if (strchr(p, '.') != NULL) { + if (inet_aton(p, &cmd->ip4) != 1) + errx(EX_USAGE, "invalid IPv4 address provided"); + if (i == TVALUE_NH4) + return; + cmd->u32 = ntohl(cmd->u32); + } else + cmd->u32 = strtoul(p, NULL, 0); } void @@ -3344,9 +3416,11 @@ fill_table(ipfw_insn *cmd, char *av, uint8_t opcode, struct tidx *tstate) cmd->opcode = opcode; if (p) { - cmd->len |= F_INSN_SIZE(ipfw_insn_table); - fill_table_value(cmd, p); + cmd->len |= F_INSN_SIZE(ipfw_insn_lookup); + IPFW_SET_LOOKUP_MATCH_TVALUE(cmd, 1); + fill_table_value(insntod(cmd, lookup), p); } else { + /* table(NAME) */ IPFW_SET_LOOKUP_TYPE(cmd, LOOKUP_NONE); cmd->len |= F_INSN_SIZE(ipfw_insn_kidx); } @@ -4126,6 +4200,38 @@ get_divert_port(const char *arg, const char *action) return (ntohs(s->s_port)); } +static void +get_lookup_bitmask(int ltype, ipfw_insn_lookup *cmd, const char *src) +{ + struct ether_addr *mac; + const char *macset = "0123456789abcdefABCDEF:"; + + if (ltype == LOOKUP_SRC_IP6 || ltype == LOOKUP_DST_IP6) { + if (inet_pton(AF_INET6, src, &cmd->ip6) != 1) + errx(EX_USAGE, "invalid IPv6 mask provided"); + return; + } else if (ltype == LOOKUP_SRC_MAC || ltype == LOOKUP_DST_MAC) { + if (strspn(src, macset) != strlen(src) || + (mac = ether_aton(src)) == NULL) + errx(EX_DATAERR, "Incorrect MAC address"); + + bcopy(mac, cmd->mac, ETHER_ADDR_LEN); + return; + /* mask in a dotted-quad notation */ + } else if (strchr(src, '.') != NULL) { + if (inet_aton(src, &cmd->ip4) != 1) + errx(EX_USAGE, "invalid dotted-quad mask provided"); + switch (ltype) { + case LOOKUP_SRC_IP4: + case LOOKUP_DST_IP4: + return; + } + cmd->u32 = ntohl(cmd->u32); + return; + } + cmd->u32 = strtoul(src, NULL, 0); +} + /* * Parse arguments and assemble the microinstructions which make up a rule. * Rules are added into the 'rulebuf' and then copied in the correct order @@ -5448,13 +5554,13 @@ read_options: case TOK_LOOKUP: { /* optional mask for some LOOKUP types */ - ipfw_insn_table *c = insntod(cmd, table); + ipfw_insn_lookup *c = insntod(cmd, lookup); char *lkey; if (!av[0] || !av[1]) errx(EX_USAGE, "format: lookup argument tablenum"); - cmd->opcode = O_IP_DST_LOOKUP; + cmd->opcode = O_TABLE_LOOKUP; lkey = strsep(av, ":"); i = match_token(lookup_keys, lkey); @@ -5471,18 +5577,21 @@ read_options: case LOOKUP_DSCP: case LOOKUP_MARK: case LOOKUP_RULENUM: + case LOOKUP_SRC_MAC: + case LOOKUP_DST_MAC: + case LOOKUP_SRC_IP6: + case LOOKUP_DST_IP6: + case LOOKUP_SRC_IP4: + case LOOKUP_DST_IP4: break; default: errx(EX_USAGE, "masked lookup is not supported " "for %s", lkey); } - cmd->len |= F_INSN_SIZE(ipfw_insn_table); - c->value = strtoul(*av, NULL, 0); - if (c->value == 0) - errx(EX_USAGE, - "all-zeroes bitmask for lookup " - "is meaningless"); + cmd->len |= F_INSN_SIZE(ipfw_insn_lookup); + IPFW_SET_LOOKUP_MASKING(cmd, 1); + get_lookup_bitmask(i, c, *av); } else { cmd->len |= F_INSN_SIZE(ipfw_insn_kidx); } diff --git a/sbin/ipfw/tests/test_add_rule.py b/sbin/ipfw/tests/test_add_rule.py index c2c4bf0b360c..4360c5f87c15 100755 --- a/sbin/ipfw/tests/test_add_rule.py +++ b/sbin/ipfw/tests/test_add_rule.py @@ -37,7 +37,11 @@ from atf_python.sys.netpfil.ipfw.insns import InsnProto from atf_python.sys.netpfil.ipfw.insns import InsnReject from atf_python.sys.netpfil.ipfw.insns import InsnTable from atf_python.sys.netpfil.ipfw.insns import InsnU32 +from atf_python.sys.netpfil.ipfw.insns import InsnKidx +from atf_python.sys.netpfil.ipfw.insns import InsnLookup from atf_python.sys.netpfil.ipfw.insns import IpFwOpcode +from atf_python.sys.netpfil.ipfw.insn_headers import IpFwTableLookupType +from atf_python.sys.netpfil.ipfw.insn_headers import IpFwTableValueType from atf_python.sys.netpfil.ipfw.ioctl import CTlv from atf_python.sys.netpfil.ipfw.ioctl import CTlvRule from atf_python.sys.netpfil.ipfw.ioctl import IpFwTlvType @@ -153,14 +157,226 @@ class TestAddRule(BaseTest): NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=2, name="BBB"), ], "insns": [ - InsnU32(IpFwOpcode.O_IP_SRC_LOOKUP, u32=1), - InsnU32(IpFwOpcode.O_IP_DST_LOOKUP, u32=2), + InsnKidx(IpFwOpcode.O_IP_SRC_LOOKUP, kidx=1), + InsnKidx(IpFwOpcode.O_IP_DST_LOOKUP, kidx=2), InsnEmpty(IpFwOpcode.O_ACCEPT), ], }, }, id="test_tables", ), + pytest.param( + { + "in": "add allow ip from table(AAA) to any lookup dst-ip BBB", + "out": { + "objs": [ + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=1, name="AAA"), + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=2, name="BBB"), + ], + "insns": [ + InsnKidx(IpFwOpcode.O_IP_SRC_LOOKUP, kidx=1), + InsnLookup(IpFwOpcode.O_TABLE_LOOKUP, + kidx=2, + arg1=InsnLookup.compile_arg1(lookup_type=IpFwTableLookupType.LOOKUP_DST_IP), + ), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_tables_lookup_no_mask", + ), + pytest.param( + { + "in": "add allow ip from table(AAA) to any lookup mark:0xf00baa1 BBB", + "out": { + "objs": [ + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=1, name="AAA"), + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=2, name="BBB"), + ], + "insns": [ + InsnKidx(IpFwOpcode.O_IP_SRC_LOOKUP, kidx=1), + InsnLookup(IpFwOpcode.O_TABLE_LOOKUP, + kidx=2, + arg1=InsnLookup.compile_arg1(lookup_type=IpFwTableLookupType.LOOKUP_MARK, bitmask=True), + bitmask=0xf00baa1), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_tables_lookup_u32_mask", + ), + pytest.param( + { + "in": "add allow ip from table(AAA) to any lookup src-mac:1a:2b:3c:4d:5e:6f BBB", + "out": { + "objs": [ + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=1, name="AAA"), + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=2, name="BBB"), + ], + "insns": [ + InsnKidx(IpFwOpcode.O_IP_SRC_LOOKUP, kidx=1), + InsnLookup(IpFwOpcode.O_TABLE_LOOKUP, + kidx=2, + arg1=InsnLookup.compile_arg1(lookup_type=IpFwTableLookupType.LOOKUP_SRC_MAC, bitmask=True), + bitmask="1a:2b:3c:4d:5e:6f"), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_tables_lookup_mac_mask", + ), + pytest.param( + { + "in": "add allow ip from table(AAA) to any lookup dst-ip4:1715004 BBB", + "out": { + "objs": [ + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=1, name="AAA"), + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=2, name="BBB"), + ], + "insns": [ + InsnKidx(IpFwOpcode.O_IP_SRC_LOOKUP, kidx=1), + InsnLookup(IpFwOpcode.O_TABLE_LOOKUP, + kidx=2, + arg1=InsnLookup.compile_arg1(lookup_type=IpFwTableLookupType.LOOKUP_DST_IP4, bitmask=True), + bitmask="60.43.26.0"), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_tables_lookup_dst_ip4_numeric", + ), + pytest.param( + { + "in": "add allow ip from table(AAA) to any lookup src-ip4:0.0.0.255 BBB", + "out": { + "objs": [ + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=1, name="AAA"), + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=2, name="BBB"), + ], + "insns": [ + InsnKidx(IpFwOpcode.O_IP_SRC_LOOKUP, kidx=1), + InsnLookup(IpFwOpcode.O_TABLE_LOOKUP, + kidx=2, + arg1=InsnLookup.compile_arg1(lookup_type=IpFwTableLookupType.LOOKUP_SRC_IP4, bitmask=True), + bitmask="0.0.0.255"), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_tables_lookup_src_ip4_addr", + ), + pytest.param( + { + "in": "add allow ip from table(AAA) to any lookup jail:0.0.252.128 BBB", + "out": { + "objs": [ + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=1, name="AAA"), + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=2, name="BBB"), + ], + "insns": [ + InsnKidx(IpFwOpcode.O_IP_SRC_LOOKUP, kidx=1), + InsnLookup(IpFwOpcode.O_TABLE_LOOKUP, + kidx=2, + arg1=InsnLookup.compile_arg1(lookup_type=IpFwTableLookupType.LOOKUP_JAIL, bitmask=True), + bitmask=64640), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_tables_lookup_jail_addr", + ), + pytest.param( + { + "in": "add allow ip from table(AAA) to any lookup dst-ip6:ffff:ffff:f00:baaa:b00c:: BBB", + "out": { + "objs": [ + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=1, name="AAA"), + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=2, name="BBB"), + ], + "insns": [ + InsnKidx(IpFwOpcode.O_IP_SRC_LOOKUP, kidx=1), + InsnLookup(IpFwOpcode.O_TABLE_LOOKUP, + kidx=2, + arg1=InsnLookup.compile_arg1(lookup_type=IpFwTableLookupType.LOOKUP_DST_IP6, bitmask=True), + bitmask="ffff:ffff:f00:baaa:b00c::"), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_tables_lookup_dst_ip6", + ), + pytest.param( + { + "in": "add allow ip from table(AAA,16777215) to any", + "out": { + "objs": [ + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=1, name="AAA"), + ], + "insns": [ + InsnLookup(IpFwOpcode.O_IP_SRC_LOOKUP, + kidx=1, + arg1=InsnLookup.compile_arg1(value_type=IpFwTableValueType.TVALUE_TAG), + value=16777215), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_tables_check_value_legacy", + ), + pytest.param( + { + "in": "add allow ip from table(AAA,nat=1231) to any", + "out": { + "objs": [ + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=1, name="AAA"), + ], + "insns": [ + InsnLookup(IpFwOpcode.O_IP_SRC_LOOKUP, + kidx=1, + arg1=InsnLookup.compile_arg1(value_type=IpFwTableValueType.TVALUE_NAT), + value=1231), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_tables_check_value_nat", + ), + pytest.param( + { + "in": "add allow ip from table(AAA,nh4=10.20.30.40) to any", + "out": { + "objs": [ + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=1, name="AAA"), + ], + "insns": [ + InsnLookup(IpFwOpcode.O_IP_SRC_LOOKUP, + kidx=1, + arg1=InsnLookup.compile_arg1(value_type=IpFwTableValueType.TVALUE_NH4), + value="10.20.30.40"), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_tables_check_value_nh4", + ), + pytest.param( + { + "in": "add allow ip from table(AAA,nh6=ff02:1234:b00c::abcd) to any", + "out": { + "objs": [ + NTlv(IpFwTlvType.IPFW_TLV_TBL_NAME, idx=1, name="AAA"), + ], + "insns": [ + InsnLookup(IpFwOpcode.O_IP_SRC_LOOKUP, + kidx=1, + arg1=InsnLookup.compile_arg1(value_type=IpFwTableValueType.TVALUE_NH6), + value="ff02:1234:b00c::abcd"), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_tables_check_value_nh6", + ), pytest.param( { "in": "add allow ip from any to 1.2.3.4 // test comment", @@ -183,7 +399,7 @@ class TestAddRule(BaseTest): ], "insns": [ InsnIp(IpFwOpcode.O_IP_DST, ip="1.2.3.4"), - InsnU32(IpFwOpcode.O_EXTERNAL_ACTION, u32=1), + InsnKidx(IpFwOpcode.O_EXTERNAL_ACTION, kidx=1), Insn(IpFwOpcode.O_EXTERNAL_DATA, arg1=123), ], }, @@ -192,20 +408,20 @@ class TestAddRule(BaseTest): ), pytest.param( { - "in": "add eaction ntpv6 AAA ip from any to 1.2.3.4", + "in": "add eaction nptv6 AAA ip from any to 1.2.3.4", "out": { "objs": [ - NTlv(IpFwTlvType.IPFW_TLV_EACTION, idx=1, name="ntpv6"), + NTlv(IpFwTlvType.IPFW_TLV_EACTION, idx=1, name="nptv6"), NTlv(0, idx=2, name="AAA"), ], "insns": [ InsnIp(IpFwOpcode.O_IP_DST, ip="1.2.3.4"), - InsnU32(IpFwOpcode.O_EXTERNAL_ACTION, u32=1), - InsnU32(IpFwOpcode.O_EXTERNAL_INSTANCE, u32=2), + InsnKidx(IpFwOpcode.O_EXTERNAL_ACTION, kidx=1), + InsnKidx(IpFwOpcode.O_EXTERNAL_INSTANCE, kidx=2), ], }, }, - id="test_eaction_ntp", + id="test_eaction_nptv6", ), pytest.param( { @@ -228,7 +444,7 @@ class TestAddRule(BaseTest): ], "insns": [ InsnComment(comment="test comment"), - InsnU32(IpFwOpcode.O_CHECK_STATE, u32=1), + InsnKidx(IpFwOpcode.O_CHECK_STATE, kidx=1), ], }, }, @@ -242,9 +458,9 @@ class TestAddRule(BaseTest): NTlv(IpFwTlvType.IPFW_TLV_STATE_NAME, idx=1, name="OUT"), ], "insns": [ - InsnU32(IpFwOpcode.O_PROBE_STATE, u32=1), + InsnKidx(IpFwOpcode.O_PROBE_STATE, kidx=1), Insn(IpFwOpcode.O_PROTO, arg1=6), - InsnU32(IpFwOpcode.O_KEEP_STATE, u32=1), + InsnKidx(IpFwOpcode.O_KEEP_STATE, kidx=1), InsnEmpty(IpFwOpcode.O_ACCEPT), ], }, @@ -260,7 +476,7 @@ class TestAddRule(BaseTest): ], "insns": [ Insn(IpFwOpcode.O_PROTO, arg1=6), - InsnU32(IpFwOpcode.O_KEEP_STATE, u32=1), + InsnKidx(IpFwOpcode.O_KEEP_STATE, kidx=1), InsnEmpty(IpFwOpcode.O_ACCEPT), ], }, @@ -373,6 +589,9 @@ class TestAddRule(BaseTest): pytest.param( ("skipto 42", InsnU32(IpFwOpcode.O_SKIPTO, u32=42)), id="skipto_42" ), + pytest.param( + ("skipto 4200", InsnU32(IpFwOpcode.O_SKIPTO, u32=4200)), id="skipto_4200" + ), pytest.param( ("netgraph 42", Insn(IpFwOpcode.O_NETGRAPH, arg1=42)), id="netgraph_42" ), diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index f3b2dc051c7d..f7372f41a48a 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -216,8 +216,8 @@ enum ipfw_opcodes { /* arguments (4 byte each) */ O_VERREVPATH = 36, /* none */ O_VERSRCREACH = 37, /* none */ - O_PROBE_STATE = 38, /* v0:arg1=kidx, v1:kidx=kidx */ - O_KEEP_STATE = 39, /* v0:arg1=kidx, v1:kidx=kidx */ + O_PROBE_STATE = 38, /* kidx=kidx */ + O_KEEP_STATE = 39, /* kidx=kidx */ O_LIMIT = 40, /* ipfw_insn_limit */ O_LIMIT_PARENT = 41, /* dyn_type, not an opcode. */ @@ -228,13 +228,12 @@ enum ipfw_opcodes { /* arguments (4 byte each) */ O_LOG = 42, /* ipfw_insn_log */ O_PROB = 43, /* u32 = match probability */ - O_CHECK_STATE = 44, /* v0:arg1=kidx, v1:kidx=kidx */ + O_CHECK_STATE = 44, /* kidx=kidx */ O_ACCEPT = 45, /* none */ O_DENY = 46, /* none */ O_REJECT = 47, /* arg1=icmp arg (same as deny) */ O_COUNT = 48, /* none */ - O_SKIPTO = 49, /* v0:arg1=next rule number */ - /* v1:kidx= next rule number */ + O_SKIPTO = 49, /* u32= next rule number */ O_PIPE = 50, /* arg1=pipe number */ O_QUEUE = 51, /* arg1=queue number */ O_DIVERT = 52, /* arg1=port number */ @@ -248,10 +247,12 @@ enum ipfw_opcodes { /* arguments (4 byte each) */ * More opcodes. */ O_IPSEC = 58, /* has ipsec history */ - O_IP_SRC_LOOKUP = 59, /* v0:arg1=table number, u32=value */ - /* v1:kidx=name, u32=value, arg1=key */ - O_IP_DST_LOOKUP = 60, /* arg1=table number, u32=value */ - /* v1:kidx=name, u32=value, arg1=key */ + O_IP_SRC_LOOKUP = 59, /* kidx=name */ + /* lookup: kidx=name, arg1=key */ + /* and flags, bitmask */ + O_IP_DST_LOOKUP = 60, /* kidx=name */ + /* lookup: kidx=name, arg1=key */ + /* and flags, bitmask */ O_ANTISPOOF = 61, /* none */ O_JAIL = 62, /* u32 = id */ O_ALTQ = 63, /* u32 = altq classif. qid */ @@ -286,31 +287,36 @@ enum ipfw_opcodes { /* arguments (4 byte each) */ *** 1425 LINES SKIPPED *** From nobody Sun Mar 1 19:07:14 2026 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 4fPBQF6Wxqz6TWZn; Sun, 01 Mar 2026 19:07:17 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPBQF5wgPz3rsy; Sun, 01 Mar 2026 19:07:17 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772392037; 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=I3Sj7eSWHX/Tuszk1jdhB46RdgYowo7kdEoCmtjurVQ=; b=ma7wq62iD5Y7ycvqs9u2ss7OOO5Xk6zWBWksksyZGjKT9d5aeKQiRNZIYM1oTFlh2E5SUv t5GJSGoP71O/XYMrCgeBsSdOw6K+XKPXP9nPotsuq0538LLbPRBarz1SGfcCScTxRFFYzb q1ljLVdEH4BcVNlNYqmVG2C+dEcynyr9uLuoCORCI6Qw9TG577PwcbifMabXflADLVKtN7 sOAlksQMYMGLxAeVarllEc8QqNUwWfyjMFGNjWTZSgVK0I98Gbr0K5I5rwTseRYHtOwjn5 6NUOLBTwgi3fJlkmu4622hVhuSAYC+JyBMej+tGfVtkWf3nNe6UQyWv7OSl3Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772392037; a=rsa-sha256; cv=none; b=pc+1Z+4m/aeAjwD0aQoN/EBF9UR9/wetj9H0qV2+S+tDk10MuZTHhfgFx4y7B8WWr6ydIp /M3XEio9aH1ucE0LTp8FjqrDfALqao4VTO8FFTBowhB1O/t89MiS5iS7jeRQlay9HbP4gK s/qUO+AVGulNWOjh0dVrcEUFwxbICGifQ7xpU1H5TybNZsBgki8EEVPky3KL/R7ChpCLB2 0BItyo/NGwsrnDWfxDPfMVAMokxwusc2igPAFGLPeYCvFmUDb2MZFXbhiyGLQMrapALVSF 3D1w5DOZozf6J1HZO5Cygylr/lGbOw18l47Vx/Qcg/JnPIoW5taZAKiAuMbntA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772392037; 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=I3Sj7eSWHX/Tuszk1jdhB46RdgYowo7kdEoCmtjurVQ=; b=mozUIiXuGcBFMIXoF+WZQ8ueBintz8xpHCf7UjcrKYM8xr4C5f8j7s3CjMIt/FV62MrIdk OcAvUAUKDEwarpHKTcQdMtuSSkcX33wwXY1nG3xx2uVJzu2BIL+xkiK1eDy1hRH6/9TdaG mz6Cvop8s2XTWyC6T6FD/eLw5kuwWJKhon/zJpixZ3KR4fFyFmAJtMTV0xf4JzYXIoBmSq 7czVebeVUmlgeCeJZBPns0X06sNdoWX16Tq4V0MVtKZkYfJjC3WD0nTQvs8V+R9d+9EU/9 fq0XpH6fiGFzL+oitpdf4IS2o9LNp/2teoDo6bVTdUoxj1eTetY2ASfnvckg9Q== Received: from ltc.des.dev (2a01cb0585090500922e16fffef1acef.ipv6.abo.wanadoo.fr [IPv6:2a01:cb05:8509:500:922e:16ff:fef1:acef]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fPBQF4W3dzNN8; Sun, 01 Mar 2026 19:07:17 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 825DAF7536; Sun, 01 Mar 2026 20:07:14 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Enji Cooper Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup In-Reply-To: <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> (Enji Cooper's message of "Sun, 1 Mar 2026 10:07:29 -0800") References: <86tsuzojnj.fsf@ltc.des.dev> <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sun, 01 Mar 2026 20:07:14 +0100 Message-ID: <86pl5nnzbx.fsf@ltc.des.dev> 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 Enji Cooper writes: > I wasn=E2=80=99t aware that their version didn=E2=80=99t really work; the= RCS Id in > the file was ancient, hence the question about reconciling with > OpenBSD (I thought there was a chance that we could maybe leverage > some of their code/fixes in the future to reduce maintenance effort). I think the opposite would be more likely. The only functional changes to OpenBSD's diff3 since the version recorded in our copy was to fix issues with inputs that don't end in a newline. > About the sysexits change: is there a reason why it was made? I=E2=80=99m > asking because another recent change made by an external contributor > introduced sysexits use, whereas this change removed it. EXIT_SUCCESS and EXIT_FAILURE are not sysexits, they are ISO C aliases for 0 and 1. They were only used in three places, while the rest of the code used 0, 1, or 2. I'm not opposed to switching to sysexits, but I don't really see any benefit. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sun Mar 1 19:22:25 2026 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 4fPBm33rrcz6TXg0 for ; Sun, 01 Mar 2026 19:22:43 +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 4fPBm30Mmdz3t44 for ; Sun, 01 Mar 2026 19:22:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-82735a41985so2121138b3a.2 for ; Sun, 01 Mar 2026 11:22:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1772392957; cv=none; d=google.com; s=arc-20240605; b=bXSDQsjsBNJZKv7NTwuI8Nn51wYoXK4C//cx6mgwLOCuoEQhueimZswEb39MVtYwbB A6FNNypmOO1GFyh/8EaNmGpMjW5hrkN0S2v1Y8lYXXJ2uMaMAPPfCAIPdFXJHQ6z34bS heDtR1v06hC228E5cOEFT+1c/wqO7/SXUPDtcd8LuJOl2KBe6Q304+15JXfPagKOAyr+ ClsXovXwnD2bQuDGDd46oG+2bvIJT0PT8cW1GboWWHAyGV80kqj7en0GGRxjmxO5yqPt fcNlluPlW26YR2KSb6Ru+39l9nY/+SA18K9IIKjhq/aufF3LLJnd0blDJg+ufoP97cjs i8EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=ufrLQuvpX00unka40YT9ori0Ua8cLA1FyH9er7qzPfY=; fh=H+2vp78v/4LUNN8Zj0asBi8vIThI/ZHUsc3q1DbUAoM=; b=O5pCID/pNn2j9P3RkUtZxFeHVvD7xNtSF3k/8ubiamTmQ3lr5n4wG6KCNOb2FE0mK1 lEeEZUggV2sbko80qLRXewmKzShySVQtbCfWONKL4bHP3ldSkK9JK2Oe/XWuxYpXusLy p+fTKpC6DSiIK0KqxJnvvLctm6SGqAvSGm9TUkWMavY1JvBMeIkt8Uf/9cQNH+jpiAfi +G4OXxxiiHsQ7BDRmcXwfM78Y9wpvOI3qIo99qXfp5gajc87H+8OdHWeYpCXs7Mo5XAH S7bqj8yu77yIFnztnx9fYzSWgppvIrwvBpkpBVpHNxtD/n8wuMIMdt2SWy8HsYMPBrsi YXjw==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1772392957; x=1772997757; 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=ufrLQuvpX00unka40YT9ori0Ua8cLA1FyH9er7qzPfY=; b=y49jUsIysF5LHBHnVVatY97U6UzrApOR50lipIr1Nz2n6DNaLO96Akv0SZChTveCOZ tfTQIsSDS9UTb2SpDjWmYRugZt0lKevTkv42GQ/ic9AX2YcO/N0gyGe1yzlIpm6KhUB+ adcOICncGkNs2+r9lZqoHgFTBkCAHU/N21Rf8jjYH20vbeAx/IuYwUeaqVr6rjUw3toz zCHY3F7OY5nU3U8D0hjNpscqD+YxElYXERgXJmqPpjivHtgFwPzPPbWTXqNvijaOFzCQ wGkbpNTeqqbqYhlscxtnQ4JNrFs+66swR4tgDTgKrMzjmyQPvVbuD5daaon9p7MYOIeG fcYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772392957; x=1772997757; 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=ufrLQuvpX00unka40YT9ori0Ua8cLA1FyH9er7qzPfY=; b=me+UxBz/3LONW1YdImWuKmu3Tbmj+s3/Ecad2D8JpY7hCrUY17GYjYr/tav0PtIgcn K5soJjUszS0sSTfe2M9dCB7VIgdbjmplSfbT4Kv96YZiKIIKc8unhKYSRoTBTdR8Jefn DjjejkGUNAyq+4Redli4qRr/EzfuUeoe5vTIxCg78PbxZ6z1GAv/mvZ/Y3tc9mSMy/ys FegrEh13vCqh/8JxruyvanlJBnwBNTRSQZ1jHjmvEnbxfysJ2+rArFKPPuqfKgSQ3/sv 6tMJtBNysAnVL2Zxv/ilIsTjPFmQaBWVcuJAa7ERA2a9gP9Z39IpN5gkb+f12TuiazCh Ms+g== X-Forwarded-Encrypted: i=1; AJvYcCVJ7RJb4m9ZyaZoppbLkdmcxykjc+1CM3Iu903l+df0SsOgruUlWIgblvS4vk+a166VChoTp7OqVTzq1wwARUUP/T5zvg==@freebsd.org X-Gm-Message-State: AOJu0YyZB9eDtiw+HwD4DHLVOWSDiBzj9Fkg3zhmOnnShNV+ycYkEU3E QxDMzRtxf1r8tBclutufQrV+VxXJZxMt4SlZvaclPFyQml9u0UrW7KsHYyEeFxbTsHxtq1q1oII 0E07JOtMVbrvx1YYgJk8rAqFodXS2ZoZiRJkqG+47pO+W6c6pYBlt7x8= X-Gm-Gg: ATEYQzyVMD4iITO7AwctkwXs77XWnjx8SbZUPKRtoWIoG1RhEYqQ5W2/3/CaPC9OY1F TVEI2YaFwYW1k5CggYU4bCTDQwb9p+R/CameOxB5J2Dmmm3Rlbyn1nkV1KN40FxtEahp4cx1z+U tA2sQtLvhkmn3UbT76FWuzUovn8TOsAIqCcjXBVH+OrRvOAVcC+CBUHwtyQYrHHUfbzP/DTkmcJ IA0bUUSKtNU/ZDv45p0JDNMEmbog7sf0oNC0aAOHde1u8IDkBfIVvf9WiOdTfgrdQQuilOoWkXf tUUNnmfWfj+A1m/NYw== X-Received: by 2002:a05:6a20:3946:b0:366:14ac:8c70 with SMTP id adf61e73a8af0-395c3b50264mr9453152637.70.1772392956751; Sun, 01 Mar 2026 11:22:36 -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: <86tsuzojnj.fsf@ltc.des.dev> <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> <86pl5nnzbx.fsf@ltc.des.dev> In-Reply-To: <86pl5nnzbx.fsf@ltc.des.dev> From: Warner Losh Date: Sun, 1 Mar 2026 12:22:25 -0700 X-Gm-Features: AaiRm509KK0UvuYImE-L0MGQM8CpurerVVlE6aJ0DQugi7S4fBMFPTFcSIY1QWk Message-ID: Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: Enji Cooper , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000096febf064bfb64e5" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fPBm30Mmdz3t44 X-Spamd-Bar: ---- --00000000000096febf064bfb64e5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Mar 1, 2026 at 12:07=E2=80=AFPM Dag-Erling Sm=C3=B8rgrav wrote: > Enji Cooper writes: > > I wasn=E2=80=99t aware that their version didn=E2=80=99t really work; t= he RCS Id in > > the file was ancient, hence the question about reconciling with > > OpenBSD (I thought there was a chance that we could maybe leverage > > some of their code/fixes in the future to reduce maintenance effort). > > I think the opposite would be more likely. The only functional changes > to OpenBSD's diff3 since the version recorded in our copy was to fix > issues with inputs that don't end in a newline. > > > About the sysexits change: is there a reason why it was made? I=E2=80= =99m > > asking because another recent change made by an external contributor > > introduced sysexits use, whereas this change removed it. > > EXIT_SUCCESS and EXIT_FAILURE are not sysexits, they are ISO C aliases > for 0 and 1. They were only used in three places, while the rest of the > code used 0, 1, or 2. I'm not opposed to switching to sysexits, but I > don't really see any benefit. > Nor I. Aren't the current valutes mandated by POSIX or by what POSIX mandates diff return though? Switching to sysexits would make that harder since they don't align well with POSIX requirements. Warner --00000000000096febf064bfb64e5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sun, Mar 1, = 2026 at 12:07=E2=80=AFPM Dag-Erling Sm=C3=B8rgrav <des@freebsd.org> wrote:
Enji Cooper <yaneurabeya@gmail.com> writes:
> I wasn=E2=80=99t aware that their version didn=E2=80=99t really work; = the RCS Id in
> the file was ancient, hence the question about reconciling with
> OpenBSD (I thought there was a chance that we could maybe leverage
> some of their code/fixes in the future to reduce maintenance effort).<= br>
I think the opposite would be more likely.=C2=A0 The only functional change= s
to OpenBSD's diff3 since the version recorded in our copy was to fix issues with inputs that don't end in a newline.

> About the sysexits change: is there a reason why it was made? I=E2=80= =99m
> asking because another recent change made by an external contributor > introduced sysexits use, whereas this change removed it.

EXIT_SUCCESS and EXIT_FAILURE are not sysexits, they are ISO C aliases
for 0 and 1.=C2=A0 They were only used in three places, while the rest of t= he
code used 0, 1, or 2.=C2=A0 I'm not opposed to switching to sysexits, b= ut I
don't really see any benefit.

Nor I= . Aren't the current valutes mandated by POSIX or by what POSIX mandate= s
diff return though? Switching to sysexits would make that harde= r since they don't
align well with POSIX requirements.
<= div>
Warner=C2=A0
--00000000000096febf064bfb64e5-- From nobody Sun Mar 1 19:31:33 2026 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 4fPByH03L8z6TXrG; Sun, 01 Mar 2026 19:31:35 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPByG6V2Zz3v2M; Sun, 01 Mar 2026 19:31:34 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772393494; 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=ZDQywyY6j3doTdwZ7f5PpbeuFsvuqCX2YtJ8U4WyOno=; b=AtH4jWG0VZHAku1T9SuSC/hDpWx4Yfnv0YCjnxPFsSZz0UEMn13bKPCriM/X4h9nhr/MSh 5EN6M691IaWBwEhIoiBWE/av+w4+woTEYwpS9OAZku79ICOC/Cu6qjd4HAUU4wG3WECkoT CeNF8PH2DcJNgQEruLz/6CytfD7D3UUzkudBKyQD8/0+M9q3cYtcpyHwfpEZsQ/z7qZO8Z 7JUVdxYqBk7UGsbI44u4zTO+CX3o8fFGJe1GdrNGA03K3eOwQIt23D8pBzYpgegwLkquHC O2fa/twumb2AAH+xmIpdDTuoxDuYIJSIYbyEg/tOeKNyCPM/txqhKRoh0mit7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772393494; a=rsa-sha256; cv=none; b=JHjpmOx+cmS6DazXGfk4s5eHssSLAVRmh/+STbHxC8Y6NK4ONLyu/asLscsJGg5RP1GWG4 a9874hFJ2TPDxOax/GRwNQ6nLEUknaqCFsYZTB5XwXrOPTPq3d1g9Km1TRtPeL8F+XM8UB JhYyTidvC288zQQTYJNK3+ubiLr0e47nhOLfrbIFoXg8DJ78xeEWY4RXeCn5EcP0NXTjwJ XIkjti8VQdnZJRXX3E8OqCc3i2w4y1z2Rjug/wibZTFOBBLoCvdGzIEGLoEZyIKgVv8NDu Nnx5YdIt9gnLJXygNMrvm7ackVLA70Tq3Q9iZqPY5Umfpb6jFWoJ9QX5Wn4Bww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772393494; 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=ZDQywyY6j3doTdwZ7f5PpbeuFsvuqCX2YtJ8U4WyOno=; b=whZH2YZEKV1TrkD/qpsjO6wATqfN/DUD9tStRFKISFzT9BUORTcf6iE51VVAvNdXKaNLCX yR2gLQ8i3rdWipCYX/P0Yar+ct4Hh0HqX9XcU3MUzrzDtIB7Cf9Pws6q5W78ZJCF56QU0P xtYt4wBcX74bvhep69MqnRroRO45ed0IgzI6QfZAfNk0ebfMH52uPNZDxIyy/kuU6CVv4v NF9+TAUO7h2zRX0VfJPKW3DcKYw22RcrzuMjhkxjUOpI1UuayEcc4UiEST8V2dRtphyaVi 414GGCqCo4pMbPUdDQeBGqYS8UVdp6fBin9cxKvFGl03hWgzQTIxplRggU4N4Q== Received: from ltc.des.dev (2a01cb0585090500922e16fffef1acef.ipv6.abo.wanadoo.fr [IPv6:2a01:cb05:8509:500:922e:16ff:fef1:acef]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fPByG4y7dzNNM; Sun, 01 Mar 2026 19:31:34 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 6F62DF703A; Sun, 01 Mar 2026 20:31:33 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Warner Losh Cc: Enji Cooper , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup In-Reply-To: (Warner Losh's message of "Sun, 1 Mar 2026 12:22:25 -0700") References: <86tsuzojnj.fsf@ltc.des.dev> <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> <86pl5nnzbx.fsf@ltc.des.dev> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sun, 01 Mar 2026 20:31:33 +0100 Message-ID: <86ldgbny7e.fsf@ltc.des.dev> 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 Warner Losh writes: > Dag-Erling Sm=C3=B8rgrav writes: > > EXIT_SUCCESS and EXIT_FAILURE are not sysexits, they are ISO C aliases > > for 0 and 1. They were only used in three places, while the rest of the > > code used 0, 1, or 2. I'm not opposed to switching to sysexits, but I > > don't really see any benefit. > Nor I. Aren't the current valutes mandated by POSIX or by what POSIX > mandates diff return though? Switching to sysexits would make that > harder since they don't align well with POSIX requirements. This is diff3, not diff, and is not covered by POSIX. If we want to be fully compatible with GNU diff3, we should change all our error exits to 2 (they are currently a mix of 1 and 2), and exit 1 if and only if we successfully found differences between the files. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sun Mar 1 19:43:47 2026 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 4fPCDd3D0Kz6TYWG for ; Sun, 01 Mar 2026 19:44:01 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) (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 4fPCDd2l5hz3wDZ for ; Sun, 01 Mar 2026 19:44:01 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-823c56765fdso1775824b3a.1 for ; Sun, 01 Mar 2026 11:44:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772394239; x=1772999039; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=9rQsp5T60QgurXgWN5H9xC0vamO0UUsU36o4thf/tdI=; b=jKYyKsNrRsPiuBKEx9rq3v5L8CQ/QAdmuvuy+NRd0BNEybmRdXslH5IQtfGpTjgfV9 DSR/gdSEu6JYOBiYs2NPH3rRCWLazT9gYwGxNsKH1c1nXlbtZQ+xw9vY66fVf4coXhMa QyyO44pseF7rrULRl8GUyedjvN+JTBX3zKrqIX/C0o71CiUufjv9uBoQgWMcdGYz2YLO QQcgfLXO41aTLAU7yNa0qO7SPFBAgP3WQ34Xowcq2CfeipOl/0nXSh20FZE2+birfTUh /DGMquuhcZVAT75Lwge/BnGKtN/QDOSmgiKcJHLVK9tW9YrzRxYZxKoOTNKeEraGsNYA qkug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772394239; x=1772999039; h=to:references:message-id: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=9rQsp5T60QgurXgWN5H9xC0vamO0UUsU36o4thf/tdI=; b=EIFNZucJD2BJpByaJwKVtAmsiLKA7igXhye3ONwMZiPtq+8FlZIUlf7nwo2IoVdgz2 /Rh9NrG9mrAW9i5g4c4HCmfwqq0sLlHToZ8WNKoqBv8UcQl0Chf5C0WM2TeLRfR+p/3M s+49wxIxuaXDc/97puIjmHmjKf/UDHihqVr9HfnqjcfO0gpUnQbqH/1L06ogqsMTZui6 LFGP8U0O7BbxzsWKXCRSj92+wS01CDZWiL7R0VOPwKXVk4Lnf+LgrJe7oFyjK/Prf33H d966twdjjfc9uvAj+eDrrU/nngFZDWub7mtPf0ULLzSCtlyhCz7iWgCcPwDJtX6lPBEz Zxgg== X-Forwarded-Encrypted: i=1; AJvYcCU2Hp+FrvNqchMKRHH+fBko9Mu60fdaK6j0KFjuLRjSrNaYVKxe600Gq5/7z58GpHL29ZXeIoN50tcwAzhuFEIMTlEiUw==@freebsd.org X-Gm-Message-State: AOJu0Yx/b2O9ZM7KgGT6X61719bH/uXD9Nl8h9HbVjHhhILdL0kE7xJO iGY2VuCauorTcd8HcyBT45yesqx1lRvTZj4QTaFLMRXy8s2S667Fj7fX X-Gm-Gg: ATEYQzwCa6QjJJ8BPba0+t+p6LB0QXibjhFyBpew/vORtfTTYfR5GjDo8bQuWuQwcB5 58asaR+RmVRodwGYtGCygvmeOReDjIadwbgBJBe88aRZh3uFisKCnhPg4u4PkHVHvuZMx7PwoJ5 QhrBheFXwA1qYFi5ZH7JbgWEJaH7JHPxgz4IBG8XazPnh078i9FBTwy3KJPcyNv+5Vxg1zS1R5N +KPw7c4o/1/z6kU/XTGpYh0KBUZ3N0fWZa6+cqp+L+6F64DbGmIdPsFP7+DsAZsTm8jJPI8U/xb cVf99lE/Y6MMIvcd2IoUXyrseUN98+iqmDY10NVeVLzwXLBlSEyzgVJ27ktZN0Z/0RyagIscJfA +XCkax6deovawA9i+PE5UsF+0R6tfpcKHv7ZF5jvKdWAQl5N42ji57DNdvB9FhPrYB5lAWDnFHw EpNvnfRno1RqwkCkae7GrIH8ZAMuiXhJgS2/CChCe+mJE= X-Received: by 2002:a05:6a20:56a3:b0:38d:efcb:2e8a with SMTP id adf61e73a8af0-395c3b41486mr8297043637.68.1772394239054; Sun, 01 Mar 2026 11:43:59 -0800 (PST) Received: from smtpclient.apple ([185.219.141.150]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3593dda3a4dsm10357809a91.10.2026.03.01.11.43.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Mar 2026 11:43:58 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_78667708-B488-4AA4-BD1F-6C9BD2D71E76"; protocol="application/pgp-signature"; micalg=pgp-sha256 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.1.3\)) Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup From: "Enji Cooper (yaneurabeya)" In-Reply-To: <86ldgbny7e.fsf@ltc.des.dev> Date: Sun, 1 Mar 2026 11:43:47 -0800 Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-Id: <3464A20F-B0F2-456E-8826-A43006457CC4@gmail.com> References: <86tsuzojnj.fsf@ltc.des.dev> <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> <86pl5nnzbx.fsf@ltc.des.dev> <86ldgbny7e.fsf@ltc.des.dev> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3826.700.81.1.3) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fPCDd2l5hz3wDZ X-Spamd-Bar: ---- --Apple-Mail=_78667708-B488-4AA4-BD1F-6C9BD2D71E76 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Mar 1, 2026, at 11:31=E2=80=AFAM, Dag-Erling Sm=C3=B8rgrav = wrote: >=20 > Warner Losh writes: >> Dag-Erling Sm=C3=B8rgrav writes: >>> EXIT_SUCCESS and EXIT_FAILURE are not sysexits, they are ISO C = aliases >>> for 0 and 1. They were only used in three places, while the rest of = the >>> code used 0, 1, or 2. I'm not opposed to switching to sysexits, but = I >>> don't really see any benefit. >> Nor I. Aren't the current valutes mandated by POSIX or by what POSIX >> mandates diff return though? Switching to sysexits would make that >> harder since they don't align well with POSIX requirements. >=20 > This is diff3, not diff, and is not covered by POSIX. If we want to = be > fully compatible with GNU diff3, we should change all our error exits = to > 2 (they are currently a mix of 1 and 2), and exit 1 if and only if we > successfully found differences between the files. You=E2=80=99re right: please ignore this part of my earlier reply = because it=E2=80=99s not relevant to what you did in this change. Thanks, -Enji PS Please don=E2=80=99t change the diff3 code to sysexits(3). Like you = and Warner pointed out it doesn=E2=80=99t make sense to apply them to = this utility.= --Apple-Mail=_78667708-B488-4AA4-BD1F-6C9BD2D71E76 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmklvMACgkQGpE5DjPs NJhhCg//e4C2UgFIdhWkTnJn+ckn8bZCzVq4RMmkKZR2IUc7HuzTyYlG0VmLrTaT 7VXG6BNra8nBgmwqdClvMrFcRZ2Zy+OpW/pMHgnqXzuRlWasyQbrPHjRKkV0Y6V7 I6JYOe7XumngSFyuujCzC604KhGTAjM1nKXewfXnw55xouHzi7NG0yigjYi4bDBm dleb2d7n5Xz5lwXrDewqYuKj501eNNj5JA+54Sc46+FDSH/geurjh5J1ihTr63vJ v8fhMGVzsjYjDwxRyKJmZs55ytQopwQV2LEDGxJygOOabiNweWJnYl852yy/jf0n QXxuhOu3RdCEU5FN00NuYecvsGneMZBsxB563rcR/rbRQGMR7/JPD3qTu7Bk47bQ TQSbWS5sm07BNXXLfqGhiXhJ4yTYiM4Sl2zSZYkJJyDw8yFSiosOADfhpRgZVqfV XbmASgJUQwMCuZiH5yEwPWnvIjSt0nMMGVyJrA3od+KNG0RA7R+uTUTt2ZuP1Blo tC8oOQX28OPe2ZMkJH/MOvV+0fB7GOuLq4qNWpWhTQTCEKqKJgd+e4jXAIvkXoNK meBypKr4e3aUkRX6d6mCxPYg9wTnjF50W1+MCj8lme/lKHBPGhUi0bvatAYn4R/q 3oPPPGeei6s/glxgaxyXXKy2sV4C/zKGtFhqQ3yscgftYf9E3Zo= =4KCo -----END PGP SIGNATURE----- --Apple-Mail=_78667708-B488-4AA4-BD1F-6C9BD2D71E76-- From nobody Sun Mar 1 19:52:12 2026 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 4fPCQ43L1Wz6TZkP for ; Sun, 01 Mar 2026 19:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPCQ42Vbsz400g for ; Sun, 01 Mar 2026 19:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772394732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6F81ysaG52/kxcszLZZm7eoQtLOHjVWHSutAcpizCrE=; b=UH138MjrlP4/8KUEQlwE5RaoweeZqMAuPdmxHOE4IuBncbB6orpaZxvGi48EgK4A/XeDXl KRGyunTQcSVklctxk/pX9wOZYucGA9L8W/UWNOtG0ecPYYHSoGam0J9Uu0atrVXd5gwGNS KBTvBKVmAgx7R6oZghoaT3V21vaf3h19a4YD9qvJagXCPr4ucJUhpprad9582QtI+3LFNq CMSk8wonttITuR1t05/WPu6B2IkBf1iuFvEYuG9LK7yg1pc6zQOD1rMEuLTgsx4QrfEgbe IBzDhetmvpMXAULEp4/xxaxmlxSmp7QyxPKofNhVdtRisE9xhyQTKOzBBQa0Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772394732; a=rsa-sha256; cv=none; b=JmHADUYUD8bf65uC1dIDVGJ49IotE0zZ4MLVHP+mqz74jmYDNhCwSZhxKITNclE9UW7yam MKFGBtl9+Eic80CELCcCWyuSGWO11KxV6aTV0bOrGI8y3ydGSlQAsw/QGXjp4YNmKAQg8V 9TwDA+gZ+4cua+Oz4IF3gk+0yCUC3dFanzQ2i7rghIeTWzGwJ1hulW67X6/nS5FTlBzbmb Reopimj6IRSW6svYotZjcGdiRj8U/2RUfaWu4iQlH2xKyRollvb3m/qMw/RM9dtAKbOZj1 hbdnqxTQzePY18+xn9nIXqaMES+RyZdU24zDI43Mu3sf9mx7twWtESWPN0yY+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772394732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6F81ysaG52/kxcszLZZm7eoQtLOHjVWHSutAcpizCrE=; b=Npmqb3zrTUJRqLU19ZsGopkZoq0mgB5fkAsPLlGInBTHTYGxZc6Mv5PYf079Lfb0ekHKv4 PMpBBJxnN30fA7Pt9vg7NaC9Au4HA+LR4Bd3nRPV+0hjKecyKudSBqIoMmXRwq7f9+Rpjg 5L5bHg9T+OLiGY2RNrZWOenQM/ycpCOA05NFmAhyT3j9HU8eEpSy27q4UTWSWi6njpE6nW qWu7mcDvLJ32055q5w1FktF1n5AD6nW1uH2d458fNR0MS7M4Vj9tq6dC4uTaiEaiw+MpjA 9R52scCPVW4gRxPfDYN7lnTfl1304oc8uaHM1NTUU1eQfDJQiM5lziZwPRInlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fPCQ425Hlz13Yg for ; Sun, 01 Mar 2026 19:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f3da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 19:52:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 5d9b185c33ae - main - share/mk/src.libnames.mk: Sort _DP entries 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d9b185c33ae137d4690a02504d94c3315c71a60 Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 19:52:12 +0000 Message-Id: <69a498ec.1f3da.436d1ce6@gitrepo.freebsd.org> The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=5d9b185c33ae137d4690a02504d94c3315c71a60 commit 5d9b185c33ae137d4690a02504d94c3315c71a60 Author: Joseph Mingrone AuthorDate: 2026-02-28 22:40:45 +0000 Commit: Joseph Mingrone CommitDate: 2026-03-01 19:46:33 +0000 share/mk/src.libnames.mk: Sort _DP entries Requested by: des Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55598 --- share/mk/src.libnames.mk | 240 +++++++++++++++++++++++++---------------------- 1 file changed, 129 insertions(+), 111 deletions(-) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 75a857ba2cff..388f9372abb0 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -319,167 +319,185 @@ _DP_9p+= casper cap_pwd cap_grp .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) _DP_archive= z bz2 lzma bsdxml zstd .endif +_DP_atf_cxx= atf_c _DP_avl= spl +_DP_be= zfs spl nvpair zfsbootenv _DP_bsddialog= ncursesw tinfow -_DP_zstd= pthread -.if ${MK_BLACKLIST} != "no" -_DP_blacklist+= pthread -.endif -.if ${MK_BLOCKLIST} != "no" -_DP_blocklist+= pthread -.endif -_DP_crypto= pthread -# See comment by _DP_archive above -.if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) -.if ${MK_OPENSSL} != "no" -_DP_archive+= crypto -.else -_DP_archive+= md -.endif -.endif -_DP_sqlite3= pthread -_DP_ssl= pthread crypto -_DP_ssh= crypto crypt z -.if ${MK_LDNS} != "no" -_DP_ssh+= ldns -.endif -_DP_edit= tinfow .if ${MK_OPENSSL} != "no" _DP_bsnmp= crypto .endif -_DP_geom= bsdxml sbuf +# The libc dependencies are not strictly needed but are defined to make the +# assert happy. +_DP_c= compiler_rt sys +# Use libssp_nonshared only on i386 and power*. Other archs emit direct calls +# to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared. +.if ${MK_SSP} != "no" && \ + (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH:Mpower*} != "") +_DP_c+= ssp_nonshared +.endif _DP_cam= sbuf -_DP_kldelf= elf -_DP_kvm= elf -_DP_casper= nv _DP_cap_dns= nv _DP_cap_fileargs= nv _DP_cap_grp= nv _DP_cap_pwd= nv _DP_cap_sysctl= nv _DP_cap_syslog= nv -_DP_crypt= md -.if ${MK_OFED} != "no" -_DP_pcap= ibverbs mlx5 bnxtre -.endif -_DP_pjdlog= util -_DP_usb= pthread -_DP_unbound= ssl crypto pthread -_DP_rt= pthread -.if ${MK_OPENSSL} == "no" -_DP_radius= md +_DP_casper= nv +# See comment by _DP_archive above +.if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) +.if ${MK_OPENSSL} != "no" +_DP_archive+= crypto .else -_DP_radius= crypto +_DP_archive+= md .endif -_DP_rtld_db= elf procstat -_DP_procstat= kvm util elf -_DP_proc= cxxrt -.if ${MK_CDDL} != "no" -_DP_proc+= ctf .endif -_DP_proc+= elf procstat rtld_db util z -_DP_mp= crypto -_DP_memstat= kvm -_DP_magic= z -_DP_mt= sbuf bsdxml -_DP_nvmf= nv -_DP_ldns= ssl crypto -_DP_lua= m -_DP_lutok= lua +_DP_ctf= spl z +_DP_crypt= md +_DP_crypto= pthread +_DP_cuse= pthread +.if ${MK_BLACKLIST} != "no" +_DP_blacklist+= pthread +.endif +.if ${MK_BLOCKLIST} != "no" +_DP_blocklist+= pthread +.endif +_DP_devstat= kvm +_DP_dialog= tinfow ncursesw m +_DP_dpv= dialog figpar util tinfow ncursesw +_DP_dtrace= ctf elf proc pthread rtld_db xo +_DP_dwarf= elf z +_DP_edit= tinfow +_DP_execinfo= elf .if ${MK_OPENSSL} != "no" _DP_fetch= ssl crypto .else _DP_fetch= md .endif -_DP_execinfo= elf -_DP_dwarf= elf z -_DP_dpv= dialog figpar util tinfow ncursesw -_DP_dialog= tinfow ncursesw m -_DP_cuse= pthread -_DP_atf_cxx= atf_c -_DP_gtest= pthread regex +.if ${MK_OPENSSH} != "no" +_DP_fido2+= crypto z +.endif +_DP_fifolog= z +_DP_formw= ncursesw +_DP_geom= bsdxml sbuf _DP_gmock= gtest _DP_gmock_main= gmock +_DP_gtest= pthread regex _DP_gtest_main= gtest -_DP_devstat= kvm +_DP_ifconfig= m +_DP_ipf= kvm +_DP_iscsiutil= md +_DP_kldelf= elf +_DP_krb5ss= edit +_DP_kvm= elf +_DP_ldns= ssl crypto +_DP_lua= m +_DP_lutok= lua +_DP_lzma= md pthread +_DP_magic= z +_DP_memstat= kvm +_DP_mp= crypto +_DP_mt= sbuf bsdxml +_DP_ncursesw= tinfow +_DP_netmap= +_DP_nvmf= nv +_DP_nvpair= spl +_DP_opencsd= cxxrt +_DP_panelw= ncursesw _DP_pam= radius tacplus md util .if ${MK_KERBEROS} != "no" && ${MK_MITKRB5} != "no" _DP_pam+= krb5 .endif .if ${MK_OPENSSH} != "no" -_DP_fido2+= crypto z _DP_pam+= ssh .endif .if ${MK_NIS} != "no" _DP_pam+= ypclnt .endif +_DP_pfctl= nv +_DP_pjdlog= util +_DP_proc= cxxrt +.if ${MK_CDDL} != "no" +_DP_proc+= ctf +.endif +_DP_proc+= elf procstat rtld_db util z +_DP_procstat= kvm util elf +.if ${MK_OPENSSL} == "no" +_DP_radius= md +.else +_DP_radius= crypto +.endif +_DP_rt= pthread +_DP_rtld_db= elf procstat +_DP_smb= kiconv +_DP_sqlite3= pthread +_DP_ssl= pthread crypto +_DP_ssh= crypto crypt z +.if ${MK_LDNS} != "no" +_DP_ssh+= ldns +.endif +_DP_stats= sbuf pthread +_DP_stdthreads= pthread +_DP_sys= compiler_rt +# Use libssp_nonshared only on i386 and power*. Other archs emit direct calls +# to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared. +.if ${MK_SSP} != "no" && \ + (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH:Mpower*} != "") +_DP_sys+= ssp_nonshared +.endif +.if !defined(BOOTSTRAPPING) +_DP_thr= c sys +_DP_pthread= ${_DP_thr} +.endif +_DP_tacplus= md pam +_DP_ucl= m +_DP_ulog= md +_DP_unbound= ssl crypto pthread +_DP_usb= pthread +_DP_uvmem= pthread +_DP_vmmapi= util +_DP_xo= util +_DP_zfs= md pthread rt umem util m avl bsdxml crypto geom nvpair \ + z zfs_core zutil +_DP_zfs_core= nvpair spl zutil +_DP_zfsbootenv= zfs nvpair +_DP_zpool= md pthread z icp spl nvpair avl umem +_DP_zstd= pthread +_DP_ztest= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs icp +_DP_zutil= avl geom m + +# Kerberos support .if ${MK_KERBEROS} != "no" .if ${MK_MITKRB5} != "no" # _DP_krb5support= no dependencies except for libc # _DP_verto= no dependencies except for libc # _DP_apputils= no dependencies except for libc _DP_com_err= krb5support -_DP_k5crypto= com_err krb5support crypto _DP_gssapi_krb5= krb5 k5crypto com_err krb5profile krb5support +_DP_gssrpc= gssapi_krb5 krb5 k5crypto com_err krb5support +_DP_k5crypto= com_err krb5support crypto _DP_kadm5clnt_mit= gssrpc gssapi_krb5 krb5 k5crypto krb5support com_err krb5profile _DP_kadm5srv_mit= krb5profile gssrpc gssapi_krb5 kdb5 krb5 k5crypto krb5support com_err _DP_kdb5= gssrpc krb5 k5crypto com_err krb5support gssapi_krb5 krb5profile _DP_krad= krb5 k5crypto com_err krb5profile krb5support verto _DP_krb5= krb5profile k5crypto com_err krb5support -_DP_gssrpc= gssapi_krb5 krb5 k5crypto com_err krb5support .else -_DP_roken= crypt -_DP_kadm5clnt= com_err krb5 roken -_DP_kadm5srv= com_err hdb krb5 roken -_DP_heimntlm= crypto com_err krb5 roken -_DP_hx509= asn1 com_err crypto roken wind -_DP_hdb= asn1 com_err krb5 roken sqlite3 heimbase _DP_asn1= com_err roken -_DP_kdc= roken hdb hx509 krb5 heimntlm asn1 crypto -_DP_wind= com_err roken +_DP_gssapi_krb5= gssapi krb5 crypto roken asn1 com_err +_DP_hdb= asn1 com_err krb5 roken sqlite3 heimbase _DP_heimbase= pthread _DP_heimipcc= heimbase roken pthread _DP_heimipcs= heimbase roken pthread +_DP_heimntlm= crypto com_err krb5 roken +_DP_hx509= asn1 com_err crypto roken wind +_DP_kadm5clnt= com_err krb5 roken +_DP_kadm5srv= com_err hdb krb5 roken _DP_kafs5= asn1 krb5 roken +_DP_kdc= roken hdb hx509 krb5 heimntlm asn1 crypto _DP_krb5= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc -_DP_gssapi_krb5= gssapi krb5 crypto roken asn1 com_err -.endif -.endif -_DP_lzma= md pthread -_DP_ucl= m -_DP_vmmapi= util -_DP_opencsd= cxxrt -_DP_ctf= spl z -_DP_dtrace= ctf elf proc pthread rtld_db xo -_DP_xo= util -_DP_ztest= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs icp -# The libc dependencies are not strictly needed but are defined to make the -# assert happy. -_DP_c= compiler_rt sys -# Use libssp_nonshared only on i386 and power*. Other archs emit direct calls -# to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared. -.if ${MK_SSP} != "no" && \ - (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH:Mpower*} != "") -_DP_c+= ssp_nonshared +_DP_roken= crypt +_DP_wind= com_err roken .endif -_DP_stats= sbuf pthread -_DP_stdthreads= pthread -_DP_sys= compiler_rt -# Use libssp_nonshared only on i386 and power*. Other archs emit direct calls -# to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared. -.if ${MK_SSP} != "no" && \ - (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH:Mpower*} != "") -_DP_sys+= ssp_nonshared .endif -.if !defined(BOOTSTRAPPING) -_DP_thr= c sys -_DP_pthread= ${_DP_thr} -.endif -_DP_tacplus= md pam -_DP_ncursesw= tinfow -_DP_formw= ncursesw -_DP_nvpair= spl -_DP_panelw= ncursesw .if ${MK_MITKRB5} == "no" _DP_rpcsec_gss= gssapi .else @@ -501,10 +519,10 @@ _DP_netmap= _DP_ifconfig= m _DP_pfctl= nv _DP_krb5ss= edit -_DP_iscsiutil= md # OFED support .if ${MK_OFED} != "no" +_DP_bnxtre= ibverbs pthread _DP_cxgb4= ibverbs pthread _DP_ibcm= ibverbs _DP_ibmad= ibumad @@ -514,11 +532,11 @@ _DP_ibverbs= _DP_irdma= ibverbs pthread _DP_mlx4= ibverbs pthread _DP_mlx5= ibverbs pthread -_DP_bnxtre= ibverbs pthread -_DP_rdmacm= ibverbs -_DP_osmcomp= pthread _DP_opensm= pthread +_DP_osmcomp= pthread _DP_osmvendor= ibumad pthread +_DP_pcap= ibverbs mlx5 bnxtre +_DP_rdmacm= ibverbs .endif # Define special cases