From nobody Mon Dec 29 01:16:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbN4nPkz6LQdh for ; Mon, 29 Dec 2025 01: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbN2tT5z3X9q for ; Mon, 29 Dec 2025 01:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TYOk0XilNFzNgCrEYYi13y/HDJWNxZg4ytQfuTeo35w=; b=fJlO/3m2mqdww3eMo1+0a3i3StQN+/DYk8wcnFLHqZyuC0Y4tj+I5CIY3M9skqt5XU1br8 AN3yB+vKlcjLHMapYq83qflzYzQTkJ9N9l03KxxM5zEg1e85CzwUaE3FEy6Z0afSttwNBr 2b5Sg20Her3mabS0gGtQXxGhTP247UbG3dDHJO3bTxQXbBSrqHxPKi0+AyCNh9R2eJxvij EvlGGmPgzHfieQEA0gsbWgKoQEuCQpRMeGzfCJeq/VjxlGORbn+2wznuogvz3c8Fsd2icC YawLvjeLq8zSv0K9ZF7WClBtWdHtzKadXYKeii4af4W6gdsW4vI5UcStMlfO8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TYOk0XilNFzNgCrEYYi13y/HDJWNxZg4ytQfuTeo35w=; b=h5gZSh9bDOGCGyeEi9lX9Mu5LOxv170NL12pFQEaAQIElJSfdqKfnkFQYQ+mCg7D797qDQ mLgxNMbbtsz1D6embRLTsH3fvlmXsp+tyD1T1wnf428Igb4kS3UpiGbjuzImuA9ATNrTI4 7QxLP7QWOxZEidQHDmPdaQFBEiP4ZF6lcSsz8cmqcz/0ERm6J+04GnIAnljqcYoFfhNZfy MvEFoHGmsCtolfEd0deYqoeXJEJLj6zf9ouAbDEOpaYVfhMFPT0lHmN86y462AYYzF2c5+ JT/RM93cEEjuNj4I5nxPC+JZia29rf50qMLQeZK0rdXaF6cg9fii9df/2U3Yfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970992; a=rsa-sha256; cv=none; b=lHiEWGCL8GsZVbLTv7IoDdh4RPRrdveB3nxmd21Pf8NaaKeae3yOY9uUsENu7a/9IuWfZs +pA5tFolaukSI1LrAaw55l3ThMZ33NAu3NXfMFUkMYXPzQGm7yZIEcnWVdGSa138jblUk+ /dVOoVoMO1DoznsRTFJl4H2QXHYZhRZ/EawzXp1cNG4xFxNKXvZyiy+Fco4wQ8iKQKF3kJ a/BXSM/rIeESHObXUXqYPDPI0f0ChKvOr9tUZWWHzYs0rPuXNeQ4H8NCfWzfoXa1h+wEon EdSJJWhAtvQmK21ZVHPH+SkG4hEAuxawlzm3K70lp9O4QZRWVFdIhObxCk0kKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbN1bSzz17b6 for ; Mon, 29 Dec 2025 01:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38b28 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 37ddbbe5535c - main - libc/gen/err.c: remove 'extended error' herald from extended error output List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 37ddbbe5535cb6c27b8a026b2f28d64319b9f802 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:32 +0000 Message-Id: <6951d670.38b28.6154193b@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=37ddbbe5535cb6c27b8a026b2f28d64319b9f802 commit 37ddbbe5535cb6c27b8a026b2f28d64319b9f802 Author: Konstantin Belousov AuthorDate: 2025-12-27 13:53:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 libc/gen/err.c: remove 'extended error' herald from extended error output Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- lib/libc/gen/err.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c index 16cbe27693e7..793bf7522e42 100644 --- a/lib/libc/gen/err.c +++ b/lib/libc/gen/err.c @@ -120,7 +120,7 @@ vexterr(bool doexterr, int code, const char *fmt, va_list ap) } fprintf(err_file, "%s", strerror(code)); if (doexterr && extstatus == 0 && exterr[0] != '\0') - fprintf(err_file, " (extended error %s)", exterr); + fprintf(err_file, " (%s)", exterr); fprintf(err_file, "\n"); } From nobody Mon Dec 29 01:16:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbP4z1Fz6LQdk for ; Mon, 29 Dec 2025 01:16: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbP27lGz3XCq for ; Mon, 29 Dec 2025 01:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaS1OtD0VCRSvFC8FTf8WgTS1mlcdHs8lHq8n4GEK/Q=; b=KivcPHcNEN32jZ1p5ydXEsDKq7ZjA5MKgGteCz6OHO2qX2hZtrMdh2KZRg+wxTTJW+Iivq JyoVC7aNixJsa6ZRLyr5VxsUGvq9n2VMncarHtQGJsr7yOo87t1GX0YT2VvaPEHGpl6zs8 DMe7abD7rmNX4x9o22hpic7l8MH6YKkRdEGQ1RqrESCSgDmSqAtVBXJgLUDr6iP069Z1K+ 5uk9AGZCTg22gwgEPThAi07P90CN0I7Lj4+6jDOZcazzd6vm7vIuWfCL6WWTtWXrDV10u1 VUnz02D60U5qZKAV0SsHkkla/P4vBV8Dt3zBbfAh5fdwK4nUG3F6xDYWFSsDEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaS1OtD0VCRSvFC8FTf8WgTS1mlcdHs8lHq8n4GEK/Q=; b=P0bGzh+AHYuhGgFtpYPDmwDuOd+3Q7CilaqECqlcH+vWJVpHGc3x9eaNtw9V1C6Z100Dm4 oDNsSGbUB/ercYjJU3EtEnnqPESOiDgo0I9SCppCqh0S09MpV0hvjcJ9PDBCPjNbEeWi5k kZuQs+J4a+D1tycWm2uiTpbZnlqyvMnpneX8TurSjvuoLVJzbJZFJMdaaXPlQ0kjDK8RmL QrTcUKnZ2A+2bWy67us2F00tuiIyXPqaOdvPKfyM4poUWGpBOodFpJ4dI06tfzluvtxwMR nMrWrPnUdTeX32UbPVNqJSClh0g9NZNSELn3ZV8QozoDe0Y8KfYOrLT4XgcoOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970993; a=rsa-sha256; cv=none; b=Kf/XYpq2KIhm1njBoTSu++0K8i9JSNPCDg54pczqXZcW+9LqkPPcXNCpQqSZRhLU0eP37U nulehN1XD6T1AZrpWRNhWZmfME+V3Gc/hhhMqHP2QzXkk1nmHjt7uU162BTyV+3mw/xeWh lxCozVaL5S01aJaOle8ONSLRLpz1Kq79QZeI/S0q8gVA/FKuiGL17AyRD8UrP2Br+DO0aF rcUReDSY0Ivmzkoebjltgfvzs8aunRaBawIBEhTVaq/qDWaQGmqrL7ahsKf2so4+d6mVVW OLotssSY/BMLVrpga8XUvXxk1ykjP4zoJ3aD3NGs7Dn2BuV4ECcT9jCPoT2cnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbP1c1lz17Tg for ; Mon, 29 Dec 2025 01:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 378b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8bff95f3ce03 - main - exterror: add support for the format specifiers in the extended error msg List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 8bff95f3ce0396ff40b4f7d943ea856ac3f846c3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:33 +0000 Message-Id: <6951d671.378b7.63c3b626@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8bff95f3ce0396ff40b4f7d943ea856ac3f846c3 commit 8bff95f3ce0396ff40b4f7d943ea856ac3f846c3 Author: Konstantin Belousov AuthorDate: 2025-12-27 13:54:42 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 exterror: add support for the format specifiers in the extended error msg Note that we trust kernel code to only request the printout of integer types, and use the 'j' modifier always. Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- lib/libc/gen/uexterr_format.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index e8ddfbd578e3..68cd2abfe312 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -29,7 +29,8 @@ __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) ue->error, ue->cat, ue->src_line, (uintmax_t)ue->p1, (uintmax_t)ue->p2); } else { - strlcpy(buf, ue->msg, bufsz); + snprintf(buf, bufsz, ue->msg, (uintmax_t)ue->p1, + (uintmax_t)ue->p2); } return (0); } From nobody Mon Dec 29 01:16:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbR0mbxz6LQdp for ; Mon, 29 Dec 2025 01:16: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbQ3g5Fz3XZQ for ; Mon, 29 Dec 2025 01:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mfnGfCh9uf0m3WfYZbulu/FGAH/VlYVYdz3JWPDHKL4=; b=T7PPWFV2uyEYGtJxwkI2xLxcFQUQXYC9dASl6LMHWhfK4c6AP+CHh9iUTuqpsU880SG3WT iPFukaCwChX+Xmo8DWH1sW6Ts7Fy31zu3AkNkLnFhwofycdida3mKmT36ZSlKK35flyHLN 6uzo6TCULE1ipi0j/ceY8749XrrCYWFBNuOQWaeTw34Mj3rP//MtJmbvlnc5XpRCdl+p64 YjybfU0STVd4cj/qw4LRX/HyCcM1AFc9g48Xfgh84nt59wR1E1z/aSEtUX5ejPiJh/7pfP jao0JReit9UKJ9bxwZlgmaVqJT5ajI+VVEn/6OXYy/WxxTLc5MuZAqHAH8blCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mfnGfCh9uf0m3WfYZbulu/FGAH/VlYVYdz3JWPDHKL4=; b=Q3KYnvevO+gqUgrDZ9kL8cudrNoR/r94KYARP2ez4fzvFBDYAbQoxq8Hwas82o1GQx20Lr gUh55kp1DiMppu7yxQTxTVN9m1zu5yc/Pk/BEwUtJ70XZCiuYpgN5WJxnG3/YHBle7oXgm H5s9gwrB2zvKTa/81UePBHpCaufDvHQ0yyD29mLpVGHgQcm5mj7sDP2pnzC9QYw9oTfhVU Oc6M0pjyD6SFbW23bYxjP//f3Lb/P3Ex/DmfE3Gw8vXvkQJmg2N/usJ68PJP/ehONyfYel pvecO+nUzoDLuA5BhcGO/auqCVJJvd/FQ+xNmhZL/+e2XHLE/gMXuIki0KI/QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970994; a=rsa-sha256; cv=none; b=CXy2Lz0a4HWX9KEvN7qrJUQ0Y9XGKTECGl0MKLMw4kjRZChPeqhX7jdJZgvwVw4jZ8vVRU ltC2TnhSfPYWxTkh5T3yRV3HjTV3MdejrwTy1DLUPsJabFKQuY6/jac/5JFCKtszEryXSl mdtXfU9sAY4W1P0TMKPLXy1114ipEhg5ItOzvkMA7bf9OxO3p3kG6JXaexzTik3UrDm+xY v6CcFZtrXLM9J1xgAAbLgzX+5CtJwWmh3K8Dv1ShzNn9jxCs1WPiQlazwjjxPToIhQfHsA noYtcDJMTxQ6mztlWFEvXvOBQysjtrHtQdifnjwpGwO6kmCksI+QGHxtstk17A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbQ2BQ6z17b7 for ; Mon, 29 Dec 2025 01:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 387a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 42210fe8dcd4 - main - exterror: Add EXTERROR_VERBOSE env variable to control verbosity List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 42210fe8dcd4684a45e0e4db1b8194e291dc8fda Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:34 +0000 Message-Id: <6951d672.387a6.60c78188@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=42210fe8dcd4684a45e0e4db1b8194e291dc8fda commit 42210fe8dcd4684a45e0e4db1b8194e291dc8fda Author: Konstantin Belousov AuthorDate: 2025-12-28 00:23:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 exterror: Add EXTERROR_VERBOSE env variable to control verbosity If the variable is set and the process is not suid, __uexterr_format(), used by err(3), prints errno/category/source line/pX always, not only when there is no kernel message provided. Requested by: mckusick Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- lib/libc/gen/uexterr_format.c | 53 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index 68cd2abfe312..3321fd80616d 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -11,26 +11,69 @@ #include #include #include +#include #include +#include #include +#include + +static const char exterror_verbose_name[] = "EXTERROR_VERBOSE"; +enum exterr_verbose_state { + EXTERR_VERBOSE_UNKNOWN = 100, + EXTERR_VERBOSE_DEFAULT, + EXTERR_VERBOSE_ALLOW, +}; +static enum exterr_verbose_state exterror_verbose = EXTERR_VERBOSE_UNKNOWN; + +static void +exterr_verbose_init(void) +{ + /* + * No need to care about thread-safety, the result is + * idempotent. + */ + if (exterror_verbose != EXTERR_VERBOSE_UNKNOWN) + return; + if (issetugid()) { + exterror_verbose = EXTERR_VERBOSE_DEFAULT; + } else if (getenv(exterror_verbose_name) != NULL) { + exterror_verbose = EXTERR_VERBOSE_ALLOW; + } else { + exterror_verbose = EXTERR_VERBOSE_DEFAULT; + } +} int __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) { + bool has_msg; + if (bufsz > UEXTERROR_MAXLEN) bufsz = UEXTERROR_MAXLEN; if (ue->error == 0) { strlcpy(buf, "", bufsz); return (0); } - if (ue->msg[0] == '\0') { - snprintf(buf, bufsz, + exterr_verbose_init(); + has_msg = ue->msg[0] != '\0'; + + if (has_msg) { + snprintf(buf, bufsz, ue->msg, (uintmax_t)ue->p1, + (uintmax_t)ue->p2); + } else { + strlcpy(buf, "", bufsz); + } + + if (exterror_verbose == EXTERR_VERBOSE_ALLOW || !has_msg) { + char lbuf[128]; + + snprintf(lbuf, sizeof(lbuf), "errno %d category %u (src line %u) p1 %#jx p2 %#jx", ue->error, ue->cat, ue->src_line, (uintmax_t)ue->p1, (uintmax_t)ue->p2); - } else { - snprintf(buf, bufsz, ue->msg, (uintmax_t)ue->p1, - (uintmax_t)ue->p2); + if (has_msg) + strlcat(buf, " ", bufsz); + strlcat(buf, lbuf, bufsz); } return (0); } From nobody Mon Dec 29 01:16:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbS2VBvz6LQdr for ; Mon, 29 Dec 2025 01:16: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbR3z8Kz3XZf for ; Mon, 29 Dec 2025 01:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hLa5ji8Q32Yapk59wA8X+sPsg5Vie9XDAyiBQ4n+V4A=; b=BXD7LBc0RAwA3WBMlnDI9QFqsBFVw8ug+HiYKz2r0146rnP9LyX58D3592Qu7Fel5d0/xA yu9UGQrq70QL2FAtjQSPAmgO3ntNkF9hilmdiz6VGRMoXZ9NtJHMSrRuhK4WaKRulGEi37 JoIoPrfSsuhEX7m0Ed59y/zr4gOs7CbIks0KTMuXSOG1RvW1SkRHH6y3cHBvd5qoMLNUG5 1CmMf8hy/hDm7h2GqEEDw0k6LiA7CBT4fBxIKCOj3VvcueWY/e1a0WraJEg9hN79um2oqt iGZcG2emC7BCgpCjK7oWykmGkt/pjglTmUDv2kZG9uokgX3IkWjzb23TtTnYpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hLa5ji8Q32Yapk59wA8X+sPsg5Vie9XDAyiBQ4n+V4A=; b=TTQY3eVEYmQqQZo55/b3TI6jBcHgo4Jf7gX8nIRQrmdcOnBrUzg77PMZANyN0gAOZIuZN6 JA42VFUlB30WuJIMAzU2kz34Jemns9bLMcJ7+RAvvDSQNI62JJuObSpKns+/rsbi5lFNvj a0nvY3sglett/rxLQ6amtetHPHdXgXQDKpQdZxnJ+Mk5mD/dkpwpT69FTisinbZjt29UU7 bgr+C3GzydcvhDf8SI27N4o32KFsSUo/Ddn1qFqptMjWQs8+aHUdXR523BW2zpUPFrfik1 0reMPd3DG5o4je4n9ybhv1b4Myvcx05TyqOD/L9zd0dreu+kkgdDFhcdhhyNcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970995; a=rsa-sha256; cv=none; b=xcygwH+WwZbsQR7KLu6pnrwaY2ikj/X7RVv5LGVIefnpY54LTXwBj6REodnCohxvji6wP8 s5j24z3oZ5FhhK+YWQxjnbhA4Va0ESNuuMaZYZnPDl7oBYY+jgsQ1H/85vFiGtMbE6iT4N D4NXWrQyZOM2FSiXbMyLzXKy9fuhGE8fUwj1kaNpVwyOm8Rlq0kIigKaC3VcqRv3socobz bu2+W64iVQlhGum1rKcMoxgaYlxay37nWf6mmZARBO6G7UxPmV++6mQ4wxXdfWFQl1Qey0 AqTW59NwnDvJ7cNkI5pGNnMBNT91asigNHoLVS5/my5KcLG2JBryyXmjz2ueKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbR327Zz17Ql for ; Mon, 29 Dec 2025 01:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3909a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2904edaf2f09 - main - vm/vm_mmap.c: inline erronous argument values for extended errors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2904edaf2f09934142f9f6a6d2886879395145cc Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:35 +0000 Message-Id: <6951d673.3909a.5747197e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2904edaf2f09934142f9f6a6d2886879395145cc commit 2904edaf2f09934142f9f6a6d2886879395145cc Author: Konstantin Belousov AuthorDate: 2025-12-27 13:56:22 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 vm/vm_mmap.c: inline erronous argument values for extended errors Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- sys/vm/vm_mmap.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 501ace32bd11..234586893b59 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -197,12 +197,14 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) check_fp_fn = mrp->mr_check_fp_fn; if ((prot & ~(_PROT_ALL | PROT_MAX(_PROT_ALL))) != 0) { - return (EXTERROR(EINVAL, "unknown PROT bits")); + return (EXTERROR(EINVAL, "unknown PROT bits %#jx", prot)); } max_prot = PROT_MAX_EXTRACT(prot); prot = PROT_EXTRACT(prot); if (max_prot != 0 && (max_prot & prot) != prot) { - return (EXTERROR(ENOTSUP, "prot is not subset of max_prot")); + return (EXTERROR(ENOTSUP, + "prot %#jx is not subset of max_prot %#jx", + prot, max_prot)); } p = td->td_proc; @@ -236,7 +238,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if ((len == 0 && p->p_osrel >= P_OSREL_MAP_ANON) || ((flags & MAP_ANON) != 0 && (fd != -1 || pos != 0))) { return (EXTERROR(EINVAL, - "offset not zero/fd not -1 for MAP_ANON", + "offset %#jd not zero/fd %#jd not -1 for MAP_ANON", fd, pos)); } } else { @@ -247,8 +249,8 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if (flags & MAP_STACK) { if ((fd != -1) || ((prot & (PROT_READ | PROT_WRITE)) != (PROT_READ | PROT_WRITE))) { - return (EXTERROR(EINVAL, "MAP_STACK with prot < rw", - prot)); + return (EXTERROR(EINVAL, + "MAP_STACK with prot %#jx < rw", prot)); } flags |= MAP_ANON; pos = 0; @@ -257,18 +259,21 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) MAP_STACK | MAP_NOSYNC | MAP_ANON | MAP_EXCL | MAP_NOCORE | MAP_PREFAULT_READ | MAP_GUARD | MAP_32BIT | MAP_ALIGNMENT_MASK)) != 0) { - return (EXTERROR(EINVAL, "reserved flag set")); + return (EXTERROR(EINVAL, "reserved flag set (flags %#jx)", + flags)); } if ((flags & (MAP_EXCL | MAP_FIXED)) == MAP_EXCL) { - return (EXTERROR(EINVAL, "EXCL without FIXED")); + return (EXTERROR(EINVAL, "EXCL without FIXED (flags %#jx)", + flags)); } if ((flags & (MAP_SHARED | MAP_PRIVATE)) == (MAP_SHARED | MAP_PRIVATE)) { - return (EXTERROR(EINVAL, "both SHARED and PRIVATE set")); + return (EXTERROR(EINVAL, + "both SHARED and PRIVATE set (flags %#jx)", flags)); } if (prot != PROT_NONE && (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC)) != 0) { - return (EXTERROR(EINVAL, "invalid prot", prot)); + return (EXTERROR(EINVAL, "invalid prot %#jx", prot)); } if ((flags & MAP_GUARD) != 0 && (prot != PROT_NONE || fd != -1 || pos != 0 || (flags & ~(MAP_FIXED | MAP_GUARD | MAP_EXCL | @@ -295,7 +300,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) if (align != 0 && align != MAP_ALIGNED_SUPER && (align >> MAP_ALIGNMENT_SHIFT >= sizeof(void *) * NBBY || align >> MAP_ALIGNMENT_SHIFT < PAGE_SHIFT)) { - return (EXTERROR(EINVAL, "bad alignment", align)); + return (EXTERROR(EINVAL, "bad alignment %#jx", align)); } /* @@ -310,8 +315,8 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) */ addr -= pageoff; if ((addr & PAGE_MASK) != 0) { - return (EXTERROR(EINVAL, "fixed mapping not aligned", - addr)); + return (EXTERROR(EINVAL, + "fixed mapping at %#jx not aligned", addr)); } /* Address range must be all in user VM space. */ @@ -321,7 +326,8 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) } if (flags & MAP_32BIT && addr + size > MAP_32BIT_MAX_ADDR) { return (EXTERROR(EINVAL, - "fixed 32bit mapping does not fit into 4G")); + "fixed 32bit mapping of [%#jx %#jx] does not fit into 4G", + addr, addr + size)); } } else if (flags & MAP_32BIT) { /* @@ -1495,7 +1501,7 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, handle, &foff, &object, &writecounted); break; default: - error = EXTERROR(EINVAL, "unsupported backing obj type", + error = EXTERROR(EINVAL, "unsupported backing obj type %jd", handle_type); break; } @@ -1578,7 +1584,7 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, * exec). */ if ((foff & PAGE_MASK) != 0) { - return (EXTERROR(EINVAL, "offset not page-aligned", foff)); + return (EXTERROR(EINVAL, "offset %#jx not page-aligned", foff)); } if ((flags & MAP_FIXED) == 0) { @@ -1587,7 +1593,8 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, } else { if (*addr != trunc_page(*addr)) { return (EXTERROR(EINVAL, - "non-fixed mapping address not aligned", *addr)); + "non-fixed mapping address %#jx not aligned", + *addr)); } fitit = false; } @@ -1599,7 +1606,7 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, } if (foff != 0) { return (EXTERROR(EINVAL, - "anon mapping with non-zero offset")); + "anon mapping with non-zero offset %#jx", foff)); } docow = 0; } else if (flags & MAP_PREFAULT_READ) @@ -1702,6 +1709,6 @@ vm_mmap_to_errno(int rv) } if ((curthread->td_pflags2 & (TDP2_UEXTERR | TDP2_EXTERR)) == TDP2_UEXTERR) - EXTERROR(error, "mach error", rv); + EXTERROR(error, "mach error %jd", rv); return (error); } From nobody Mon Dec 29 01:16:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbV1k0wz6LR9Y for ; Mon, 29 Dec 2025 01:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbT54Tpz3Xb6 for ; Mon, 29 Dec 2025 01:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v2DbiyI3fCau2vCAvx1aoX3ai4mG0hsOUVHU1O2KG/c=; b=bRnZ3b9d0miTvKipFJQVv8q8QxRj+hmvc2PZ38AqHHTEt2jcR1t9G4S6XElx6IGLcqqvX8 o+c9JARLhQ/+SiOlnbzQlMIj+uAuVEPC3BgLmEXIyjPngAoaXfKrEyR4LAWk9qORbxtMDg AjP6QLSZu7peehmIHXaQCi3Gt9rXZ3usGppY+JouqPTMAzUjHKpvU5WDFv+W53t34aMFhf xwLUfRKryIvTaHNFqHYG8PTdgC/Y4V5E9L537USNRi+Cw28x7Tl+0oKMDDnHaujaNMAtjQ BWWgVUMpe1iw4TQ+qq+T+78Eh4HRD6wcjUtiK1oJUZPOrIb4etThfRVgDvCAFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v2DbiyI3fCau2vCAvx1aoX3ai4mG0hsOUVHU1O2KG/c=; b=J76iDCMevwkgsG3LI5uYnwcT0dQbz3TnNBD9VMoISxNhS4MVaOFSp+m434Q7bZ010m48KR Kh1aesUiy2H4IfTpJMbYlHykzr4xFrkJ39Fq/83Krlho/YEvwoZ2wT43v1DiltTVq8IHqB kNdZqmr22yrYEdYCerp5StmeZhk3j/HuoAmf4m5wTadAni49ORKZMfBHAn1h04o5PLJJ5o 3SYy+bRZjlefCbqsYCqVYqyA68EGcFK5GXlGlq5QpRpRPBnHwDn7ZaQJ07ahmnCabpERRT 90ywBf2ddhijDdoIsJnXUKc+E1Me0Mmm9VoXD+x9E8jcVnf86yEQJi+sP6+how== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970997; a=rsa-sha256; cv=none; b=xekbt4aw9nmBXZi99Q+6H+S7eG2iocmau74FU/+DwN+hqvRokDV+DHbsscXNUHnnL+MiPk uek8qkosOj4jF4fYuFN5aaX15PzGehUmQPsFuGP/LDbb3tvJ8AFgHI5t7CcavZfCAmOF6E KwUwsy/v1W7FrwKY/5+BNiM/EcpfaDE0i4ZDExdXDqcDUOe2XnaJSQ+QnoPd8jP/QfCYVc WkwbwZhAA7ewINo7zX17r4iaOLdNes6rTLsB78eohcOK6MeO5t4liTY0X+ZBMB+Wgb0uzE 8tnYrlXxrvDhrmcmws7qAe0gX9H6BsYOG6YLrYgSUQMSwz5ZIExulIDumjoh+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbT4cg1z18By for ; Mon, 29 Dec 2025 01:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3907d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 543c86636f73 - main - exterr_test: loosen the error string pattern List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 543c86636f73119fa1dab860f07396df5a1884d4 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:37 +0000 Message-Id: <6951d675.3907d.543bab2f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=543c86636f73119fa1dab860f07396df5a1884d4 commit 543c86636f73119fa1dab860f07396df5a1884d4 Author: Konstantin Belousov AuthorDate: 2025-12-28 03:35:03 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 exterr_test: loosen the error string pattern After addition of the prot and max_prot values, the old error substring no longer satisfy the check. Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- tests/sys/kern/exterr_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/exterr_test.c b/tests/sys/kern/exterr_test.c index 17c84c1f8ed4..b4746a485f58 100644 --- a/tests/sys/kern/exterr_test.c +++ b/tests/sys/kern/exterr_test.c @@ -51,7 +51,7 @@ ATF_TC_BODY(gettext_extended, tc) ATF_CHECK_EQ(0, r); printf("Extended error: %s\n", exterr); /* Note: error string may need to be updated due to kernel changes */ - ATF_CHECK(strstr(exterr, "prot is not subset of max_prot") != 0); + ATF_CHECK(strstr(exterr, " is not subset of ") != 0); } ATF_TC(gettext_noextended); From nobody Mon Dec 29 01:16:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbT20nxz6LRD2 for ; Mon, 29 Dec 2025 01:16: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbS4WVSz3XPx for ; Mon, 29 Dec 2025 01:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y9/Pfbs75E8hhyMbYMRqC1z1Ppik2tyC3ZXtssXu4gU=; b=HB+gv2F9+zjS/zdedpgDNVidcURRpECcr8TISJRppkuvtuCokXHngNtjKPY+ymX5WsIYPQ c8fVbnb1NaPd4o2ce6sPfhNS0DmULAZYgY4MeGwIydg7wD+Rgc5+4UdxQ5GSnuuoJIulfE +BPalErgffWgCn3mrw8XqW2++RB2J1Ad2iKPzY+VzC22w8cs+dez7qKm4DMLwM0uwWXIaQ 48Moi4PUiVBYv44wkQG0E0ocJdZvxWxGum+D9m9etawYHydBM2TLt8nd7iYEWXFUiQtSli s8psw5ztslupQhs2MP3rZXJd3hWEq9Lp6Mtxl1HQja4asjd14/6MGA1pnC0cTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y9/Pfbs75E8hhyMbYMRqC1z1Ppik2tyC3ZXtssXu4gU=; b=PCGyaLu5a8Isa1/MOr1iGqQU+h3kO3gwr5xSuPJMmT560DmPiCrVfXFglJtb60VZj5Zqwg vxT8ruGQx3oVRu/rFSnbhETmy2YRFev7Dk7pR5bArwqqIo3IHomR8v0f7Yq4v44pCWunKG FOWnC8axFLYUmc6fHJzD5nU1WllZbl/HWh9lA+anEBMpYsk0KFlt3+RDdQadeYKy8z3vdt GgI2dQZGqyxghg408uLIOnFOrV+uRwwrSk5tWSvdKZ/T3MiBv30850Vf9bos9hTqoKM0A8 MqIN6KgReBxg49gBVmSdo+vAC3aGOpIg/02LIYI6mXs3Wukgmo+f/MYxEQC2/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970996; a=rsa-sha256; cv=none; b=gEB/+jTa2a2ySfQ1e7iyrDzY1i/ydl+mp8/cVoeMgWtyYf2sKn7EJ4gBjSqwQGPvlBu8vP pkOi5EZWdi57oCJ06njQE653qZ2TCnTa0UeC3Xqi9qn6TJqNxfZp46LGpMEvLkS6xUZE8q jZb7UWtXEz8VapSIjwvMXxHcZE2WU4Ll2W1T5OkNc4TnF/OGfCXAkIa0YliA7v16eVdQE2 XwvnwVZmNl8BbszjnpM1LiabXIwdE0XrXqkaGUBAKmMJf3a4HyTR78t7BTkqGhoV03sZI3 diQznyrhwTAp4oUQU1TJWR8NlOUyjqByPbokhRuO9w7Kv2pt/zQVsrFLgLnwPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbS3qx0z17Tk for ; Mon, 29 Dec 2025 01:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 395d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 14bd57d0a78d - main - exterror.9: describe formatting of optional arguments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 14bd57d0a78dcd98449597fd3e19749799e36935 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:36 +0000 Message-Id: <6951d674.395d1.337d55f3@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=14bd57d0a78dcd98449597fd3e19749799e36935 commit 14bd57d0a78dcd98449597fd3e19749799e36935 Author: Konstantin Belousov AuthorDate: 2025-12-27 16:21:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 exterror.9: describe formatting of optional arguments Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- share/man/man9/exterror.9 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/share/man/man9/exterror.9 b/share/man/man9/exterror.9 index fd4b732b8213..a7c7a11d1315 100644 --- a/share/man/man9/exterror.9 +++ b/share/man/man9/exterror.9 @@ -90,6 +90,16 @@ The .Fn EXTERROR macro can take two optional 64-bit integer arguments, whose meaning is specific to the subsystem. +The format string may include up to two printf-like format +specifiers to insert the optional argument values in the +user output, which is done in userspace. +.Pp +The format specifier must be for an integer type, and include the +.Dq j +format modifier to accept only the types +.Vt intmax_t +or +.Vt uintmax_t . .El .Pp The strings passed as the second argument are only retained From nobody Mon Dec 29 01:16:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbW3BTzz6LR9d for ; Mon, 29 Dec 2025 01:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbV5z0gz3XYJ for ; Mon, 29 Dec 2025 01:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4nwxAC/tMVvXEAcl8v6ssJM2b8AM5i08qL67gRvNcGs=; b=ySgfiJF51T+uVrHluIJpRUSZxWuCrNHf7KowmCs0gKkOZIuESjx692ZqhqNxTdAYRUKpfQ i3IebkBDyOPIbL67bduTQiPR5zJ7Qlwtotn0t5SEAr+IoOCocyWd7mvkd1SyBHCP8uR4lB B64wRLlI9ks8mCwygyTo1mZOHsIfzv4YhWnpVhCnmNcQ5nf0lKL1DAYHS9VSk3RwqJ5Cw5 lCsjJzxq8YDe5VHRff58JHvlGMRRRL7DL1cCC1gqEjFvBZ7XfuTkbtPQCZ42jPt+W54MsP Dsn0e6X5mz5xKFNaqIUTstiWds4YAiMo463q54geoWOAgM5Xnc5NwnergnsZnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4nwxAC/tMVvXEAcl8v6ssJM2b8AM5i08qL67gRvNcGs=; b=E5e1CvTJzdzAL6UZLzZ0BqA9loI2LwP17dE0dIARU7uGGLDN4rxb7gA3rT+qAfrTH8BNmv 2q4Xi0EwaZ5Z9LFSJH2jr2fpVPvCtMI9JJ/rV+lZFq3Uj3WGPYe6XvIAHqZo/lyWBrrEy7 N4UPgP0hPLFYfjHHHj3aWxwy5lTFJBhu+sdDFtWnAIhWTeX+A9T3P4XzQgjNXtGJvewm5o KNsIFheF3vpEtS5pQwV0Y0ZBP9RYu52Q5AnV3wkIZRKlCMp/MpMWMTSrNFMDOnod4awaka 2da3eynijcvNBTFWtn/b2AZVBEZ0yjT14ALXMUwJhPv9PMEIKzRkf7JSXXADPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970998; a=rsa-sha256; cv=none; b=NVUkCcBHg44aNa4RBY4hWLBNc7zlUUPFJjG38TJTB+Ds0a+S7nyGlQ0tfwI3F+Z/6mmDfC blrIapCxm4fF4pFm/3FWxtU/pVCMj48NewrAqXSwXZHecDEHihJWcJoD1jUMA7qJ4cxnNU c1hu/GvdwaBcq0XkxBeb0WIS5alZqHwVgDVbd+tpHc6/oi7J0B5QkU9rUhezROClJ8O6gU 9EtlrFluvolkKRDb3k3/Txn8vG8BSjrkC4xm0dr8OTNOSkl/2Htksd3AImQy+lpuCwuiIa ocUv7zpSMfSNCUMtkigRUKxr0uECcRzdJKd4KNoGCE5n7f3NKOFYwR/qn1h4Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbV5Rvqz17X7 for ; Mon, 29 Dec 2025 01:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38caf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 54b52f655e0f - main - fs/fuse: use dedicated category per source file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54b52f655e0fdaef21c3cde85e8bf030efa7b86e Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:38 +0000 Message-Id: <6951d676.38caf.154fc88@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=54b52f655e0fdaef21c3cde85e8bf030efa7b86e commit 54b52f655e0fdaef21c3cde85e8bf030efa7b86e Author: Konstantin Belousov AuthorDate: 2025-12-28 14:22:36 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 fs/fuse: use dedicated category per source file Submitted by: mckusick Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- sys/fs/fuse/fuse_device.c | 2 +- sys/fs/fuse/fuse_vfsops.c | 2 +- sys/fs/fuse/fuse_vnops.c | 2 +- sys/sys/exterr_cat.h | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/fs/fuse/fuse_device.c b/sys/fs/fuse/fuse_device.c index cee477865c42..41387de3ce71 100644 --- a/sys/fs/fuse/fuse_device.c +++ b/sys/fs/fuse/fuse_device.c @@ -82,7 +82,7 @@ #include #include #include -#define EXTERR_CATEGORY EXTERR_CAT_FUSE +#define EXTERR_CATEGORY EXTERR_CAT_FUSE_DEVICE #include #include "fuse.h" diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c index b617925c4e5f..0ff79913128a 100644 --- a/sys/fs/fuse/fuse_vfsops.c +++ b/sys/fs/fuse/fuse_vfsops.c @@ -81,7 +81,7 @@ #include #include #include -#define EXTERR_CATEGORY EXTERR_CAT_FUSE +#define EXTERR_CATEGORY EXTERR_CAT_FUSE_VFS #include #include "fuse.h" diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index ef5aee5de34c..0e049b1f07a9 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -89,7 +89,7 @@ #include #include #include -#define EXTERR_CATEGORY EXTERR_CAT_FUSE +#define EXTERR_CATEGORY EXTERR_CAT_FUSE_VNOPS #include #include diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h index 318e774542ca..7492fc31662a 100644 --- a/sys/sys/exterr_cat.h +++ b/sys/sys/exterr_cat.h @@ -15,7 +15,7 @@ #define EXTERR_CAT_FILEDESC 2 #define EXTERR_KTRACE 3 /* To allow inclusion of this file into kern_ktrace.c */ -#define EXTERR_CAT_FUSE 4 +#define EXTERR_CAT_FUSE_VNOPS 4 #define EXTERR_CAT_INOTIFY 5 #define EXTERR_CAT_GENIO 6 #define EXTERR_CAT_BRIDGE 7 @@ -24,6 +24,8 @@ #define EXTERR_CAT_VFSBIO 10 #define EXTERR_CAT_GEOMVFS 11 #define EXTERR_CAT_GEOM 12 +#define EXTERR_CAT_FUSE_VFS 13 +#define EXTERR_CAT_FUSE_DEVICE 14 #endif From nobody Mon Dec 29 01:16:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbX1v2Gz6LQZn for ; Mon, 29 Dec 2025 01:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbW6psyz3XQZ for ; Mon, 29 Dec 2025 01:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yd2XFKa+iFMVAxe6E6E2wFj1g/5ytx18MQ51cy2sBUc=; b=Oum+f658siLFaZ6nklCI4Qv2uuSma3bnFUL8b30j6Nb7jBOd6nnBCqTjczwfybS8UGtp4i 3oFM6qopC3WdLwZIK6UB2L5thiPZy1UMbg2+jBw6OrN2ggVIfFQgPxnXktkNqr46ed3egX fbnZtJFGYv0wzllG7wseWbbdJ+EzEiSFgbW8ODlDB92SZxiZj2nFX4GtrnMsx3s1/RYq8D LSMxKuB6GjJCxVz/q++2nbayLFHzHZFEsnnCX9+gaq5HSvfw2YTs+ydIGfUAKjcqEi06Mn +FIbU9LUHTBNq2NWT5mXOHrN4uyYYqwAVSfHFGqpDVuS8/dKDGwwamaAztCwRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yd2XFKa+iFMVAxe6E6E2wFj1g/5ytx18MQ51cy2sBUc=; b=oFMqmfjwGlstlvXDFVvqLlP5bAWk9LgfV0SD85/fPCQZ8kQ19WjfFFCwE9rUb83TK0c5RT Q/RhNQzyfsMUVN4K7FkXXWOJhy9XgF79ZY42VDJF+Xh+k433iDR15Bh+TRUi9Y9Fq4UTUJ pLlP2+7D1KsoD8BCtHAiu3SpWiKrcdZVyCxiE9P7WSuxkPGCW/fz0W6V+WLufgfXBhtIo4 drdRwg8PNGPeWBhbiwvf7jH6uquKq9d363qPIqk7FVQbqOZp+1uyi/Nc4Dvyt2avk0BdKr IP66ME92iUnAvdPqL4gtv/O3TupIeKLRaG+ishzqLmtD8eiPgFmB5J3r+8TA2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766971000; a=rsa-sha256; cv=none; b=AVux0bYahLikTgfGH1O8DFdkLbXm5LLBTyzNUhl5jhBGzah453hZoTUnZjLuFJEMweUAga y/KvO/+t3xl53+43T/I4+69k3VQXDNd9svLINj74c+wMoDKXRjTPxUqeW8AxMM9Uxzw1Fu xHLML0N+ioYviTJ9YAmsubpuZH+djz+oudjAIeqaWSDw1q11rc1jfYuXumxuWofWpuxHCK /6oZO8S399klRfpaKs8dYQMdurdBri+4bD8kV2cOAP1es7eryZTiSwfusQYs5nnu/2lfXO eh+Wi+zaQpaHaJVB4rRpyWYBGFcX/skt5ccIfmLQxfbco9K/KhGo6On+wE5b6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbW66nHz18C1 for ; Mon, 29 Dec 2025 01:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38f20 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3ef25acf3600 - main - Add a script to auto-generate mapping from exterr category to source file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ef25acf3600fb822bdf1487036184b4978d737f Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:39 +0000 Message-Id: <6951d677.38f20.78a9a953@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3ef25acf3600fb822bdf1487036184b4978d737f commit 3ef25acf3600fb822bdf1487036184b4978d737f Author: Konstantin Belousov AuthorDate: 2025-12-28 14:04:28 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 Add a script to auto-generate mapping from exterr category to source file Reviewed by: emaste, mkusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- tools/build/make_libc_exterr_cat_filenames.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/build/make_libc_exterr_cat_filenames.sh b/tools/build/make_libc_exterr_cat_filenames.sh new file mode 100755 index 000000000000..fbde85891200 --- /dev/null +++ b/tools/build/make_libc_exterr_cat_filenames.sh @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +check="lib/libc/gen/uexterr_format.c" +target="lib/libc/gen/exterr_cat_filenames.h" + +if [ \! -f "${check}" ] ; then + echo "Script must be run from the top of the full source tree" + exit 1 +fi + +echo "/*" >"${target}" +printf " * Automatically %sgenerated, use\\n" \@ >>"${target}" +echo " * tools/build/make_libc_exterr_cat_filenames.sh" >>"${target}" +echo " */" >>"${target}" + +(find sys -type f -name '*.c' | \ + xargs grep -E '^#define[[:space:]]+EXTERR_CATEGORY[[:space:]]+EXTERR_CAT_' | \ + sed -E 's/[[:space:]]+/:/g' | \ + awk -F ':' '{filename = $1; sub(/^sys\//, "", filename); + printf("\t[%s] = \"%s\",\n", $4, filename)}') \ + >>"${target}" From nobody Mon Dec 29 01:16:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbY3MtNz6LQb4 for ; Mon, 29 Dec 2025 01:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbY0JK0z3Xpt for ; Mon, 29 Dec 2025 01:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hc7QVKVfRQDwXTXuGIfCmlbWzbU43pGJ9vatdepbXow=; b=GGuOf5SFhVFVK34ZHhtoNUzL1aW7bZVdbYgMgsRaEsn4SDe1lvrBV9iKAjUybGe3H6J7Se HpwyAcvEv6N12NBq8OsT2xfYREnjGMa6cMf34uBiIpqEHeqkVzqn3vsAVmkd+otMdElhOV Xeyw7wL9XuegKo3StLKdpZoCdVZASakSf5bUBVW6XPssrAXG+jIpq2H5BmllV+QFTFGazx XzKmNa3MC15RO2eM1jIK2sLG68kFpMlaMgscWaG9/YUX83lXg6kypIjnLNd0JuBWPCdMpV DhJnHaql9Yo3KgE3MabSUhAFgNdtAX188AK2XqptVNDKhFtGa/ffrYJFoXwz8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hc7QVKVfRQDwXTXuGIfCmlbWzbU43pGJ9vatdepbXow=; b=Y2DegC1Z9nmZ0equGGvTpx9NqBjHCG0N3nN058zk+FlVrvRA0906cORU1qzyS6NXYEOVDG WWPiSNAbxjC/stq047i8QYFBDIttQbsT1osXYG1NnQdcXViVHBd5zQLMzYxiX0Yxjti1pk UJP9a6Qx4xAnc+PxBzMYYEIgrJozdiufUjJlzv+m+weFFpHUmN3pvUf0cPj30Oh5iCa9ZB //3WUPCCfQ3O3jKuD61+wyKWMmvb326M65K/fz78uuvsLiQy8Fq7BjglNdbPl5QVdpHMoI ZQMEjnMFZa12AYVBxVj34hwKFb3Y/uXrinOMTYHwdVQvxGtMtnaydRAi1h917Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766971001; a=rsa-sha256; cv=none; b=p03pkpYcHXhgYZEeJ+HMxyGfe2SJub1Q0hF+s9OmT/SXHjmdPTKGMRW9PFAmSgv8HvZ/xr vrXBEHulgi7KHTo5RTy61x4o4weCzjbjSKeaI/JhOP+ag5+fc8Hbcxe7My7kx22EiRmR9W +wGfEVPg4aPJc5J74LDf9C8bbrWRDAsAPVcj+muU6yWOKS9VCVmPGemYFpPD2Q62In3s+P UGmRono9uxNOID3B8D75I3eYB49UXOs3JqHvezIdZ4OdX0Sbr5afZrp5PWdv9Z+RqLWQhO nRfiVkGKlNuaJEkonZrnbyizBU9LYJEtmao/q6qHQscA/qiStzzX7+ItincXmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbX6x11z18Dp for ; Mon, 29 Dec 2025 01:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 370fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5685c07b5a8e - main - Add automatically generated file libc/gen/exterr_cat_filenames.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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5685c07b5a8e4ccc19140eeaa5987a38dca7c668 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:40 +0000 Message-Id: <6951d678.370fb.552aab6f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5685c07b5a8e4ccc19140eeaa5987a38dca7c668 commit 5685c07b5a8e4ccc19140eeaa5987a38dca7c668 Author: Konstantin Belousov AuthorDate: 2025-12-28 14:23:43 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 Add automatically generated file libc/gen/exterr_cat_filenames.h MFC after: 1 week --- lib/libc/gen/exterr_cat_filenames.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/libc/gen/exterr_cat_filenames.h b/lib/libc/gen/exterr_cat_filenames.h new file mode 100644 index 000000000000..883dd98289cd --- /dev/null +++ b/lib/libc/gen/exterr_cat_filenames.h @@ -0,0 +1,17 @@ +/* + * Automatically @generated, use + * tools/build/make_libc_exterr_cat_filenames.sh + */ + [EXTERR_CAT_FUSE_DEVICE] = "fs/fuse/fuse_device.c", + [EXTERR_CAT_FUSE_VFS] = "fs/fuse/fuse_vfsops.c", + [EXTERR_CAT_FUSE_VNOPS] = "fs/fuse/fuse_vnops.c", + [EXTERR_CAT_GEOM] = "geom/geom_subr.c", + [EXTERR_CAT_GEOMVFS] = "geom/geom_vfs.c", + [EXTERR_CAT_FILEDESC] = "kern/kern_descrip.c", + [EXTERR_CAT_INOTIFY] = "kern/vfs_inotify.c", + [EXTERR_CAT_GENIO] = "kern/sys_generic.c", + [EXTERR_CAT_VFSBIO] = "kern/vfs_bio.c", + [EXTERR_CAT_VFSSYSCALL] = "kern/vfs_syscalls.c", + [EXTERR_CAT_BRIDGE] = "net/if_bridge.c", + [EXTERR_CAT_SWAP] = "vm/swap_pager.c", + [EXTERR_CAT_MMAP] = "vm/vm_mmap.c", From nobody Mon Dec 29 01:16:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbZ4Yp4z6LQb6 for ; Mon, 29 Dec 2025 01:16: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbZ14Mnz3XYp for ; Mon, 29 Dec 2025 01:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hbUyzofiBZSu/3+S8IN5ZoT/yBHPHHRYT7jmHhuUmNk=; b=ESG5NAc3mbwwSeq1W19Bk2YVZWssFJJ04rNj3TJWN1fhWpg1MNyPB6UrYSLZr+yQ0XGaFb +7HFfCxLuuhXK7NCHn47Ujog+cY9358yZ7oZojB/ILQXFqzbUQoxraHJOd/0yPaeA86Hx2 JtGm6hIpSZZ+4omUOb3Vay24iOuVSNUsXwesK+pQPAj04zU5PIB5+fpOT0W3JkaJhKE3OZ Eq03OGzYpsso2KfDRs8E9TNgWa4On9tLlxmvBKJCt6UPoPA7gaWI2lWm+nKyzlxaL1Ihwt imNZ1J9H16qoRuiE4XZgyMMvjW7UOqzVQhIT0j1tgmSj9igIRcCNjeiLROY0Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hbUyzofiBZSu/3+S8IN5ZoT/yBHPHHRYT7jmHhuUmNk=; b=khT2tRCuK+c8YYSwaOLChbDHbPZkBYLjfkp0LzRYANOr7M+leSvXRFSNNeMkU8GPdEXsMX dW5nqdJrcKEHoUyovi0ZlqIAuNZq8eFa2a4R3MBNAOu7ER4fqW9k81Mwj4nSMHXGGjnO9k OZCpR+ExS87PNCPWTF6Clb4zM/F5V3QyyagXNaqpOfmDd6Fh6CDsV58cEDVBd8K1ACzcpj BJM+k1l9kpba5aAwtEA4P2Um4M5mUeSr2CetOAr5QwplutJPgMnD/oUGXmf40lvpsij+bu IzbK/UcXvY/QrNxC/uJemetC8+K25tVCwPsVhuXqpOboCuETJ1FvCk75KefihA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766971002; a=rsa-sha256; cv=none; b=grAEKDNbqPLEPvzSLCWQebXAWZYZ8TTi/xflU+cUpYy6/69u83Ovk8GMNn1wuRiNz6iIIk VvFrbHHKWuM6ipKCIdlXaghAVwrKyu1gcEuaYaNJ/5NkANHdRBYHRtMs04+5FERoP/IN7d DvKtQKRoV6SwWe0MHlpA/xmr+4j8KRyF35LfQkfneZ8YGhwuoeCvu4KJdNq8tUsXsVHQ6C kx7OKEp4kxugUbYyC+Cg8IFKEAPfyrQFUVZCXuyH3Yz9CcsVJjdkCfQmkHtUIG+rj05htd csGhyvFIE07/rFcnrlagXi06fj7tWAUDOyoM0OW3IanyLxSJOuLzrGKjAT7ZoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbZ0dhQz18Dq for ; Mon, 29 Dec 2025 01:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38cb3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 874cdf6af695 - main - exterr: in verbose mode, print the source file name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 874cdf6af695c42d561647f7165c99c2d3df0faa Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:42 +0000 Message-Id: <6951d67a.38cb3.262cba79@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=874cdf6af695c42d561647f7165c99c2d3df0faa commit 874cdf6af695c42d561647f7165c99c2d3df0faa Author: Konstantin Belousov AuthorDate: 2025-12-28 14:13:49 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 exterr: in verbose mode, print the source file name Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- lib/libc/gen/uexterr_format.c | 21 +++++++++++++++++---- sys/sys/exterr_cat.h | 11 +++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index 3321fd80616d..8d3b458ca9f2 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -8,7 +8,7 @@ * under sponsorship from the FreeBSD Foundation. */ -#include +#include #include #include #include @@ -17,6 +17,19 @@ #include #include +static const char * const cat_to_filenames[] = { +#include "exterr_cat_filenames.h" +}; + +static const char * +cat_to_filename(int category) +{ + if (category < 0 || category >= nitems(cat_to_filenames) || + cat_to_filenames[category] == NULL) + return ("unknown"); + return (cat_to_filenames[category]); +} + static const char exterror_verbose_name[] = "EXTERROR_VERBOSE"; enum exterr_verbose_state { EXTERR_VERBOSE_UNKNOWN = 100, @@ -68,9 +81,9 @@ __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) char lbuf[128]; snprintf(lbuf, sizeof(lbuf), - "errno %d category %u (src line %u) p1 %#jx p2 %#jx", - ue->error, ue->cat, ue->src_line, - (uintmax_t)ue->p1, (uintmax_t)ue->p2); + "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); if (has_msg) strlcat(buf, " ", bufsz); strlcat(buf, lbuf, bufsz); diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h index 7492fc31662a..24f07539fe35 100644 --- a/sys/sys/exterr_cat.h +++ b/sys/sys/exterr_cat.h @@ -8,6 +8,17 @@ * under sponsorship from the FreeBSD Foundation. */ +/* + * The category identifiers for the extended errors. + * The ids participate in ABI between kernel and libc, so they must + * never be reused or changed. Only new ids can be added. + * + * After adding a new category id, run + * tools/build/make_libc_exterr_cat_filenames.sh + * from the top of the source tree, and commit updated file + * lib/libc/gen/exterr_cat_filenames.h + */ + #ifndef _SYS_EXTERR_CAT_H_ #define _SYS_EXTERR_CAT_H_ From nobody Mon Dec 29 01:16:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbb5Kfkz6LRDL for ; Mon, 29 Dec 2025 01:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbb232Pz3Xmg for ; Mon, 29 Dec 2025 01:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Of75UDRbwo6X8pBVm4KGccUTBuLI7jbByckk/AmrIc=; b=xm7r9X18HYns4CByfdEkhm4wY+IIhNEujWhrvkzLSAeNtf4Zev5wIekJThZSOoBcsRTipW I5+BVb6kD08srCL8fjEAjbE9MZCurcn6DMfbeE/0lMDNVmSXlD//nXGH+wrpk7oEu9h9gX VICreW31vPUyRscLzw2eQqUbYLlteEDk3VTknoVR2dqASwCIiPSyt420Ng3W8pEk56098S f2MuyL6NqIFFy04AJUbGLR56YXgF70QJfVhXrwuPAJReZKH4epTE5xJXRmL7kJjyc4gpx7 ov9u+3mG5YOvfbh9kQotyMbHItBCuBrvcgaqZ6WeM4BvBjmWPTRxddzJxOqT7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766971003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Of75UDRbwo6X8pBVm4KGccUTBuLI7jbByckk/AmrIc=; b=dTSvuF1oVr/zrqYuuzdDAb54AV6S3n86vUpX3GaKNucA3GE23QWuF2+vmnU8Ls+aKKII8j s6Mwnz9Uoq3PZV5792ekBcLZXp4iwPWydn0l5KJUVv+dL1n2uohWGPycl7dp7X5K8rgDHg Zq2WEHHglL4JWawKZm5nVH+804+oI+Ce4XKb+EZoswcD+AurMMlPlfQuic5cG6aVeqPd4c sKkwNS6K+wTAAlvXuzgmU+a2MybD+I5KPYbMiFPxFDGKhQ1g6XnU+QyXZedggKjRoq1XzZ uGPR3We5LSVF3ITM99205ypigXFtSqktoysnWm0B+LMC2Y/QGrKBCoB1uENe9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766971003; a=rsa-sha256; cv=none; b=ITxUzBOS3FsjVKhe3L7/kmmK0vFoasIk/aeyUzYwrwt11wDq1qaMr3lKbgtQ+fPJTBc1uQ L2fNg3QX09qZQvq1DdusOsUIq3TUvxdihDnQbCMabuwT83K5x9nXH6agfio3qYNWmDHsSF NisvtSlitTsCjKEIeISEO5kzO7mtZleXcsOvBOQ+osLommHM7M24SR4wJOkoYTs0VJvvnf g1WqVVQ6djfeG+Wa9p5P0F9NDQceI3b7BDWzq+s3LDNgIOtepudvlZER+ReGAKQ6NMTCl5 efR4qOhj2Jq2CO5TGe7JmHNZA6LzgzIbJ3pV1ZnPlJu53Slf5mciwqAUsS8gYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbb1SM8z18Dr for ; Mon, 29 Dec 2025 01:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 378bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3088263177da - main - man pages: provide some description for extended errors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3088263177da2813dd09364171feadd0e31d1fc3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:43 +0000 Message-Id: <6951d67b.378bb.514f81a1@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3088263177da2813dd09364171feadd0e31d1fc3 commit 3088263177da2813dd09364171feadd0e31d1fc3 Author: Konstantin Belousov AuthorDate: 2025-12-28 20:41:38 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 man pages: provide some description for extended errors , related functions, and the EXTERROR_VERBOSE environment variable. Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- lib/libc/gen/err.3 | 16 ++++++++++++++++ share/man/man7/environ.7 | 16 +++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3 index 088ead71239b..70a214152a19 100644 --- a/lib/libc/gen/err.3 +++ b/lib/libc/gen/err.3 @@ -114,6 +114,22 @@ preceded by another colon and space unless the argument is .Dv NULL . .Pp +If the kernel returned an extended error string in addition to the +.Va errno +code, the +.Fn err +function prints the string with interpolated values for parameters, +as provided to the corresponding invocation of +.Xr EXTERROR 9 . +If the extended error string was not provided, but extended error +information was, or even if string was provided and the +.Ev EXTERROR_VERBOSE +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. +The format of the printed string is not contractual and might be changed. +.Pp In the case of the .Fn errc , .Fn verrc , diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7 index 51fb6544fc5a..ada2cc45a650 100644 --- a/share/man/man7/environ.7 +++ b/share/man/man7/environ.7 @@ -114,6 +114,18 @@ A startup list of commands read by .Xr ex 1 and .Xr vi 1 . +.It Ev EXTERROR_VERBOSE +Request the +.Xr err 3 +and +.Xr uexterr_gettext +functions to unconditionally report additional information, +mostly useful for the (kernel) developer to diagnose the issue. +See +.Xr err 3 +and +.Xr exterror 9 +for more details. .It Ev HOME A user's login directory, set by .Xr login 1 @@ -298,6 +310,7 @@ built-in command in .Xr cd 1 , .Xr csh 1 , .Xr env 1 , +.Xr err 3 , .Xr ex 1 , .Xr login 1 , .Xr printenv 1 , @@ -311,7 +324,8 @@ built-in command in .Xr system 3 , .Xr termcap 3 , .Xr termcap 5 , -.Xr simd 7 +.Xr simd 7 , +.Xr exterror 9 .Sh HISTORY The .Nm From nobody Mon Dec 29 02:05:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dffgQ678Jz6LTrB for ; Mon, 29 Dec 2025 02:05: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dffgQ3sLxz3gkd for ; Mon, 29 Dec 2025 02:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766973906; h=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=XEKYbEW4GuynMkGT8fmgbBN9MyffzUbohv6YqVGu7w8=; b=op0qYA8Bzmlk2kyrysoBuSAcujir74/eEP7571xOC9WDCweC/liYj4F9qIOCmZJu1hnlhh gjJZ5wkw7x3iBMCLWBZ8WIcNoWAMoBG4m46y8Sh9+16nCn/WNrvvhFmCQBKRnH4TcnqO2X a+c+WhcYceN2UUO+S/tXDkex4Ssm/I224B7L+vHlaq+KFAMy7PXqqJ42dNJL8ySLA4JDjZ kwCv3WJvazXSEL4YibQhxmgyRnG2SvTv3xQOWStXoEcv0YAetfIvdQxfPtJg3S9IVDsUTM HCSol0Ip8jJG2dKqqt6aE6tcU7YSXansQONhStmma1hlaNU/BGoJOESRDhAm4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766973906; h=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=XEKYbEW4GuynMkGT8fmgbBN9MyffzUbohv6YqVGu7w8=; b=NIeSfnLbbPbuiDwEm1cDrpN5+KbzdYWSx+HTq5POcAEtps1p3dYofWRk5XGieUScSJyykI YCLs0OlUjUIBd4lHbb85lYtA1O+cFXlGyMjPZWiXCe5vtAt8O5Sb5RkOM+8Ouu9ShJhkS3 yN5rOgyVZi58hGetF00GnIRH65tcXjMbUSBB37ByFzAVwN08dwfvqo6BogQOjl9qWS2iBe hXTYNIad1DLAr9oixWcK5l0OtsC8iToZNnMoQed7XgtA4XCs8iid3W4WLSjJsDhVzIvQ0e tREEg1AZUqyLK9YFzsylTuwjwi7FTAX3+u8Xtn2OzW/TsSuH0AJpmzchb2+QGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766973906; a=rsa-sha256; cv=none; b=w3zMQ+ho9qKeiSDokOpptPBr6GYpkAog9g4cXQVpU4boluRl7TQnrTnFq7XinINWx2iSJE aO779HUeEAFuCpbHTF9WEvvsJCvILmpAUXOZzwE5GZbgHZAoC158A/fvj+A5b4yCCg6xQF m37GSGHWNOzLNbFI/iU5lHuXa8OKVX1HyS4d/6nA5OyQpXvi0LHHmuDWaSbLJgQz+8EixD Jf4gu3Oc1mczaPP1B3TkezZWM27kdG4eySfVa/LsC29lTj/YFHZAM7j1fiPs38P5SKbI8J +hQaqeiv+VvgxZtOmwTUPnmmbnyuSNdKOe+YYsklV03/6Kvu1h7c2bKY1PQzmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dffgQ2Zlqz19Cn for ; Mon, 29 Dec 2025 02:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d905 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:05:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ayrton Munoz From: Dimitry Andric Subject: git: b6672803a1cf - main - cross-build: Avoid adding to SYSINCS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6672803a1cf10dd1c912fe6571a8d426b8868bd Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:05:06 +0000 Message-Id: <6951e1d2.3d905.f3b3a4b@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b6672803a1cf10dd1c912fe6571a8d426b8868bd commit b6672803a1cf10dd1c912fe6571a8d426b8868bd Author: Ayrton Munoz AuthorDate: 2025-12-29 02:02:28 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 02:04:45 +0000 cross-build: Avoid adding to SYSINCS Summary: The sys/cdefs.h in src is incompatible with glibc's sys/cdefs.h so cross-building broke when the former was added to SYSINCS in 1c9ff80f06. This commit adds a guard around that to only do that when building on FreeBSD. This should fix github CI. Test Plan: Ran buildkernel using tools/build/make.py on linux in github CI and locally on FreeBSD to double check nothing broke. Reviewed by: dim MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54385 --- tools/build/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 8017d776fd55..1eb539f06607 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -351,10 +351,12 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h +.if ${.MAKE.OS} == "FreeBSD" # Needed to build most of the things below, which include sys/cdefs.h either # directly or transitively SYSINCS+= ${SRCTOP}/sys/sys/_visible.h SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h +.endif # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/_nv.h From nobody Mon Dec 29 02:55:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnH0Lbxz6LYMW for ; Mon, 29 Dec 2025 02:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfgnG6pSSz3qQv for ; Mon, 29 Dec 2025 02:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=URul1NHlDoEuEDph1mLSxQrOxL81Kz/IgJkEx6sko3w=; b=kF/mmBuDBmkclJ47DrJy0wdRsrv7jA0Oo0u1DZvz8dsoli5FJNyzRfzZUZFFaT0NuLGwPz NcPdLOk9gMhNSPLRCRW7UK1F7+PxD4JN1jusxIma961y3CM2s5BZjojDfiPDi8QmxfKePL 9SxDDZoNnA8uaUgD7K9rFeKJaG452danAoCCiJsnJqX9kBSuxwFGeMxpx3lwBZJnG0+6fw /bo4mHcOf+r29YmZvN8u4KxJpG6AyRGzztflWK5uXtBhUPQHfnh0QiXpYL2OLgo/5gC5+k zt9g15v1eYEA/o5+X2C5lBpLdgSqH4Q0h+bXa1M70nMbtUe5ePwaCUIENn8kMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=URul1NHlDoEuEDph1mLSxQrOxL81Kz/IgJkEx6sko3w=; b=NUK0kXSxPe1gcDruc2rQQ6n2coPEEUARY1+lvhjenTFiWxvd/JPk7zWhLHaMhAARZF1tcn 0h1mdfjA13mXV3vRS7YbDooKmhR/HnaIir0q6WDCIoKO0wDO3ZB5fM9NRC4NbMDRtBQqVx YIsZNHtOWJq+WOSKoUISzeCJgF8U85skjXX9l1fLBj/m8AI11+YYhKgNRKm1A4Pb0mxvsS 3jkGO169HdZRkBd7PFwgoVhC41RpVlkfKaRzadRbhitLJYMxo3+exWDOUQmXibwmYWTwTE VVKs0NmVwVg06oM6ZMqa0M/Hn7sHVeXeBTb5b/0vOJpWaUYkl/q9Bra50bpxGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766976915; a=rsa-sha256; cv=none; b=r3kB54r28WQxxhTkuS7lfmXy6OSTg7TI0pbQW225nJtnan70Q+jXNzwBJmckk+CY6FU+sZ a7H+zsvMkP9ROq2MYzLVmjxkfFS2qbx+GIbshI5MdHmf8kRCKEGC87q+VZxZPnNDulaNth 6+k1QhyeV4kV+CRaZmZrRbOFy962DF0gwqt1fUDG5eeaqD63QSrs67t+sjnQy4Yi/PYUGa QBp0SpgD9LwVZqBcNtXGFtBLn+se14+UexAXOz3dJlMsyzPcU3VolADwW5MzJzLc6hqgM8 pot/h8egCbgXyioCxhGogE05oBSalv9CBg/w6vXn/DcRW7mCpHiZ0lPGcVDRRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnG6M9yz1BVC for ; Mon, 29 Dec 2025 02:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 954d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:55:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 32ea8209825a - main - LinuxKPI: 802.11: add compat.linuxkpi.80211.IF.dump_stas_queues List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 32ea8209825af594cbfa1fc654d45eb9a6aab528 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:55:14 +0000 Message-Id: <6951ed92.954d.6416043b@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=32ea8209825af594cbfa1fc654d45eb9a6aab528 commit 32ea8209825af594cbfa1fc654d45eb9a6aab528 Author: Bjoern A. Zeeb AuthorDate: 2025-12-28 17:03:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-29 02:48:14 +0000 LinuxKPI: 802.11: add compat.linuxkpi.80211.IF.dump_stas_queues Extend the normal compat.linuxkpi.80211.IF.dump_stas sysctl by queue information. This was helpful for debugging various issues, like selecting the outbound queue, stopping queues for BAR and helped finding multiple bugs. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- share/man/man4/linuxkpi_wlan.4 | 9 +++- sys/compat/linuxkpi/common/src/linux_80211.c | 78 ++++++++++++++++++++++++++-- sys/compat/linuxkpi/common/src/linux_80211.h | 4 ++ 3 files changed, 85 insertions(+), 6 deletions(-) diff --git a/share/man/man4/linuxkpi_wlan.4 b/share/man/man4/linuxkpi_wlan.4 index 136e04c32bb7..65c77d8d7631 100644 --- a/share/man/man4/linuxkpi_wlan.4 +++ b/share/man/man4/linuxkpi_wlan.4 @@ -6,7 +6,7 @@ .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. .\" -.Dd June 13, 2025 +.Dd December 28, 2025 .Dt LINUXKPI_WLAN 4 .Os .Sh NAME @@ -112,6 +112,13 @@ Print statistics for a given, associated .Xr wlan 4 interface; typically IF would be .Em wlan0 . +.It Va compat.linuxkpi.80211.IF.dump_stas_queues +Like +.Va compat.linuxkpi.80211.IF.dump_stas +but also print queue statistics. +This sysctl is +.Sq hidden +and normally only needed for debugging purposes. .El .Sh SEE ALSO .Xr iwlwifi 4 , diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 02724433d89d..28c9c62309fe 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -282,7 +282,7 @@ lkpi_nl80211_sta_info_to_str(struct sbuf *s, const char *prefix, } static void -lkpi_80211_dump_lvif_stas(struct lkpi_vif *lvif, struct sbuf *s) +lkpi_80211_dump_lvif_stas(struct lkpi_vif *lvif, struct sbuf *s, bool dump_queues) { struct lkpi_hw *lhw; struct ieee80211_hw *hw; @@ -292,6 +292,7 @@ lkpi_80211_dump_lvif_stas(struct lkpi_vif *lvif, struct sbuf *s) struct ieee80211_sta *sta; struct station_info sinfo; int error; + uint8_t tid; vif = LVIF_TO_VIF(lvif); vap = LVIF_TO_VAP(lvif); @@ -376,6 +377,39 @@ lkpi_80211_dump_lvif_stas(struct lkpi_vif *lvif, struct sbuf *s) sbuf_printf(s, " he_dcm %u he_gi %u he_ru_alloc %u eht_gi %u\n", sinfo.txrate.he_dcm, sinfo.txrate.he_gi, sinfo.txrate.he_ru_alloc, sinfo.txrate.eht_gi); + + if (!dump_queues) + continue; + + /* Dump queue information. */ + sbuf_printf(s, " Queue information:\n"); + sbuf_printf(s, " frms direct tx %ju\n", lsta->frms_tx); + for (tid = 0; tid <= IEEE80211_NUM_TIDS; tid++) { + struct lkpi_txq *ltxq; + + if (sta->txq[tid] == NULL) { + sbuf_printf(s, " tid %-2u NOQ\n", tid); + continue; + } + + ltxq = TXQ_TO_LTXQ(sta->txq[tid]); +#ifdef __notyet__ + sbuf_printf(s, " tid %-2u flags: %b " + "txq_generation %u skbq len %d\n", + tid, ltxq->flags, LKPI_TXQ_FLAGS_BITS, + ltxq->txq_generation, + skb_queue_len_lockless(<xq->skbq)); +#else + sbuf_printf(s, " tid %-2u " + "txq_generation %u skbq len %d\n", + tid, + ltxq->txq_generation, + skb_queue_len_lockless(<xq->skbq)); +#endif + sbuf_printf(s, " frms_enqueued %ju frms_dequeued %ju " + "frms_tx %ju\n", + ltxq->frms_enqueued, ltxq->frms_dequeued, ltxq->frms_tx); + } } wiphy_unlock(hw->wiphy); } @@ -393,7 +427,28 @@ lkpi_80211_dump_stas(SYSCTL_HANDLER_ARGS) sbuf_new_for_sysctl(&s, NULL, 1024, req); - lkpi_80211_dump_lvif_stas(lvif, &s); + lkpi_80211_dump_lvif_stas(lvif, &s, false); + + sbuf_finish(&s); + sbuf_delete(&s); + + return (0); +} + +static int +lkpi_80211_dump_sta_queues(SYSCTL_HANDLER_ARGS) +{ + struct lkpi_vif *lvif; + struct sbuf s; + + if (req->newptr) + return (EPERM); + + lvif = (struct lkpi_vif *)arg1; + + sbuf_new_for_sysctl(&s, NULL, 1024, req); + + lkpi_80211_dump_lvif_stas(lvif, &s, true); sbuf_finish(&s); sbuf_delete(&s); @@ -4173,6 +4228,11 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], SYSCTL_CHILDREN(node), OID_AUTO, "dump_stas", CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, lvif, 0, lkpi_80211_dump_stas, "A", "Dump sta statistics of this vif"); + SYSCTL_ADD_PROC(&lvif->sysctl_ctx, + SYSCTL_CHILDREN(node), OID_AUTO, "dump_stas_queues", + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_SKIP, lvif, 0, + lkpi_80211_dump_sta_queues, "A", + "Dump queue statistics for any sta of this vif"); IMPROVE(); @@ -5690,6 +5750,7 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) LKPI_80211_LTXQ_LOCK(ltxq); skb_queue_tail(<xq->skbq, skb); + ltxq->frms_enqueued++; #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_TX) printf("%s:%d mo_wake_tx_queue :: %d %lu lsta %p sta %p " @@ -5719,6 +5780,7 @@ ops_tx: control.sta = sta; wiphy_lock(hw->wiphy); lkpi_80211_mo_tx(hw, &control, skb); + lsta->frms_tx++; wiphy_unlock(hw->wiphy); } @@ -8121,6 +8183,8 @@ linuxkpi_ieee80211_tx_dequeue(struct ieee80211_hw *hw, LKPI_80211_LTXQ_LOCK(ltxq); skb = skb_dequeue(<xq->skbq); + if (skb != NULL) + ltxq->frms_dequeued++; LKPI_80211_LTXQ_UNLOCK(ltxq); stopped: @@ -8769,18 +8833,21 @@ linuxkpi_ieee80211_handle_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) { struct lkpi_hw *lhw; - struct ieee80211_txq *ntxq; - struct ieee80211_tx_control control; - struct sk_buff *skb; lhw = HW_TO_LHW(hw); LKPI_80211_LHW_TXQ_LOCK(lhw); ieee80211_txq_schedule_start(hw, txq->ac); do { + struct lkpi_txq *ltxq; + struct ieee80211_txq *ntxq; + struct ieee80211_tx_control control; + struct sk_buff *skb; + ntxq = ieee80211_next_txq(hw, txq->ac); if (ntxq == NULL) break; + ltxq = TXQ_TO_LTXQ(ntxq); memset(&control, 0, sizeof(control)); control.sta = ntxq->sta; @@ -8788,6 +8855,7 @@ linuxkpi_ieee80211_handle_wake_tx_queue(struct ieee80211_hw *hw, skb = linuxkpi_ieee80211_tx_dequeue(hw, ntxq); if (skb == NULL) break; + ltxq->frms_tx++; lkpi_80211_mo_tx(hw, &control, skb); } while(1); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index fcbef46fc6de..d4f18fcafbba 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -154,6 +154,9 @@ struct lkpi_txq { bool stopped; uint32_t txq_generation; struct sk_buff_head skbq; + uint64_t frms_enqueued; + uint64_t frms_dequeued; + uint64_t frms_tx; /* Must be last! */ struct ieee80211_txq txq __aligned(CACHE_LINE_SIZE); @@ -180,6 +183,7 @@ struct lkpi_sta { bool in_mgd; /* XXX-BZ should this be per-vif? */ struct station_info sinfo; /* statistics */ + uint64_t frms_tx; /* (*tx) */ /* Must be last! */ struct ieee80211_sta sta __aligned(CACHE_LINE_SIZE); From nobody Mon Dec 29 02:55:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnJ1VyRz6LYjX for ; Mon, 29 Dec 2025 02:55: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfgnJ0Wpjz3qYh for ; Mon, 29 Dec 2025 02:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L1jTz+hJsqA3TllZkZ+nh9T/DU9s6M/MHbUdkbYjNCg=; b=LeJ8k2+91XmOurx6xAPEyp7l5ECiMfD658ofQVqgsPtWHOaIQeppzBhtWQBKKo/th2cij3 sNOZMUIeCGb9dxQU7CRfRGJBKiKgPPiXnzrWOwrzhu2royvf0NnLlNuWA3B0B/M1BrWMuq IJ3hh51wIWPa1WczMxzn/Dq4tTzVumVe37d4UH4+zk8Xq6ZA21fYBGxLcA7+nckvqpsKqm nhyKqicKPOJPUrS36hq4C8iuAWRa9xxCK2RbP55H2MAZV0OdRx8Hd27iIIyoqVHt5+9ae9 remW4MeZAf7SIAhQGiE0JAmEBNwpqkXya5Bzj+Hx6ouwo0m/GM0QPNZVsKoN9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L1jTz+hJsqA3TllZkZ+nh9T/DU9s6M/MHbUdkbYjNCg=; b=R+7yvJICjupyZKpIJuvAI0Kl/60NI2BCa6Xshxv2t3jpMoqHq5TK1vO1pY/n9IKeOMT/28 PXXLuuAaZn87azlEB4VdTODZey3M+S3eSotYNZD3nRZ5wa5E91dnL/56XpqRmpnkWSwkOS tXhmdYyiMyAbWKp9H26Vy0NVLay10Ef+Lr8U7ruCO1NRY729t+hJeLF9ctl1J3vNQ8sl2v bJaTZFqAo/OnjUMEXDtERYiWnBhQJNG2tCQ42rF8QJgQ7FXZfrGU9UF1HeD1OhMWDsOFQL bExOepbCRrL5VtrRez19TkBIBiVKPMgFAIrZbkjAFoRs/NsluJNN3auVx6RDNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766976916; a=rsa-sha256; cv=none; b=Gl4s2deEB3EvHMq13UkxFbFGhd82b13V4+WMqjL0ZyWi2NtZ1PdKGGAJR3HW4S0hYaxfbx 3Jup1KnyogtbBxmoArs2XlcEz4vEy/Qxyhkgmxn3yufcbeDKT6acfa0SkrITXDpkYQFLST 9UjdWGnAa8tOXnM/LGxnxkmrtWmRZL/+8sa0z4ZmhIW7TJxDDOmQ/OTcIaHUgKzU+Ixy6W DMbq9vsF7aobq5I81kW75cfBPZ7zAaRGnQnEiTTVDNv8Cvhx4TwJDPqsUpjpw4nvzqwulC HnsAXFn4T6KK7xKMvaC/+Xd5xCsnfMrck5i4T81Z7+K9isogpp5FU2rvjtC3uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnJ048hz1BQF for ; Mon, 29 Dec 2025 02:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8e4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:55:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9cf85457b13b - main - LinuxKPI: 802.11: assign sequence numbers to frames List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 9cf85457b13bc7aa125388d63c82acf2b21e9e9e Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:55:16 +0000 Message-Id: <6951ed94.8e4f.5ff4c384@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9cf85457b13bc7aa125388d63c82acf2b21e9e9e commit 9cf85457b13bc7aa125388d63c82acf2b21e9e9e Author: Bjoern A. Zeeb AuthorDate: 2025-12-28 17:06:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-29 02:50:42 +0000 LinuxKPI: 802.11: assign sequence numbers to frames While all native drivers were converted to call ieee80211_output_seqno_assign() after changes to net80211 if needed, LinuxKPI 802.11 was not fixed. Add the missing call. Given we are currently only supporting STA mode, we can provide sequence numbers for all frames (mgmt/beacon would be a problem in AP mode). This greatly helps LinuxKPI based drivers other than iwlwifi(4). If drivers do their own sequence numbers, they will overwrite what we pre-set unless we would pass a txflag not to do so (beware the consequences). Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: eabcd1773fa3, 785edcc2af5a --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 28c9c62309fe..45c46a4d34f7 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5573,6 +5573,8 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) #endif ni = lsta->ni; + ieee80211_output_seqno_assign(ni, -1, m); + k = NULL; keyix = IEEE80211_KEYIX_NONE; wh = mtod(m, struct ieee80211_frame *); From nobody Mon Dec 29 02:55:17 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnK5F94z6LYMb for ; Mon, 29 Dec 2025 02:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfgnK1TN6z3qNB for ; Mon, 29 Dec 2025 02:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MjIGxBN/vw6Lh3JZPQaAjN2KkU2Drug/VDc7w+WE3PA=; b=kmUH8H6kCqQzLKJ6UyNmBcp55vaO6gBFklCx+xFh6+pQp85NSL61Lw6DmHVg2GZ6BYVX56 8OaMbneLZw4+567LfOvyyHxyGdZeUDQIMGJkpicSMjUugnSdMaaOke5L7V0O2D2w9smEgY l7KWpWorWWkiUainBHCmAbYXl+g05Vx54jEyAYK3p2TKAgvakHhgy4nDtCAP1PUhSf4+6D IhUOr4fLfo2RZ+3Owme8eR+TRhYXceX/i4DtH14g0TqPW0BlCilVDQjSWZX4GxOt6dgOqv 0YfaO5/rt3NJmTybb3VKg1vHEXxlW8PUbtgLybZVhwGi+3v73gQ6r0C+1S4ifA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MjIGxBN/vw6Lh3JZPQaAjN2KkU2Drug/VDc7w+WE3PA=; b=YNk0syyMWXemKpCLDxC6RAvc4vbUMto3OYehd0SK9gjMr5uGMQnvaDsNn9CZvAg8FZgjFQ QeHxuUMmB6ZNjA1s7vqPf7XBTdyqDI4t6ZaAYWGKbgRH5cBn7Hk9TSsytgY9c5M9fNTJgc O8WE5TxErFV4lBpQoHSjSsyh9StGCHqDh8G0H2oHCMnI2J143fPjeEFae2kz0GcUMrWHke ZPK1EbS3ZxNenj7ZgI9pi3AaD5t4YYZSUTz4L8HOKfraGk+F2TBaqCy2zg9E6YF9ot6Paz BmA4vYVO8QpsKe4lZiOXEVdeh2fZi/AA8k76SR5oQlMsNmPH32wbL7yZ9KvBcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766976917; a=rsa-sha256; cv=none; b=aM0slqWaPXteBg2IYGG06C3aBANnIohxhfXpbLBtQW/wNAngj6/n6dJ4m254pqp5PxU8DR HWSteeBElZfqHrI0eDGNcsohYSIH0VlnwK91CAoJ0Pl11PM6Vrmh05WlZKQa2HTFl7st+W ho46yD4mfRv6J7bejA5o1Kkwp9buCsB/czqcdB89i3yRWnrWxygSO2UVLRLPbx2/aZl76o iMcB16Eoc0IsaYII6eH0xTMlmfr7NHN7T+em9/4OleyltyRFID+8umW/y0U5X8Gq5np9EE S54mvnXQiBWospNfEOaTQQ4D6cOzdLqdE/pUS6b6eYW2HSaRRbX+N5pqP/0N9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnK0yVkz1BQH for ; Mon, 29 Dec 2025 02:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8eda by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:55:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f0395993e1ea - main - LinuxKPI: 802.11: reset hdr after crypto in lkpi_80211_txq_tx_one() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: f0395993e1ea83705e0da6623843e7d5d03f7269 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:55:17 +0000 Message-Id: <6951ed95.8eda.9ba7bf6@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f0395993e1ea83705e0da6623843e7d5d03f7269 commit f0395993e1ea83705e0da6623843e7d5d03f7269 Author: Bjoern A. Zeeb AuthorDate: 2025-12-28 17:15:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-29 02:54:03 +0000 LinuxKPI: 802.11: reset hdr after crypto in lkpi_80211_txq_tx_one() When lkpi_80211_txq_tx_one() calls into the crypto offloading parts to possibly make space in the headroom, the beginning of our frame moves. We have to reset hdr after that call as otherwise later classifications based on the hdr->frame_control will fail or cause wrong classificaiton of packets. This makes sure frames will either be directly sent using (*mo_tx)() or use the correct tid for the correct queue. This helps to get rtwx8 packets flowing after BA was negotiated. Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: 11db70b6057e4 --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 45c46a4d34f7..f4b534122b87 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5729,6 +5729,8 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) dev_kfree_skb(skb); return; } + /* Reset header as data might have moved. */ + hdr = (void *)skb->data; } #endif From nobody Mon Dec 29 02:55:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnL74lwz6LYgJ for ; Mon, 29 Dec 2025 02:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfgnL3khyz3qqG for ; Mon, 29 Dec 2025 02:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9C8JIzCXAVnOxx2lnsbcvIMgJknnj+ZkuE3MEKM2vTc=; b=OmykITYqnka4DmpyLaptys8gJjKtWrQH2uJJrVWoI0D3B+Sma144KM8ClOtvK8id/ziYzE c2rtHdDlP/tsj5PXmXYhLv8FlgQDmz9TfPw4iqUrQc+5OMnOhM5c9G2hol1ydv668bzIaW 67b7Gssh6BafAiYKQgefOaGzod/3W2Snml1p9jcIY5BPNuwWNEgASQRdo7PlUTD84y4id9 DPn2rnjruFyLkx6Gs9XmBjddS3uyOiDrtorJLpaBcba80MlG2RXlHqEt1nNuaYrgeg4EEh x7kn6C/HvSJOXOL2s6LPQgVSMfu326MWO+ToPoTvlqQ/HTEw4lgZkihEZQfEsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9C8JIzCXAVnOxx2lnsbcvIMgJknnj+ZkuE3MEKM2vTc=; b=mZmfFY1WwhS6WLnUCnkUG2wCJLY+DrIyPwRlfn8KRrOq+DAKDM8rWEiHJyaKrZ/T0i0bxW AYVALjzP+OJwIOSGPyGeUHUMDr+ijDcZ1hB3iBCo3VaA2cfOZ7bJ15+ywlW82RJOL9HOWW I6T7mJCAqE4yFN9aQVMa7930iIamNnyOJOy0/w42BWi8v3L9BAvNvKdzbcWepUcAo7uL5a QvgJ4/VqzGeb6lhmri+5Q9vFhn2JJkwn/NyerzmEbBcBL0KfKc56fvaRnaq8ngUz/aFRPp QQaxfEwUvDZKcbRTObhgRyIptYQvNEVircA4dX7rToOWtkO8SiWo4QT5G1hAAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766976918; a=rsa-sha256; cv=none; b=fNtcKLI8bO5bWLr1lO1a6DyhGftwxHX5FtjaFK4NRaXtDWiA8ZSSdu89en5VRmXWIdsbOo MjvtpxIyFOJm5IsX50ZHFtWeAvZ/qNQLoRFCcUPfshj+3eN00sB0I5fZ6SuTxv8hkCM88o CZQJZnIVKDPGtFI8vtnhJlW1sYk+2EDukbbePAaQMePn6F72LDYu1mKVn+CvhEJMqUZg3x 2ESfdVbnUt8IQJttOtJLh7iMRKqbtREl7C1oTBYXIcOOkg1L2hoDS26aggr5EEwrqs31hn Oq3qOZEFXFfiSBSCM4N2tSkQn+Grp2H9EN+6EvPSRUVhzNH3H4TFTmWAhEj1QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnL1kWqz19v2 for ; Mon, 29 Dec 2025 02:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 84f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:55:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 8494be1b5af7 - main - LinuxKPI: 802.11: fix rx_nss with VHT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 8494be1b5af7fe4f765532f802ac0a145e061d73 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:55:18 +0000 Message-Id: <6951ed96.84f1.680464e7@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8494be1b5af7fe4f765532f802ac0a145e061d73 commit 8494be1b5af7fe4f765532f802ac0a145e061d73 Author: Bjoern A. Zeeb AuthorDate: 2025-12-28 19:38:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-29 02:54:03 +0000 LinuxKPI: 802.11: fix rx_nss with VHT When fixing single-stream chipsets, like iwlwifi(4) AX101, we started masking the announced with the hardware supported values. This would probably limit, e.g., rx_nss. During these works we fixed a loop checking from the highest nss=7 to lowest nss=0 (8..1) and would set rx_nss if the stream was supported. This left us with always setting rx_nss on nss=0 to nss + 1 = 1. Instead only update once when we hit the first supported MCS value (highest number of supported streams). Looking at the diff of the mentioned commit hash which gets fixed it looks like even the old code was not correct either. This only fixes the logic to calculate rx_nss. This does not yet help with modern drivers to actually update the value. Code for this will come in a later commit. Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: adb4901ac9ae --- sys/compat/linuxkpi/common/src/linux_80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index f4b534122b87..1ac28dfef448 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -693,7 +693,8 @@ skip_bw: sta = IEEE80211_VHT_MCS_NOT_SUPPORTED; else { sta = MIN(sta, card); - rx_nss = i + 1; + if (rx_nss == 0) + rx_nss = i + 1; } } rx_map |= (sta << (2 * i)); From nobody Mon Dec 29 12:53:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfx3m2y5dz6MG7N for ; Mon, 29 Dec 2025 12:53:40 +0000 (UTC) (envelope-from gkontos.mail@gmail.com) Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) (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 4dfx3k3rgtz3fTg for ; Mon, 29 Dec 2025 12:53:38 +0000 (UTC) (envelope-from gkontos.mail@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b="TTI/FnOw"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of gkontos.mail@gmail.com designates 2a00:1450:4864:20::334 as permitted sender) smtp.mailfrom=gkontos.mail@gmail.com Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-47d182a8c6cso40018755e9.1 for ; Mon, 29 Dec 2025 04:53:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767012815; x=1767617615; darn=freebsd.org; h=message-id:in-reply-to:to:references:date:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=smfU+q5dT5TGH511iDvLTcR0rSrkf+xy71Px2df4StQ=; b=TTI/FnOwqNYXCQwJHHjG+s/wVLMb5HxplbUJEnUifVdc9ZPlijOYzWb3BejaVZccsT phobHyxfuBbUTHCoA3cm5KjAXZcYQPus3YxkOxWKR1rgXVH21Lkfw5mY/SCNnIZzv84V ZNHsi4edF1xGG4QDscaOyBdSrlqYjfLze9o8QTMCL6WFgccf5jiISEkR7SgPol9E8KvV FBlslKMk/UAK+gfu3hqeCDyatD8IxgeifXTFBAkHriAbZTC4P1mT+3Agv3+Ov5fWVGna sk6YhAuWEvRILeWHq9WOHtuhUR1zMS0Wy72c5LB1mZ2F/jtVFTisWLxKYtCAy/XlHMmJ xCwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767012815; x=1767617615; h=message-id:in-reply-to:to:references:date:subject:mime-version :content-transfer-encoding:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=smfU+q5dT5TGH511iDvLTcR0rSrkf+xy71Px2df4StQ=; b=da/0byH2Di8M4qaPCUyneJEiJc+NLZKmoOfiuG7qY4g9c5MgffloD79OA8t8VJMssG 0wPgYYQFSEN3kNtOX3KuRb+adNTCBv/qwz6lLb3kU6HWAFsyJWZzgHtzyLnraVeDYW1W jC4mRODLgpMIMPSqhfZXoSKKGR8bjej7bziR+AqJcsmK9koZk2RVedzmZ20tNUbNQoON xrkE1cx7cTWH/ygoK9oaPSlgpOCMAuZpZJTxp8Yb3ABVt/d4JRPCTDIhixbtO1m2JU/u PmUStH+1hTwdJBx1MoZbHuemYdI21zJXuxX1Aecvs1bnS9XAf4KNRiMnsTr1ay4/IHxS ie7A== X-Forwarded-Encrypted: i=1; AJvYcCWULZ8QUSKKDngI9L7vcSUopzjgPMTaVcyzL5qtMs5F2niVQCeJRnI1IZcls8hhRF0bpvOpIILeQWD5xXzdgHLDtDovww==@freebsd.org X-Gm-Message-State: AOJu0YyfX72sbvdwkG93YVO43U6fuc/RfQ6Me4knKXZbqIb+HU52tWm5 SrhZPaSh9neKuS2RAIe0ADDYKefuit0ytuOtdrgLjyeNlT+s5Wl/R2INBe8NNw== X-Gm-Gg: AY/fxX5WM+KjzoEd/2bAM65AXwEtAOx8IzK9Kv9TtQXNMjBN65ZlaRa5j5rEIQ78D9q RsrYf4hlC4Q1ndXy7mk8ARTD7SrcX76WibnBZWJYn+id/szsGMrb2aOi93RUZ9udu5zXc1GZ+z4 +NvVUeWIlDkWSyChqjdLH2cxKDhMT6rImF5U4eGpRUDa9dDRGpM7N+GCM2iLEWPkWwJJSd6KQpA qVk8DXkVuOH5KSOVT5wL3hrpyGYj9broIYiXtU+8lqB2Qv/lOmG4Da05PB+kMqQ+5wDDhIhv62F LrKS4097FdupfAEBggCUxG9G/L9txw8A6eBnYVX17kjl4l8C5DuYEScbGxVNvSFmZo5RJYsaXP9 GB0CrkxTB59WDJLtAiOl0/spUSu8z4PmfKDNO44LcBQ3PnpdoH9NowX7+V3HXgs3ohSneGi9kCt yGKnEtcMihe9Z0Ls2RzIJoJAIaxrzVwZ35vA== X-Google-Smtp-Source: AGHT+IHtTWa8Em8XTjUZGHXC6H26IZSl4a+W/ROihdXqalTKVoI+ur2xAZBcgs3++XqUK3oHBc4RBA== X-Received: by 2002:a05:600c:444b:b0:477:8ba7:fe17 with SMTP id 5b1f17b1804b1-47d1953bce7mr290373955e9.7.1767012814952; Mon, 29 Dec 2025 04:53:34 -0800 (PST) Received: from smtpclient.apple ([62.74.14.108]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be3aa99a3sm228428865e9.12.2025.12.29.04.53.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Dec 2025 04:53:34 -0800 (PST) From: George Kontostanos Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Unsubscribe Date: Mon, 29 Dec 2025 14:53:22 +0200 References: <6951ed96.84f1.680464e7@gitrepo.freebsd.org> To: "src-committers@freebsd.org" , "dev-commits-src-main@freebsd.org" , "dev-commits-src-all@freebsd.org" In-Reply-To: <6951ed96.84f1.680464e7@gitrepo.freebsd.org> Message-Id: <87F2B11F-4D7F-49F6-831F-C759EB6D43A0@gmail.com> X-Mailer: Apple Mail (2.3864.300.41.1.7) X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.93 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.93)[-0.929]; SUBJECT_ENDS_SPACES(0.50)[]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; MIME_GOOD(-0.10)[text/plain]; TO_DN_EQ_ADDR_ALL(0.00)[]; TAGGED_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[gmail.com:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; BLOCKLISTDE_FAIL(0.00)[62.74.14.108:server fail,2a00:1450:4864:20::334:server fail]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::334:from] X-Rspamd-Queue-Id: 4dfx3k3rgtz3fTg Unsubscribe=20 > On 29 Dec 2025, at 4:55=E2=80=AFAM, Bjoern A. Zeeb = wrote: >=20 > The branch main has been updated by bz: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D8494be1b5af7fe4f765532f802ac0a14= 5e061d73 >=20 > commit 8494be1b5af7fe4f765532f802ac0a145e061d73 > Author: Bjoern A. Zeeb > AuthorDate: 2025-12-28 19:38:16 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2025-12-29 02:54:03 +0000 >=20 > LinuxKPI: 802.11: fix rx_nss with VHT >=20 > When fixing single-stream chipsets, like iwlwifi(4) AX101, we = started > masking the announced with the hardware supported values. This = would > probably limit, e.g., rx_nss. During these works we fixed a loop > checking from the highest nss=3D7 to lowest nss=3D0 (8..1) and = would set > rx_nss if the stream was supported. This left us with always = setting > rx_nss on nss=3D0 to nss + 1 =3D 1. Instead only update once when = we hit > the first supported MCS value (highest number of supported = streams). > Looking at the diff of the mentioned commit hash which gets fixed = it > looks like even the old code was not correct either. >=20 > This only fixes the logic to calculate rx_nss. This does not yet = help > with modern drivers to actually update the value. Code for this = will > come in a later commit. >=20 > Sponsored by: The FreeBSD Foundation > MFC after: 3 days > Fixes: adb4901ac9ae > --- > sys/compat/linuxkpi/common/src/linux_80211.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c = b/sys/compat/linuxkpi/common/src/linux_80211.c > index f4b534122b87..1ac28dfef448 100644 > --- a/sys/compat/linuxkpi/common/src/linux_80211.c > +++ b/sys/compat/linuxkpi/common/src/linux_80211.c > @@ -693,7 +693,8 @@ skip_bw: > sta =3D IEEE80211_VHT_MCS_NOT_SUPPORTED; > else { > sta =3D MIN(sta, card); > - rx_nss =3D i + 1; > + if (rx_nss =3D=3D 0) > + rx_nss =3D i + 1; > } > } > rx_map |=3D (sta << (2 * i)); >=20 From nobody Mon Dec 29 13:21:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfxhQ7361z6MHZv for ; Mon, 29 Dec 2025 13:21:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfxhQ680cz3k07 for ; Mon, 29 Dec 2025 13:21:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767014518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KGNS60NiWArqIv+MHvSkh21wXC1Rt0uVDgWGZUCfKxE=; b=QItjMAdxiEZyxfUT4pp8Tl+dHMvvRBweKzLmQv3yez7gSoDHv8Ai904brgodNg8Tsvt4sj 1RU30R9VjFrLPmusxH+kNtWxG63xDwYKy0Yb6ulJtBqA6qkpGTUV7KmPBwpwFF42V6zx/N oHtACSV9wKd36qbAkT7MFtt+HShLiisBu+4bVUGedkP3cdRZDmbwjaS8sQEN3CbeP0N/+G g8+PvDoGl1vfxrHXdWq/uY5KG3N2YieW8R7dM81fK5GhoeFLa8k5g6ap7ezRVefUIndB3+ 8iaCTM+uZVsxwxGj0kYZi7m2XdCAUgWftSPgeinrOzmcNkXU1DEbzv40OHqf+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767014518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KGNS60NiWArqIv+MHvSkh21wXC1Rt0uVDgWGZUCfKxE=; b=NGppHs5AoSDBg9QuweQ0H2O02Dy4T4mhH810SS2b/HZIUcarRhosdBvPS+NtRZAGPgwA9j oTlr/8aNWHjM9iS2sSznbA3AMtnfDmxGylj9x6a/QXu3Uy9G5OKpRCj3YIifDg2uvavglQ JQyEJ46KUfwANtPpiRQ9UMg1ItzmAg86c7jtaD9Lzs4tW+zPjIL1XIhDA+DGIbY73FA/j9 PlS0uslN48Gfyk5AT7qrA9nXHaa7eEFeh90zdg7j0f7LfM/gjyQRjpjgVbjbtNG2au4dWP OQQqf+Fgz3LE3Klfw6Sei68JyPfP0kHyIE8OHgESFmBfbwlDn1PTXPoTgpcz8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767014518; a=rsa-sha256; cv=none; b=BnX9q6QTQIETpPERl0TaY7dEMeRQEZK9g4Ed3KjN4CaLwDBFoGdkKv778HSIiPvbU2T5S6 W3lSd1ko/V3GcwXfFakj+suioB8zq3qJ9CWPmKTjIhRb4R/wMmhOwJQq2/HlXmCxwYDqer Cz4EbhuxxqxeSgE7SRjC8NPOMCQ1I7oWG1f695IwpuJLeUOqBeUx7pFWseQQPYeXsNu5Gu DUVhGtqCw3X2IWdA/yeJLO6QMCCIoQJ77xVWiEKS0XnLiaOgH1cyJ+4shJuZtD5UF4WmYE SO/VPL6ynJJgXOasYP0TpRqJs7AJAcE9qkzvYlEvmQbrueZVC5R+UbZWJ7Ofjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfxhQ5G5mz23n for ; Mon, 29 Dec 2025 13:21:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3686a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 13:21: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: faff7013187b - main - geom_part: Fix format string issues List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: faff7013187b03f4240af6f52f608e7ebafe19f3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 13:21:53 +0000 Message-Id: <69528071.3686a.455119c1@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=faff7013187b03f4240af6f52f608e7ebafe19f3 commit faff7013187b03f4240af6f52f608e7ebafe19f3 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-29 13:20:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-29 13:20:52 +0000 geom_part: Fix format string issues This fixes a segfault on i386 and armv7 and numerous style violations. PR: 292008 Fixes: 4f809ffec69c ("gpart: add libxo support for "show" subcommand + man page updates") Reviewed by: js Differential Revision: https://reviews.freebsd.org/D54393 --- lib/geom/part/geom_part.c | 69 +++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/lib/geom/part/geom_part.c b/lib/geom/part/geom_part.c index ac1bc25118f1..852eec2d790a 100644 --- a/lib/geom/part/geom_part.c +++ b/lib/geom/part/geom_part.c @@ -46,6 +46,7 @@ #include #include #include + #include #include "core/geom.h" @@ -651,11 +652,12 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) pp = LIST_FIRST(&gp->lg_consumer)->lg_provider; secsz = pp->lg_sectorsize; xo_open_instance("part"); - xo_emit("=>{t:start/%*jd} {t:sectors/%*jd} {t:name/%*s} {:scheme} ({h:size/%ld}){t:state}\n", - wblocks, (intmax_t)first, wblocks, (intmax_t)(last - first + 1), - wname, gp->lg_name, - scheme, pp->lg_mediasize, - s ? " [CORRUPT]": ""); + xo_emit("=>{t:start/%*jd} {t:sectors/%*jd} " + "{t:name/%*s} {:scheme} ({h:size/%jd})" + "{t:state}\n", + wblocks, (intmax_t)first, wblocks, (intmax_t)(last - first + 1), + wname, gp->lg_name, scheme, (intmax_t)pp->lg_mediasize, + s ? " [CORRUPT]": ""); xo_open_list("partitions"); while ((pp = find_provider(gp, first)) != NULL) { @@ -670,35 +672,43 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) idx = atoi(s); if (first < sector) { xo_open_instance(s); - xo_emit(" {t:start/%*jd} {t:sectors/%*jd} {P:/%*s} {ne:free}- free - ({h:size/%ld})\n", - wblocks, (intmax_t)first, wblocks, - (intmax_t)(sector - first), wname, "", - "true", (sector - first) * secsz); + xo_emit(" {t:start/%*jd} " + "{t:sectors/%*jd} " + "{P:/%*s} " + "{ne:free}- free - ({h:size/%jd})\n", + wblocks, (intmax_t)first, + wblocks, (intmax_t)(sector - first), + wname, "", + "true", (intmax_t)(sector - first) * secsz); xo_close_instance(s); } xo_open_instance(s); xo_emit(" {t:start/%*jd} {t:sectors/%*jd}", - wblocks, (intmax_t)sector, wblocks, (intmax_t)length); + wblocks, (intmax_t)sector, wblocks, (intmax_t)length); if (show_providers) { - xo_emit(" {t:name/%*s}{e:index/%d}", wname, pp->lg_name, idx); - } else - xo_emit(" {t:index/%*d}{e:name}", wname, idx, pp->lg_name); + xo_emit(" {t:name/%*s}{e:index/%d}", + wname, pp->lg_name, idx); + } else { + xo_emit(" {t:index/%*d}{e:name}", + wname, idx, pp->lg_name); + } - if (strcmp(element, "label") == 0) + if (strcmp(element, "label") == 0) { xo_emit(" {:label}{e:type}{e:rawtype}", - find_provcfg(pp, element), - find_provcfg(pp, "type"), - find_provcfg(pp, "rawtype")); - else if (strcmp(element, "type") == 0) + find_provcfg(pp, element), + find_provcfg(pp, "type"), + find_provcfg(pp, "rawtype")); + } else if (strcmp(element, "type") == 0) { xo_emit(" {:type}{e:label}{e:rawtype}", - find_provcfg(pp, element), - find_provcfg(pp, "label"), - find_provcfg(pp, "rawtype")); - else + find_provcfg(pp, element), + find_provcfg(pp, "label"), + find_provcfg(pp, "rawtype")); + } else { xo_emit(" {:rawtype}{e:type}{e:label}", - find_provcfg(pp, element), - find_provcfg(pp, "type"), - find_provcfg(pp, "label")); + find_provcfg(pp, element), + find_provcfg(pp, "type"), + find_provcfg(pp, "label")); + } idx = 0; LIST_FOREACH(gc, &pp->lg_config, lg_config) { @@ -713,7 +723,7 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) } if (idx) xo_emit("]"); - xo_emit(" ({h:size/%ld})\n", pp->lg_mediasize); + xo_emit(" ({h:size/%jd})\n", (intmax_t)pp->lg_mediasize); xo_close_instance(s); first = end + 1; } @@ -721,9 +731,10 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers) if (first <= last) { xo_open_instance("unallocated"); length = last - first + 1; - xo_emit(" {t:start/%*jd} {t:sectors/%*jd} {P:/%*s} {ne:free}- free - ({h:size/%ld})\n", + xo_emit(" {t:start/%*jd} {t:sectors/%*jd} " + "{P:/%*s} {ne:free}- free - ({h:size/%jd})\n", wblocks, (intmax_t)first, wblocks, (intmax_t)length, - wname, "", "true", length * secsz); + wname, "", "true", (intmax_t)length * secsz); xo_close_instance("unallocated"); } xo_close_list("partitions"); @@ -1112,7 +1123,7 @@ gpart_bootfile_read(const char *bootfile, ssize_t *size) if (sb.st_size == 0) errx(EXIT_FAILURE, "%s: empty file", bootfile); if (*size > 0 && sb.st_size > *size) - errx(EXIT_FAILURE, "%s: file too big (%zu limit)", bootfile, + errx(EXIT_FAILURE, "%s: file too big (%zd limit)", bootfile, *size); *size = sb.st_size; From nobody Mon Dec 29 14:21:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfz190RD8z6Ls0R for ; Mon, 29 Dec 2025 14:21: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfz185x0qz3qBT for ; Mon, 29 Dec 2025 14: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=1767018092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4TAmlZqaXkNkLdaeMriXbuaKGQUaoZ/iYqRgSlYhaqs=; b=lSJT5AyQUk6LoMZ5g0JDl2/NSTIdiDEMFmD5uqSFmaALj9gwlfNB8LGtpN26etCtBWBOXx vPOtORfscf3o7D8ePrQW/ttceaPU9iQYnfvjJHI2EJM5z5XA4NuHWthn0GFB0NjiNUVyIb kYjNsQ6bKq28lgC9rcjebkBno7QUInQmT/3Me/8epQOJOjDiGl8zz01kiSiD4NWS94fMUC 6pJmyFFh+w/OA3NJWE+8dl1xsGJ2VT/tfX33vtM54HfWaLJGtUKEeU37t4kF6zOTEK10jN 0gEuO67//uW5zjgXBKNJhnr5np15leoV9ImlLqBY2E3452dwTmpR5dcXdGNVVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767018092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4TAmlZqaXkNkLdaeMriXbuaKGQUaoZ/iYqRgSlYhaqs=; b=PJuKa3s8C8FEnI6pvivBovC5ipqRFnrCzWpNXmiHRAiXyTHcccJ1Rf0tpQ9AClR9H96+Ow d3PR06z3HqUI69BaX/g03yVPFqPA0E8UhdKap3zsOfZ1snMfHq0I9X37pCHt9/hvvsia+o rzhC6goOuvNpwAzVUMFxMjxUkeJnvsIeNWJVKi24hShFAzuD48SrXCyKpCswb4mXnb+IVw m7T82E6MXh1OV8zH5fa3ZqwZ/hicTvMV/1Ei3YlyYkBrQLg8/xhv2iwGMCogzRHIcZImhx rjLMr/fnkyLCzf5j6QDUaNaXlkuoitRV+bs19cE5IcvqW/Lve9mMLqt2rcTmzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767018092; a=rsa-sha256; cv=none; b=WboqRdUgRHcjhC1a99XMOQgCeeHlrsCHyLmYBI7PahUpP+RT7sv3IB5wlecbI3QArhbWmW a66H0/0TkHlQ+VpDz3s7za3XuVLdjXjW/FnvyzCWTHImX07cjHnHQ71UpGjt5ZVAYM7y2l bUlo4KT88AqsWQEGTwa+0L92oJ9B2yX4FuUbzdN558GwzFxi86eUpz7oLxEM8f3AfhEiHJ y4I0hbJsGxKnxxYHij1JI9QK8QuGMQkGkXSUSbryvLUiTsbK22R1fVWVLzozrSwd3TwzOb ZEXC9d1jl0ai6k/O3TKbrEk+j9Gox5NnfJ4DvGGRBZ/bfiVBmXDYKxfPJEA7Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfz185XBgz3J7 for ; Mon, 29 Dec 2025 14:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d50c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 14:21:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 85f499be90c1 - main - qlnxe: Avoid out-of-bounds reading the multicast ethernet address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 85f499be90c15a3de02d1c62ce03b99fab52f925 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 14:21:32 +0000 Message-Id: <69528e6c.3d50c.1d9cf8d5@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=85f499be90c15a3de02d1c62ce03b99fab52f925 commit 85f499be90c15a3de02d1c62ce03b99fab52f925 Author: Zhenlei Huang AuthorDate: 2025-12-29 14:20:12 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-29 14:20:12 +0000 qlnxe: Avoid out-of-bounds reading the multicast ethernet address The correct length of an ethernet address is ETHER_ADDR_LEN but not ETHER_HDR_LEN. MFC after: 1 week --- sys/dev/qlnx/qlnxe/qlnx_os.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 9963f472c615..99110e5e2d8f 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2539,7 +2539,7 @@ qlnx_hw_set_multi(qlnx_host_t *ha, uint8_t *mta, uint32_t mcnt, break; } - mta += ETHER_HDR_LEN; + mta += ETHER_ADDR_LEN; } return; } @@ -2552,7 +2552,7 @@ qlnx_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int mcnt) if (mcnt == QLNX_MAX_NUM_MULTICAST_ADDRS) return (0); - bcopy(LLADDR(sdl), &mta[mcnt * ETHER_HDR_LEN], ETHER_HDR_LEN); + bcopy(LLADDR(sdl), &mta[mcnt * ETHER_ADDR_LEN], ETHER_ADDR_LEN); return (1); } @@ -2560,7 +2560,7 @@ qlnx_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int mcnt) static int qlnx_set_multi(qlnx_host_t *ha, uint32_t add_multi) { - uint8_t mta[QLNX_MAX_NUM_MULTICAST_ADDRS * ETHER_HDR_LEN]; + uint8_t mta[QLNX_MAX_NUM_MULTICAST_ADDRS * ETHER_ADDR_LEN]; if_t ifp = ha->ifp; u_int mcnt; From nobody Mon Dec 29 14:49:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfzdv29hTz6LtdS for ; Mon, 29 Dec 2025 14:49: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfzdt69RKz3sGY for ; Mon, 29 Dec 2025 14:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767019795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dx5q8csNEq/KJVfIWSk9XyriJaAxZdccZRHY3SDoaHk=; b=dHLufurLrX1mQDKl1djQ8fhJQ8Two74lcLQUFo1XOfpY0e/WEG+OYTFe/TR+weYanSmstt PTNReTSDfj1vyR0ZUk9wBiwlmv+00TRA3Dw52uYX+KH8WqBdqVtkJrguJWUa5QInRPWXH0 URUUfeKFLVsemTfegle1YrNc0/SIUUl3WcDphmbINPsWrua7wdI0TsyjNfoZJrA1RNngv1 LFEwXBi9l4zs0+2SVRJTvM157EWjWjV750Xz7MgwJKFckSaPZQounZ6ZJzfptofdo02xQW 6t56ihrh9jcn1dJ7iEv0vMKVFkjAYRWojqe4vvNjA02/kaCTKyT79I376DB2uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767019795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dx5q8csNEq/KJVfIWSk9XyriJaAxZdccZRHY3SDoaHk=; b=i+ZyYK/JWTtfRysHy6DoHbVHx1X4V1ONaQRoTIFfBvBr53HcFbpHsPQBx5V9z26Mm14hBJ Q1xVgbG2DtEfrCEavjSbVITlMxKWtnAbTVx1mRbrFN9TCVLKc21hEafBxlGmgi5NyfIGGE 3fIWSvZ52FKPXSvhxWlVdWD/7kR+4Kt+gcm+crST9/tRDx9Ct0AIRnWGtHxXTYTIiHSpsS 8ikUg6X9qO1DufTeb6Gxb7Imqg9QWTYuwARfW4vhbhjtFEeC8q/mf7SDvcVy2EJfSw+G00 qJ30NGOfVFM+Wi/5TC+JyKjcEnm2U1cECBXku5uiVJqfbqHsg3uPrdrQ8Gj54Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767019795; a=rsa-sha256; cv=none; b=lq2F8AyMMxhSFw7eR2eTHoYIuuKNYJZfLHTcYs66pWGocjvTMnS4IwrizX5X+gH56NQWq/ YFaGQr6ZhR5LIsl5OCppkIdsIIfqiZezxWHqZrrmLbAuQTMDedzMPk1TFmuo/WIZNIAd1/ uO9T3Fuf1Vwf9uRl/BYhQYIMhJJ0uJRugYREuku2GgUQcXp+WfESN8KWQWmI25yMDOH71N xEbiQgaMr0zfLkgEUic59bk5p4ETgh0OHJ0ayQjCh0ODCi2vKbXT8fMCnKEVtvuxQtUZFY 2sIGBLQLq4OhLdceTsBPKs/mBR+ph2ppBaz9J2Dl57gL1AwuQ0UCMoD3lVSyrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfzdt5GjQz3bL for ; Mon, 29 Dec 2025 14:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 85d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 14:49:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: daef625cf884 - main - bhyve: Use a blocking socket in the helper process List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: daef625cf884dea33d50ad7a0e2da0879a442495 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 14:49:54 +0000 Message-Id: <69529512.85d8.626d8131@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=daef625cf884dea33d50ad7a0e2da0879a442495 commit daef625cf884dea33d50ad7a0e2da0879a442495 Author: Mark Johnston AuthorDate: 2025-12-22 19:12:34 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:49:24 +0000 bhyve: Use a blocking socket in the helper process The send_packet callback does not handle EAGAIN, and on the recv side we already use poll() and MSG_DONTWAIT to implement a non-blocking loop. PR: 291616 Tested by: novel Fixes: 0e62ebd20172 ("bhyve: Move the slirp backend out into a separate process") Differential Revision: https://reviews.freebsd.org/D54340 --- usr.sbin/bhyve/slirp/slirp-helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/bhyve/slirp/slirp-helper.c b/usr.sbin/bhyve/slirp/slirp-helper.c index 06f393aab724..9fb9784662fe 100644 --- a/usr.sbin/bhyve/slirp/slirp-helper.c +++ b/usr.sbin/bhyve/slirp/slirp-helper.c @@ -503,6 +503,8 @@ main(int argc, char **argv) memset(&priv, 0, sizeof(priv)); priv.sock = sd; + if (ioctl(priv.sock, FIONBIO, &(int){0}) == -1) + err(1, "ioctl(FIONBIO)"); if (pipe2(priv.wakeup, O_CLOEXEC | O_NONBLOCK) != 0) err(1, "pipe2"); From nobody Mon Dec 29 15:09:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg04R287Tz6LvVt; Mon, 29 Dec 2025 15:09:27 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg04R0gwZz3vKk; Mon, 29 Dec 2025 15:09:27 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767020967; h=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=L0Pbmpf0+u8M9XX3k4qkpw/BtE20taHYwIxk55qOSGA=; b=JImZ9kEIJbMepqc+rWC+dlUnbAxeswwtfBV3WLcnQwsqTayVuFw5TV1p9t7kFLXAEwC3qR /NecdBOb83FeDNjLrSFPCKzujoPWfIXbgf78HG5Cw/iBMOcj6gIJLKdEy+auG2i6BZKtQm MhBOh7JFSvc3bpQTEx5BHVqS3/kksTcezs4h49LnJGITI7MLhtDhjwH0WTAGWiN20Q4c0P J/qSH71XbHBXz9/3TvmC1z0ZUqqq3hITygO8ZoBf13VBzQJFAzDF/cJslK05MFgNv144md EBkjnZ6RO5zKj1ZoS3eqMFUaB7tHAYfxlh5+NYTVlfyxH0QxPYghovPOOklpjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767020967; h=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=L0Pbmpf0+u8M9XX3k4qkpw/BtE20taHYwIxk55qOSGA=; b=auREVMUe6lZbSsKkIQhmsCgHSgZ5DnNnqZOPF2REhY2JtMOrVqtfubhlY9GQwMjbPTZiC9 xQXfVIh+jXmZh1ED42r2ruoX4dbW6jDfKEAl3nC1m7zx6nf5EkRNvn1d0xu/Mn7L9i/a72 xqH4McfLE6/wkAOKYqiNsAD6QK0knsZn1+MBOlvY9DE6wOmVG4SVzBoJmqkvN09SNJUXRf uuGFSKCDzivMCRJloAd8/wDGpZU5E1SQDRJTJtrzGpmocP8gfApiB6s5cH8uxMbJeNSvq3 Bvd0dbaR5UvxVTakjqrGr0VB3Y2jMSaR6cimT59UYVj9b0Cz01fgFSGsuJlAEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767020967; a=rsa-sha256; cv=none; b=A2GRW7baDbbSKE4DxLykVy1BY/42t2QmbSjOS/mml1BCpGvU1dUtf9vCDeUGq42xbo5ZcM Ei67vFTFRR6qzFynn0LHc1fPnznRiDQMb11MrpnXul/Z/lVElQWM57m2pzQSBdy4FALKCi PMw8dpPfVyodCp7J4hvshac/O/eB/lPRDGPA7uiVeKQq+Y/fmQKe3myZAh3Mqzq0x1crEt Dp1rGVmsoXUboWufBjwKHb3QPsT0wk7D599dVtUk2qIJuuSi+d+WfGU6vpQZNxizipw5Ka iyrVJ2VGlOM4doNJeR8OtAiqBy/eP+N55u8tCVSS93tqQdMZq9sa0nYHem1U+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 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 "tensor.andric.com", Issuer "E7" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dg04Q68MgzNhd; Mon, 29 Dec 2025 15:09:26 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 3040A59BDD; Mon, 29 Dec 2025 16:09:25 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.4\)) Subject: Re: git: faeaa25f5624 - main - kernel: MK_REPRODUCIBLE_PATHS for full paths vs /usr/src From: Dimitry Andric In-Reply-To: <6950e7a3.3b044.1eb2b705@gitrepo.freebsd.org> Date: Mon, 29 Dec 2025 16:09:24 +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: <86EF92B6-B19D-477E-8BBF-2B25190C781C@FreeBSD.org> References: <6950e7a3.3b044.1eb2b705@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3826.700.81.1.4) On 28 Dec 2025, at 09:17, Warner Losh wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dfaeaa25f562493370a5da84b429ab0a1= 17c3213a >=20 > commit faeaa25f562493370a5da84b429ab0a117c3213a > Author: Warner Losh > AuthorDate: 2025-12-28 07:31:05 +0000 > Commit: Warner Losh > CommitDate: 2025-12-28 08:16:39 +0000 >=20 > kernel: MK_REPRODUCIBLE_PATHS for full paths vs /usr/src >=20 > There are many environments that you do not want the paths to be > canonicalized. For example, if I always build a product from a = specific > path in a jail that's dependent on the product version, I don't = want > that to be sanitized to /usr/src because when I have profiling = tools run > against multiple kernels, I can't do A/B testing and results = processing > if everything points to /usr/src (sadly, the profiling tools cannot > remap back to the original like gdb can). Since we need both active = at > the same time, symbloic link fallbacks don't work. >=20 > We do want the rest of the build to be reproducible, however. We'll = get > the same binaries if we rebuild later since we always rebuild with = the > same path. >=20 > Turn them both on for maximum reproduction for environments where = that > cannot be guaranteed. >=20 > Sponsored by: Netflix > Input from: emaste, ivy > Differential Revision: https://reviews.freebsd.org/D52959 This breaks at least the devel/libsysinfo port, which error out with: =3D=3D=3D> Building for libsysinfo-0.0.3_3 make: /usr/share/mk/bsd.debug.mk:19: Variable "MK_REPRODUCIBLE_PATHS" is = undefined in /usr/share/mk/bsd.lib.mk:525 in /wrkdirs/usr/ports/devel/libsysinfo/work/libsysinfo-0.0.3/Makefile:16 make: Fatal errors encountered -- cannot continue make: stopped making "all" in = /wrkdirs/usr/ports/devel/libsysinfo/work/libsysinfo-0.0.3 *** Error code 1 I think bsd.debug.mk should now include src.opts.mk, not only = bsd.opts.mk? Either that, or MK_REPRODUCIBLE_PATHS should be moved to bsd.opts.mk. -Dimitry From nobody Mon Dec 29 16:14:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg1Wc2WmPz6M0ZR for ; Mon, 29 Dec 2025 16:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg1Wc0vbPz41FV for ; Mon, 29 Dec 2025 16:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767024876; h=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=oza9BVGBU5hVi/u8ah9COFLcSVcphN2rXs/4HAJHf8M=; b=BqUD7y0KrG87vB0Ke+lHAMkITDEVLDe44W11xH5rSO8FFqebSkRrDgqSLrAPHHBNqjydgy teudvt7gUuQTU4cL2M3DpSbremcZddr48jWNk29nbWzBugMOmcnIPu98XM6AJznnNJUiJr L3UnX07//FduIRBrYEXUZjCWqTmNDfMs/E/pPFYzzkeYUTPLD2rq9lwaljUyrMrj6mHsan 0E6JBPmsCBHb6wQZzL9GjBNQWQrVni+3HhrOXde9f+Az+sWsG0IqqdkAnS9+WuzZv/IIzf KwcMaI55odGgVqqKGrLNZFKiYdgB6rAhhMty8D5cqFJAYIaStVmq9k6CWEkn8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767024876; h=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=oza9BVGBU5hVi/u8ah9COFLcSVcphN2rXs/4HAJHf8M=; b=B003jfBK1hA1c3RS7u3ELTbcO9HRauWIo8seMcbVBQspCDfLiW6fZNv4I7LYCiMfv2uf4h YxOlglGPfY9eC1kZvOCTdltGA7epaUtFoLuxaW7DxIsJ9nrDQVa1/2CKwROTRaoPGjdHZF 5e7QJMp5LJAa4JgYBsoxyRwm2HZ0vjTzWElMS9CzGXN7HvyauUb/zU/KKha3+QXyS/zsB3 xDAmG8O047Jsj6Bo01+V47A548+MBZPbd6DU43FKfIqtfloVo1Fkbtb8lTIW+3JSRexlC5 X0mxuU8p3YkFPRsCL0Fv0U6OojogS5+/RogxZBBwtXtuprkPjC64DLLjQS9EZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767024876; a=rsa-sha256; cv=none; b=ozOSdygNOsn/g5bd4gr4yEnWjdnf+mrvdQiUE304uhvp3pFY4rkHaTjh9Fu1VwsJ420BQM o9OM0d+KzU8bxTbwf9TFkfZJ0C72XX7RbROQ/On7tOxjrwQW5926TvLJW5SYor09EUVFuG Qho/Ee0nqtfCughAhbJZfwSO23F8wTXf3vA1x8x3Yn4IxOa04z5Ggo/SSIp9baW43eZ+sT gnuwB+p2BSWLnLrKyY1Butpc/xDRe+fYO39KgyYzfix0gZfkPxoT29ZpT+j0NJXmAqIWF4 fuvDgFuhlr+9tdgWrSAxA2MFcrsxq3Iy7YrXs3yVnBOXNnaloYertTg//J8SQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg1Wc0CvVz6J9 for ; Mon, 29 Dec 2025 16:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 211e7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 16:14:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Rupesh Pilania From: Mark Johnston Subject: git: 6ea05372bea5 - main - qat: Export missing symbols in qat_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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ea05372bea5bdb19ca329c27c4c6510cbeed7c8 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 16:14:36 +0000 Message-Id: <6952a8ec.211e7.bc6770e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6ea05372bea5bdb19ca329c27c4c6510cbeed7c8 commit 6ea05372bea5bdb19ca329c27c4c6510cbeed7c8 Author: Rupesh Pilania AuthorDate: 2025-12-29 16:13:48 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 16:13:53 +0000 qat: Export missing symbols in qat_common Some symbols required by dependent modules were missing from qat_common.ko and qat_api.ko, causing load failures when local symbol resolution is disabled. PR: 291271 Reviewed by: zlei, markj Differential Revision: https://reviews.freebsd.org/D54107 --- sys/modules/qat/qat_api/Makefile | 2 +- sys/modules/qat/qat_common/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/qat/qat_api/Makefile b/sys/modules/qat/qat_api/Makefile index 24fbcb46a987..22802c87758d 100644 --- a/sys/modules/qat/qat_api/Makefile +++ b/sys/modules/qat/qat_api/Makefile @@ -84,7 +84,7 @@ opt_qat.h: @echo "#define QAT_DISABLE_SAFE_DC_MODE 1" >> ${.TARGET} .endif .endif - +EXPORT_SYMS=YES .include CWARNFLAGS+= -Wno-cast-qual diff --git a/sys/modules/qat/qat_common/Makefile b/sys/modules/qat/qat_common/Makefile index af8ce86d6be2..541a5da91d40 100644 --- a/sys/modules/qat/qat_common/Makefile +++ b/sys/modules/qat/qat_common/Makefile @@ -40,5 +40,5 @@ opt_qat.h: @echo "#define QAT_DISABLE_SAFE_DC_MODE 1" >> ${.TARGET} .endif .endif - +EXPORT_SYMS=YES .include From nobody Mon Dec 29 16:41:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg26p0fz3z6M29t for ; Mon, 29 Dec 2025 16:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg26n66xgz43ks for ; Mon, 29 Dec 2025 16:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767026497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ULzMq/HU5zXIPyNQv45AOTAUFt/x5ml30BN1EE4+j0=; b=JpUcH5zK8O8t6FoxtDTUOLMDvMdW4PVDMowR/qNd1PDJGic4Ps/X8SPNFwFIz0ZuZNNUy6 BBjKj5LYI0izuFIPwLcRoZI7UDRbkfbL+AS3vag3sV2eJ7KYQXb8BDtmnaAbF8cT9l9FkK JFUtzxMzgj0OYHltGnQusdjSlG5hu/58SUunkP0doJJDfHFfVPhp9eVlNbkJbb/ayWUFoZ BlISc3KWGEv2Wq6hdMtDabtGqsj6Yj5wim7gtE3mEXwXN8hSaHr3f1QL1PN8AVAXdWa9NZ W+YqNBHMz8MiwjIsiebT98C3EgTgMdA4qjWZFHU28C6/xhvwL1gXn82RC25GPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767026497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ULzMq/HU5zXIPyNQv45AOTAUFt/x5ml30BN1EE4+j0=; b=J/vZ04EvLLEPdnQt1YaVey6Pbx8ahSkRcLYHwfsPX6Fo2pfLfU5iRhNt2Za2Lkk3bRShMD geYwU+DtbjjwXYHDC10M4Nuo+GCG+4J/J75k+DeOaUcCKfuSnmlvY0JVcX8O7GWqqa+zQ7 TOPyhIvdp9o9wSs/Z3oWt4+s9CfdozKPrixKc2+OJucZ8L/1bR04L90ua+1vwR89lqLBwz QunShN+zuPaKvIJWPcil6/5CeHv9OXnN98mT0cw4gl+qYJWVZSRePiyJAxHsd2AJzz7KJA bHVvPz4oBWuC574gtTVEEX+dfBDC1BMP6nsGzmUkgKbAJy95GcLWOzDVHZriQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767026497; a=rsa-sha256; cv=none; b=U7NzuMgc6wooqfTq1vEAjAyJFtIPtf9fhclejDSv8Ch0hb/xB0in4gwoE5SaO2aHavJS7z jbExcn9u/cQ2N90Bx2v0A5zZiMKloWckA6pCr1ZhPZqOYa/uofq0CxZ14z+5aub81j/wjs SZW1l8JeWW0ae71LhzaVZo9M8yuwaS+c3KMB9U+EfJPPCuxctnjXmnRdOkOIFUhaHSJU0D UoQviIHgINKPKKOvvPpubN2hLoM4qU4MtmFSKokESqsvHm+mKN25BPz2D/AYrkq8uGYpS0 LzJnfL+NS423hPXTs2kCkaYrMht5Ip4Agg5oG3F+HljqwkVdwFZ5446A/Iy/pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg26n5gDtz709 for ; Mon, 29 Dec 2025 16:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 248a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 16:41:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3e2093de4725 - main - linux: Add required symbol to EXPORT_SYMS 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e2093de47251de5e6e61c08d2955251137afd01 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 16:41:32 +0000 Message-Id: <6952af3c.248a4.598e824@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3e2093de47251de5e6e61c08d2955251137afd01 commit 3e2093de47251de5e6e61c08d2955251137afd01 Author: Ed Maste AuthorDate: 2025-11-28 21:25:26 +0000 Commit: Ed Maste CommitDate: 2025-12-29 16:39:28 +0000 linux: Add required symbol to EXPORT_SYMS list PR: 291270 --- sys/modules/linux/Makefile | 1 + sys/modules/linux_common/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index eb4e17ec706b..8904e8005416 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -76,6 +76,7 @@ SRCS+= imgact_linux.c \ .if ${MACHINE_CPUARCH} == "i386" EXPORT_SYMS= +EXPORT_SYMS+= linux_device_register_handler EXPORT_SYMS+= linux_get_osname EXPORT_SYMS+= linux_get_osrelease EXPORT_SYMS+= linux_ioctl_register_handler diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 291fc6d25f8c..1fa740b8b823 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -13,6 +13,7 @@ SRCS+= linux_x86.c linux_vdso_selector_x86.c .endif EXPORT_SYMS= +EXPORT_SYMS+= linux_device_register_handler EXPORT_SYMS+= linux_get_osname EXPORT_SYMS+= linux_get_osrelease From nobody Mon Dec 29 17:19:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yC5w3Gz6M4Zj for ; Mon, 29 Dec 2025 17:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2yC3PHnz3C7g for ; Mon, 29 Dec 2025 17:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gbHP/CyaSGp0g+z6RMMu6EET/+FtmkGf1I4APg2ZRg=; b=qpKCMsfC/L2H32faDVvwL5JDR2MyMoxPoB6quWm0Jv4++r499uu5tGWCYoSBbUN3T/0FEc lAiZxhKUcfsiBpQ/LbHsmKpFz/yJAAL9kf0vTX+RHPq+SyFMO+oFc6i3GUv3lSsj9ksKqB GJhlp/UtN93N+eiOLpYWhOLeB8o3i0mE7vghPRu4/wOYRhZaAHsTSJj2/bV3mlnCUGPKpH 7T+MORKIldZfO1U2QVZsyam0YR8uJFxYWia597uQxgvdH7yhMAoo1Pp7oTVAijjOOLxnoG rzF27Ivt2MKvcu8ckVURBrmY8pd22YxHJq84m5FEg4aJINKhz/dsZPLY8x3MPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gbHP/CyaSGp0g+z6RMMu6EET/+FtmkGf1I4APg2ZRg=; b=JbJ4jsRkE5GWYypHyWIggVAUB226Tdc4vEXFA5y9tHjka3n5ze6T4VgI9X+dtpCEP9zG7j TnvLVZWfneP95C7n+fCc/DZUQ8rM5pEmdioV7II88EoEGAciptkohTsPUOPDYYP3KZyaYe Ywv6oq/eJvMhWeNx7SB+DsKo+KApCv8VBjGwIxt4AUQk+J1rXsZtTTXUIuMnyRdImxDsW+ ebtXN6Ym5BX4v2nj1mMoTBE0ibTWgeriZz+TFVAnOGtBEYXE8+weR4DOP+pt/uLT4idNmW ccKY2Hb8McfXGF6KHPuVFIUzCM0EOWrHh7111qfsPK26aUkYpMaBWIAlO23sww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028755; a=rsa-sha256; cv=none; b=UQaDxck2xZwG5JukWjVHdeGoMHDvGHhO+No3XGWADNi6jIknyZyiJFD0YOco7bVghzpZGu RyRtQMGIqHWvfpr+h8rmqZBfBTLXbFS+ZoQFdeKctLmF3cf6E0Psz/HH3J55PPfbWTrxsh Rqrs6aH5PvOop72oENibH0tlMbwY3NFBFNWQKk4kc0IGIUpkhboQFunqTvPaZ4nZYoUkBE bZpcKkycx9Qo+3SoZYCYKKHwCLumF4Mu0KdRjSurQKKjGFmgNW1V57y0oySvrs8RRAt+rA 7NkIqrj7ux6g93Q+4cOntWop9D5tuJXX6m9fxjR7dy7nnauwqFqA1icriie3Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yC1n9Vz879 for ; Mon, 29 Dec 2025 17:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 264b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:19:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 04a664d87607 - main - libc/stdlib/Makefile: one line for each source file name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 04a664d87607d25d87baf56903090707cc91e2e0 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:19:15 +0000 Message-Id: <6952b813.264b6.4544022c@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=04a664d87607d25d87baf56903090707cc91e2e0 commit 04a664d87607d25d87baf56903090707cc91e2e0 Author: Konstantin Belousov AuthorDate: 2025-12-25 23:36:48 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 17:18:55 +0000 libc/stdlib/Makefile: one line for each source file name Reviewed by: alc, emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54365 --- lib/libc/stdlib/Makefile.inc | 82 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 69 insertions(+), 13 deletions(-) diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index b878a7625e9f..37a927b0597b 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -1,19 +1,75 @@ # machine-independent stdlib sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib ${LIBC_SRCTOP}/stdlib -MISRCS+=C99_Exit.c a64l.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ - bsearch.c bsearch_b.c \ - cxa_thread_atexit.c cxa_thread_atexit_impl.c \ - div.c exit.c getenv.c getopt.c getopt_long.c \ - getsubopt.c hcreate.c hcreate_r.c hdestroy_r.c heapsort.c heapsort_b.c \ - hsearch_r.c imaxabs.c imaxdiv.c \ - insque.c l64a.c labs.c ldiv.c llabs.c lldiv.c lsearch.c memalignment.c \ - merge.c mergesort_b.c ptsname.c qsort.c qsort_r.c qsort_r_compat.c \ - qsort_s.c quick_exit.c radixsort.c rand.c \ - random.c reallocarray.c reallocf.c realpath.c recallocarray.c remque.c \ - set_constraint_handler_s.c strfmon.c strtoimax.c \ - strtol.c strtold.c strtoll.c strtoq.c strtoul.c strtonum.c strtoull.c \ - strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c +MISRCS+= \ + C99_Exit.c \ + a64l.c \ + abort.c \ + abs.c \ + atexit.c \ + atof.c \ + atoi.c \ + atol.c \ + atoll.c \ + bsearch.c \ + bsearch_b.c \ + cxa_thread_atexit.c \ + cxa_thread_atexit_impl.c \ + div.c \ + exit.c \ + getenv.c \ + getopt.c \ + getopt_long.c \ + getsubopt.c \ + hcreate.c \ + hcreate_r.c \ + hdestroy_r.c \ + heapsort.c \ + heapsort_b.c \ + hsearch_r.c \ + imaxabs.c \ + imaxdiv.c \ + insque.c \ + l64a.c \ + labs.c \ + ldiv.c \ + llabs.c \ + lldiv.c \ + lsearch.c \ + memalignment.c \ + merge.c \ + mergesort_b.c \ + ptsname.c \ + qsort.c \ + qsort_r.c \ + qsort_r_compat.c \ + qsort_s.c \ + quick_exit.c \ + radixsort.c \ + rand.c \ + random.c \ + reallocarray.c \ + reallocf.c \ + realpath.c \ + recallocarray.c \ + remque.c \ + set_constraint_handler_s.c \ + strfmon.c \ + strtoimax.c \ + strtol.c \ + strtold.c \ + strtoll.c \ + strtoq.c \ + strtoul.c \ + strtonum.c \ + strtoull.c \ + strtoumax.c \ + strtouq.c \ + system.c \ + tdelete.c \ + tfind.c \ + tsearch.c \ + twalk.c CFLAGS.qsort.c+= -Wsign-compare From nobody Mon Dec 29 17:19:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yD5gh8z6M4g0 for ; Mon, 29 Dec 2025 17:19: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2yD2BTPz3C9x for ; Mon, 29 Dec 2025 17:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mib+1ecjjZeZ9DO4KXLJPZDK8GXq81ivnQARm1+QKmE=; b=jdqfwXsJuIVLUet0EzvdMhZ4e2WM3GnOVaJslhDmJaC5sm6kdDdjmsbZI7zTuhUNxeK7CC 64N0sZX0GZXS8u6Y4wCQoc2cD9yt3h1+NZLDq1Li0r2OraYQeBGhHjoDE/reR38Ojp8hMF 4OY94231ObxRi5DF2hbnMoq6Nem9khrPVs29h9mIgVi5lfOX61LoSRwzz3l7ZNTGpuj/+e UgUy3gcPNQcHtQ9FHNo3rxZeuGtE+eXL6MczUIPlslBnxvExBTI3irX+3DXNJT7DpRlbrt Mvmn26cffSVPs0Jzau7EikvD9Pux75TjvoimjhLUUTkV1Z/c/bCdURdLs7o7fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mib+1ecjjZeZ9DO4KXLJPZDK8GXq81ivnQARm1+QKmE=; b=cv50X66W+0AwnPH9A/T2fgB0WsdIVBXkC2m+tNTcgfIfcpeRjaVq+evMXebzA1Llfs0kLy zgyQG0Scj9XF8UX3vsKMMU0AAcHF0WY3vKkNBvBWf4CCw+79SuzW0M47VqxKlTJICPas3d dVjOgnOxADhz9uGVeNaE78st4zJbGu6Fj4J/iJeiI2Fqg01GfHkYRx7M2gumq8RDC1Yb+y 9ejXB9X0/+500qdTLFtFDSONV+UNu9IJ6Zpndjx3+VWPMUFCOiC8+rQA8W6V88CQ55a2wc JRNQIY8MJr4iMqUbxNIXnXYwvCzH5AYbZc4Hb9HAuIgacPGCjII74cUFq4SGRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028756; a=rsa-sha256; cv=none; b=g7lk4Ocjdl6xwq+E9rz+3B7sJiADArW3+/qOpaPJUBGaIVzkZFxtZViyBzKNbvnlu0nLLD Cbd7qlCOxnL8Qo03kMM2ilodhc5Hl9Edsiv0w/aOrAuQF7D3HGSGc50fP50Xpl0oO05+z7 KrSLvAwfa4imueVmkszagvs2ucjuA9jqSD3aKfv/eXnjZDGbKsffMzt7WMu5gBxvXCatd/ gwoxVs+7DWGFALLbxOyj/wz5r+5HcG86MIw/jlZ8EQy0AXv+NemOfzotP9MoQLK4TfL3vl H+IYaJjpcPiaYs68kBGO0Cew5GvQ/l2thyNMFoJ2N1GwvGiL0PPNCVC35AQpwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yD1WZhz84n for ; Mon, 29 Dec 2025 17:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30207 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:19:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b8c99e7d912f - main - libc: add glibc-compatible tdestroy(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: b8c99e7d912f0dad84cec80f8c4331646b87a3ec Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:19:16 +0000 Message-Id: <6952b814.30207.47661323@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b8c99e7d912f0dad84cec80f8c4331646b87a3ec commit b8c99e7d912f0dad84cec80f8c4331646b87a3ec Author: Konstantin Belousov AuthorDate: 2025-12-25 23:38:25 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 17:18:55 +0000 libc: add glibc-compatible tdestroy(3) The function clears the whole tree. Relnotes: yes Reviewed by: alc, emaste Discussed with: dougm Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54365 --- include/search.h | 1 + lib/libc/stdlib/Makefile.inc | 1 + lib/libc/stdlib/Symbol.map | 1 + lib/libc/stdlib/tdestroy.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+) diff --git a/include/search.h b/include/search.h index 0615da2b42ba..5ac25a0d491f 100644 --- a/include/search.h +++ b/include/search.h @@ -77,6 +77,7 @@ void twalk(const posix_tnode *, void (*)(const posix_tnode *, VISIT, int)); int hcreate_r(size_t, struct hsearch_data *); void hdestroy_r(struct hsearch_data *); int hsearch_r(ENTRY, ACTION, ENTRY **, struct hsearch_data *); +void tdestroy(void *, void (*)(void *)); #endif __END_DECLS diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 37a927b0597b..e46a8d7340b2 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -67,6 +67,7 @@ MISRCS+= \ strtouq.c \ system.c \ tdelete.c \ + tdestroy.c \ tfind.c \ tsearch.c \ twalk.c diff --git a/lib/libc/stdlib/Symbol.map b/lib/libc/stdlib/Symbol.map index 8b7e97c3cbdc..03a6d0b543ac 100644 --- a/lib/libc/stdlib/Symbol.map +++ b/lib/libc/stdlib/Symbol.map @@ -134,6 +134,7 @@ FBSD_1.8 { FBSD_1.9 { memalignment; recallocarray; + tdestroy; }; FBSDprivate_1.0 { diff --git a/lib/libc/stdlib/tdestroy.c b/lib/libc/stdlib/tdestroy.c new file mode 100644 index 000000000000..c324e151da11 --- /dev/null +++ b/lib/libc/stdlib/tdestroy.c @@ -0,0 +1,68 @@ +/* + * Copyright 2025 The FreeBSD Foundation + * + * SPDX-License-Identifier: BSD-2-Clause + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#define _SEARCH_PRIVATE +#include +#include + +static void +nul_node_free(void *node __unused) +{ +} + +/* Find the leftmost node. */ +static posix_tnode * +tdestroy_find_leftmost(posix_tnode *tn) +{ + while (tn->llink != NULL) + tn = tn->llink; + return (tn); +} + +/* + * This algorithm for non-recursive non-allocating destruction of the tree + * is described in + * https://codegolf.stackexchange.com/questions/478/free-a-binary-tree/489#489P + * and in https://devblogs.microsoft.com/oldnewthing/20251107-00/?p=111774. + */ +void +tdestroy(void *rootp, void (*node_free)(void *)) +{ + posix_tnode *tn, *tn_leftmost, *xtn; + + tn = rootp; + if (tn == NULL) + return; + if (node_free == NULL) + node_free = nul_node_free; + tn_leftmost = tn; + + while (tn != NULL) { + /* + * Make the right subtree the left subtree of the + * leftmost node, and recalculate the leftmost. + */ + tn_leftmost = tdestroy_find_leftmost(tn_leftmost); + if (tn->rlink != NULL) { + tn_leftmost->llink = tn->rlink; + tn_leftmost = tn_leftmost->llink; + } + + /* + * At this point, all children of tn have been + * arranged to be reachable via tn->left. We can + * safely delete the current node and advance to its + * left child as the new root. + */ + xtn = tn->llink; + node_free(tn->key); + free(tn); + tn = xtn; + } +} From nobody Mon Dec 29 17:19:17 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yF4V2Bz6M4Zl for ; Mon, 29 Dec 2025 17:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2yF2Wblz3CGf for ; Mon, 29 Dec 2025 17:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nqOZDNPpSU/VpK88IKcaFCyPvBDnV2d10mty0ucfYlM=; b=YhQg4p16xwcS6G6ZNV2y2RyMci7NfVJP4Cl2Hf40xxNNSVf0VnvZcg5Fnb0GvSNQpWuLwI ze1+OIsDOPDPHr84MWbH6RXybIJ8dNiUdv1a8Wxth9OsxZGSAN2mSe7qqpFjEwgtqazTz5 Eo+JluYHIDm2PN8Kf/FmyJwgFWLLCSBfzYW+6QQMmHPiJzusf3OuJqVn/Uh0eVxrHOHlb8 4cmiDvvfcYAXmqFakYMIu2K/83BngK9zixIB4Awhv+h+El4p7FdEgERvqi7R/AyXa/KFg1 +b46JLOu7inci9fuHq6TC8y5dqcQoJKTpCUe5Y4fijG8XwqSRhLnkFUrsZxMLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nqOZDNPpSU/VpK88IKcaFCyPvBDnV2d10mty0ucfYlM=; b=ROqKamEPEBChNzd6lry9exG4mS3scJMSYp2xrZE9rWsrGnJpqfCHPpE87pgO8ZJ/A+/QFl NGholKgYHCv8R25tlDpHWM/bWk5B8BPab4s6ywvzWRjSa9U896pz6ALZuSkWZ4dczxdTod +4elTot+e7rriraCUKwP7oT24KJ0fmoWX7OgROB7yGt7UOSTCm2o62iZFw3LtPccORb8m3 eavbdgiCY7VYRiFwx3LNKNUugX/B7jhXuoT2ulHGB53YIpdSgQTuhyQRRtnAvz+pOuDM1q 7VDnoS1cv5YrXwa/VX1OtTe/1DrknAvmqMzqAH4/5JPIPmZsGCA3KrP1FT3fFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028757; a=rsa-sha256; cv=none; b=fcYFidg9zyN5Q1+mHS7UG7pY8QQSpEl2jzlx/arn5hCt0/sBQ8UTltBE6lmmwePOeMpR2T QbDttyHeS0kYbo4bRS+a6cx7IPXDQHbp9GmLk8Q7/aE/1WNMne7585wJgxjRNjuJbxFSwF tV0yYyB0yN/Q2MFP38yFnfYQuG+scqCnBrnEUX8qbOicpkeglbpN12UpgnLUHuT8XzbR5a vcXWpKfQXQKVXHvF2aX8NSuJpxppn/jB7yUxN/egpAtoGDALJI0A/NIR3WurFbtvejfux1 TaZmLPFu9SN3lPFbzJKQB+wZOstkLvG1OyJDEd7sppbAznPQ+UKHNV5BP5f/6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yF1vx7z7hS for ; Mon, 29 Dec 2025 17:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2630f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:19:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b0d4b059cf84 - main - tdestroy(3) man 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0d4b059cf8425cbe094f93362a61c56a26d45f3 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:19:17 +0000 Message-Id: <6952b815.2630f.5f78ec2a@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b0d4b059cf8425cbe094f93362a61c56a26d45f3 commit b0d4b059cf8425cbe094f93362a61c56a26d45f3 Author: Konstantin Belousov AuthorDate: 2025-12-26 18:27:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 17:18:55 +0000 tdestroy(3) man page Reviewed by: alc, emaste, ziaee Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54365 --- lib/libc/stdlib/Makefile.inc | 3 ++- lib/libc/stdlib/tsearch.3 | 25 +++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index e46a8d7340b2..c311ba3d2bcc 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -147,4 +147,5 @@ MLINKS+=strtoul.3 strtoull.3 \ strtoul.3 strtoumax.3 MLINKS+=tsearch.3 tdelete.3 \ tsearch.3 tfind.3 \ - tsearch.3 twalk.3 + tsearch.3 twalk.3 \ + tsearch.3 tdestroy.3 diff --git a/lib/libc/stdlib/tsearch.3 b/lib/libc/stdlib/tsearch.3 index edee01cafc52..f412c37a4ef0 100644 --- a/lib/libc/stdlib/tsearch.3 +++ b/lib/libc/stdlib/tsearch.3 @@ -36,6 +36,7 @@ .In search.h .Ft void * .Fn tdelete "const void * restrict key" "posix_tnode ** restrict rootp" "int (*compar) (const void *, const void *)" +.Fn tdestroy "posix_tnode *root" "(void (*node_free)(void *)" .Ft posix_tnode * .Fn tfind "const void *key" "posix_tnode * const *rootp" "int (*compar) (const void *, const void *)" .Ft posix_tnode * @@ -45,6 +46,7 @@ .Sh DESCRIPTION The .Fn tdelete , +.Fn tdestroy , .Fn tfind , .Fn tsearch , and @@ -95,6 +97,13 @@ If the node to be deleted is the root of the binary search tree, will be adjusted. .Pp The +.Fn tdestroy +function destroys the whole search tree, freeing all allocated nodes. +If tree keys need special handling on free, the +.Fa node_free +function can be provided, which is called on each key. +.Pp +The .Fn twalk function walks the binary search tree rooted in @@ -128,7 +137,9 @@ is NULL or the datum cannot be found. .Pp The .Fn twalk -function returns no value. +and +.Fn tdestroy +functions return no value. .Sh EXAMPLES This example uses .Fn tsearch @@ -184,6 +195,7 @@ main(void) tdelete(four, &root, comp); twalk(root, printwalk); + tdestroy(root, NULL); return 0; } .Ed @@ -192,8 +204,17 @@ main(void) .Xr hsearch 3 , .Xr lsearch 3 .Sh STANDARDS -These functions conform to +These +.Fn tdelete , +.Fn tfind , +.Fn tsearch , +and +.Fn twalk +functions conform to .St -p1003.1-2008 . +The +.Fn tdestroy +function is the glibc extension. .Pp The .Fa posix_tnode From nobody Mon Dec 29 17:19:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yH20Djz6M4cY for ; Mon, 29 Dec 2025 17:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2yG3PfWz3C7n for ; Mon, 29 Dec 2025 17:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KO+7Mx+9Gw+UFedDZflnSy4r60CY2pTNnQMij5GS2u4=; b=fs/qnQm07uCJ/5qLZY7Rh47FBiwZcXtLjZPByiWyJd3rZkGHVrL+iHFC4XRHLCPaQONIoo JTndARoT3aMTkjplgMJDl42y5kHgGWmh6QtFv1BUAT3iSDpGxtZ4sStR3Otn362s97y5RN He+IF9OR0wzjziYzGxgqEGq4lsqxbE4zGL3FnsW1f6JUWyo6Uazv/qT+W4wH2qDh0mDssP +hixI4KyLhDKzXg6zxjAWf2pbZ4UXheIetE48ZvGU+8/8Pcx72HCA8xGDvLY0L2RNSMIUX NyBEkbd87tecsFEQbalLij+EZMw0M5Q4lb7XJLL5wotCkOFf0bENZUWGTVkGGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KO+7Mx+9Gw+UFedDZflnSy4r60CY2pTNnQMij5GS2u4=; b=ZV0SAPIZ6H5+ySpAw/bC1JRn7oV+b/7NZkOtTMTGWPtUNtCA56grL077lixsSTrMnfh7r7 d8Fumg8QIwYfRIOelr7jWewZcRGsanSWY9FwDZQGtyG4WhpnYk+6Sktom7HU+rDr/ljdfi 4SO0KjhfxgrlO+Ftt+0JCQJtohC4oYRTaoVDJQnSVJ4dt/u19HNBTmCvvDiLPoOui/sJFt jIpCQ/cahPPhZ3XjXg2zmUzOm6e5AOJs4oYsQ0IzYALDI2tCoigFVQv7jn6l9BhweaSLI2 t5IRw4fAal6fli3i79mLHz2i42XxV5xGEWjHbpii1cnjGWsjW8PdWryEbXIl3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028758; a=rsa-sha256; cv=none; b=OvWOvgrX0ob/eDDgMfCD6k4kVrZijvqx7h/7xtPX/cLWVx/H22U3umC480VpRvifUibOMQ fSamqCIMHaQsPA7/t1ayZXgxhp4Tw3Q9pTsnlUXysQ3t6VCxJLzzkl4MzEEFpbZStXRR3G Ltx8VN1uHh6aLXQ6zufcLGeFRt9xxJp8zqHub2m3X9xeyv0pVSZYdggm+7D4kNjIcPqQZ/ 1crrI+aSlLrb31Kt4v+qBWxyvyxe62Nw2nevY5ojN+QlBQ7VB60+EspOikwMx3jb+5ugym zxVbPiZ/OUW/+czOjI8a2JzrMi8fYTmf4NU0zkrtOMeR8Yt2WJmjHnPrmq4Dag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2yG2fmlz87B for ; Mon, 29 Dec 2025 17:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26561 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:19:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3204c097fd08 - main - tdestroy(3): add 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3204c097fd08436805f059c0d7f676d29ee9bb62 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:19:18 +0000 Message-Id: <6952b816.26561.773af449@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3204c097fd08436805f059c0d7f676d29ee9bb62 commit 3204c097fd08436805f059c0d7f676d29ee9bb62 Author: Konstantin Belousov AuthorDate: 2025-12-26 22:00:09 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 17:18:55 +0000 tdestroy(3): add tests Reviewed by: alc, emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54365 --- lib/libc/tests/stdlib/tsearch_test.c | 65 ++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/lib/libc/tests/stdlib/tsearch_test.c b/lib/libc/tests/stdlib/tsearch_test.c index ee9deec588cb..f42729e5e75c 100644 --- a/lib/libc/tests/stdlib/tsearch_test.c +++ b/lib/libc/tests/stdlib/tsearch_test.c @@ -147,10 +147,75 @@ ATF_TC_BODY(tsearch_test, tc) ATF_CHECK_EQ(NULL, root); } +static int nodes; + +struct my_data { + int key; +}; + +static struct my_data * +new_my_data(int key) +{ + struct my_data *res; + + res = malloc(sizeof(struct my_data)); + res->key = key; + nodes++; + return (res); +} + +void +free_my_data(void *mdp) +{ + free(mdp); + nodes--; +} + +static int +compare_my_data(const void *mdp1, const void *mdp2) +{ + const struct my_data *md1, *md2; + + md1 = mdp1; + md2 = mdp2; + + return (md1->key - md2->key); +} + +static posix_tnode *root = NULL; + +static void +insert(int x) +{ + struct my_data *md; + + md = new_my_data(x); + tsearch(md, &root, compare_my_data); +} + +ATF_TC_WITHOUT_HEAD(tdestroy_test); +ATF_TC_BODY(tdestroy_test, tc) +{ + root = NULL; + insert(1); + insert(100); + insert(1000); + insert(5); + insert(6); + insert(12); + insert(2000); + insert(3); + + ATF_CHECK_EQ(8, nodes); + tdestroy(root, free_my_data); + ATF_CHECK_EQ(0, nodes); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, tsearch_test); + ATF_TP_ADD_TC(tp, tdestroy_test); return (atf_no_error()); } From nobody Mon Dec 29 18:40:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg4m34x1mz6M9sc for ; Mon, 29 Dec 2025 18:40: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg4m342yfz3QQ5 for ; Mon, 29 Dec 2025 18:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zlt8f4HT/Q5rI2XS2O5tJppnsSvsghdq3/EVXb7O0Tc=; b=qo69aRN4AGXZH8SvUOtR/vOyEen/rxXk9aJkvXKWBPThq2lI9+0oeGVfHfN5aCp2nyd0Sf AQMfkLTmELjArJyxUj4f7+DAZallBhtf5QYfD5UsBF4eIQKm3RyozPOQ2kFWT6u//Klyux 5D62KIXAdigFlHBT5dr48lQJZaSMQxnAuprpVzbk7bsTSSdnS+9fBDMm12qRIENsQDDuPl ko97KKWNl4bYGnyHXI/k7Y28mRR1auN9cboFTtVElbb1aqHGnpVTiWdwhqsvSkj5f/bgEC Ph6/726aih273R3sU5uxeV3QSr+Jl1bN+E6kOakZJyoYVeQVisIGET81WnqUrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zlt8f4HT/Q5rI2XS2O5tJppnsSvsghdq3/EVXb7O0Tc=; b=CdJ8QevOPFDnouglxVNdf1z0xWUtW/2U70r0bHv1m7sGRm0b5fNo+MLvr5Uy8Ad1q8g2FR lVY/nOJ7Kpx3KOyeUSQFWpZhtDZIeNE8ov0E2EGvNjZgz7vMVBawknXybHv3SuHji+sxq9 yETQsAI+l7dEruidf2mZEJMFPM5Q4+OvXO1jNV7qT3bHDD69ZVKIPGT5fGjnx9zpTgEWDK N5hW7/TJ9cna8DoWiWgojs3d3g5MyCtDkR9MC905w4FQEmUvab1uhZgkhRw7Ij+9KQp/sH vBGmXao54tNOAh7eC5v/IwnLg1XbneQp/kfofthY4FXqfmfzHncZ5lLjFN4ipA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767033635; a=rsa-sha256; cv=none; b=D51SpSuYy4Axf2sxWkQkNV2Mwk3fj7Z9Buy1xh4Un3B9XuvAf0U5p/IsOowvzWyula9JiF Fr/biqcI3S39bh7WV6yJ0qtNcpp2K3LfREj65Or6XR2k8HiN7xgWc3dZxoe3GdzEJG4O9V 2eZuQiObv7dZaZh3hArZGwYAPde6wPX23ugFBxJtewtF9/9RLya4IYcgZn0RE77lnof88K SwRiY/iw8vq8tFfwtdhh3Bc5fDcF3yhlxHEGhXLOX5Bin+JGBFKBgvZRuBh5WN+CY75AeY 3Hv1qVGC/xp7IkXxWmI/dvq0Fy4pndvk4s17YiwcaECcghUyQbN/mZdBeBUj/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg4m33XZczB51 for ; Mon, 29 Dec 2025 18:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38638 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:40:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: c4bd487da73a - main - genet.4: Only for AArch64 + tag spdx List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: c4bd487da73a28887f86750a5dc5832303592c5a Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:40:35 +0000 Message-Id: <6952cb23.38638.11c27510@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c4bd487da73a28887f86750a5dc5832303592c5a commit c4bd487da73a28887f86750a5dc5832303592c5a Author: Alexander Ziaee AuthorDate: 2025-12-29 17:16:37 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-29 17:20:05 +0000 genet.4: Only for AArch64 + tag spdx MFC after: 3 days --- share/man/man4/genet.4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/man/man4/genet.4 b/share/man/man4/genet.4 index 665aaff49507..1de92294ee9d 100644 --- a/share/man/man4/genet.4 +++ b/share/man/man4/genet.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2021 Michael J. Karels .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd December 8, 2021 -.Dt GENET 4 +.Dt GENET 4 aarch64 .Os .Sh NAME .Nm genet From nobody Mon Dec 29 18:40:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg4m51Gpsz6M9ng for ; Mon, 29 Dec 2025 18:40: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg4m44Nbvz3QS6 for ; Mon, 29 Dec 2025 18:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vr5aB+p5NEh4nmhgsVQbKqKFNfxF8ByS4/7GQ97LfOM=; b=huNUbcwu+VyK09E1V8SXIo4yu11cae0M2CkYelRRMepiwxl/MvBQ+eMS379nvMojGnZiLd rfsfJmtomzhWCUSGReLATkxwxtYuztOKXauU8HxNOG0xB+mG2F4qA8byUG0DfxpznQ6hcR gbxuhuElgkvGRT3d/L8fEcuCWIllpr8CuiGhCAZ02DZOqzv8earByZdTq7pBIQH2OHB6ra w6FPmc15G+45JUqRASlsz7LU2fm/tgjFC81kBNqnK4z+yg48FW5Dlrkpe0yJ8gVE2vh3CY NqLXI9ToNm6VDZ1ygq5yfsBGHvE8I1JZ3aYtAfHwBtUFj2FOVu+jJZIptfzP1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767033636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vr5aB+p5NEh4nmhgsVQbKqKFNfxF8ByS4/7GQ97LfOM=; b=op7QNCND/TkPzjVfEedds8Bx64b1cvTu884hp3N6Nmr2KNscLdJFMkvw8O7c+NqlqOXI0X Etulpy9K4q4/Yv1oHBwYbpWC1OiYm/VPRAGauw15Z1MHHX2hsoPKHUgpLV74qTNPG0azRF Urj36uQugYDZFfBXIpw3KslgsZ0XTPlYUoed9LeftppGUAzKp3SDXJlF2pKZSpR9T0spNp 6NLOa4dhr3AzIS+SlDnkdO6ZW9pIgJqRWSOKTgyC6OoH1+T7cCJzJrTPPgbSIWuFQlICYL Qs3WEXhwBifjqKGfuMw6gAwHNPtVEqTJbewxEhcbFAPEMHu5YL3TTM/sYrzdqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767033636; a=rsa-sha256; cv=none; b=Ery4zJnhCID3m7npzJYhUGCpF76jMKkh1CvFjjPELB50Jym6YEx1e+RyZD75US98zb95/F K3kG8jtyLM+C4t6P7DkTLcR/u9Ppvuhny/dZHqHGeDjlVXUKA2Oh8qkQHUjPtn/kUps6bi hn7gaURpVWUnavhM5HQFGzxHiPbdEi7YN+qhJEqssRad1QkDanJoZu9DkV0wXnUuMSRwNA HMdY5rxzwaEGsEuIsjnfFRNlyCZIAGVMvucegd+t4bVa4qqmsuHiiGzt6+30BOX++DD1pD f60cqxW0luBgK9jlU6PCjFBBMemJrO1FHDeKVN56FYgxfwyC6M1oztIMhG7rGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg4m43qHNzBG8 for ; Mon, 29 Dec 2025 18:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 384bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 18:40:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: c6bd2aa8353c - main - cpuctl.4: Formatting nits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6bd2aa8353c6c34dbff487132a7f7372752d0ad Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 18:40:36 +0000 Message-Id: <6952cb24.384bb.23e57d15@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c6bd2aa8353c6c34dbff487132a7f7372752d0ad commit c6bd2aa8353c6c34dbff487132a7f7372752d0ad Author: Alexander Ziaee AuthorDate: 2025-12-29 17:17:09 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-29 17:20:05 +0000 cpuctl.4: Formatting nits + Align ioctl list + Pad code examples + Tag spdx license identifier MFC after: 3 days --- share/man/man4/cpuctl.4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man4/cpuctl.4 b/share/man/man4/cpuctl.4 index fc42cf14f254..5846fc4129f8 100644 --- a/share/man/man4/cpuctl.4 +++ b/share/man/man4/cpuctl.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2006-2008 Stanislav Sedov .\" All rights reserved. .\" @@ -63,7 +66,7 @@ All of the supported operations are invoked using the .Xr ioctl 2 system call. Currently, the following ioctls are defined: -.Bl -tag -width CPUCTL_CPUID_COUNT +.Bl -tag -width indent .It Dv CPUCTL_RDMSR Fa cpuctl_msr_args_t *args .It Dv CPUCTL_WRMSR Fa cpuctl_msr_args_t *args Read/write CPU machine specific register. @@ -92,6 +95,7 @@ typedef struct { uint32_t data[4]; } cpuctl_cpuid_args_t; .Ed +.Pp It is equivalent to the .Dv CPUCTL_CPUID_COUNT request with @@ -107,6 +111,7 @@ typedef struct { uint32_t data[4]; } cpuctl_cpuid_count_args_t; .Ed +.Pp The .Va level field indicates the CPUID level to retrieve, From nobody Mon Dec 29 19:27:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg5pZ1f2gz6MDZZ for ; Mon, 29 Dec 2025 19:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg5pZ0Wb2z3Y0R for ; Mon, 29 Dec 2025 19:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767036470; h=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=2BEdJltC6ahLh9yMLLdrzisPRrW8kXrfJ89MaH5p/NA=; b=buwnfo6Z1+dhvpJLqAJMEY/0dztip+iWFI+MUlre+BayHzEWmNC166Gb0AQR4BDaZ9Q/W6 J8kMJXUjD7ikIaXthXkVePbxm/I87MCdHXEeWsMr9C+ut61zharPefIR6Zma8kpbQSgtyJ eOLhg4jSvOEoX9Nkyl+hKJOrd3sGEW1aIAJFA6gnW0TY+YmvBQXIf8mlkqH1mlkiI7V9Xz BIWMzPLQL8fO4vEhApjY1gaiiRwXDTR1cTs9TsP8WXTPCtEJLapTQdwe1oL5vOPvon2UNH GpatE6SLCMZVRfsuytClTmGW2fVsGUVcdWwG1W3yPN+Bdj0et3wrMr85kbEXvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767036470; h=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=2BEdJltC6ahLh9yMLLdrzisPRrW8kXrfJ89MaH5p/NA=; b=PQLKzOx+nwKI1ougfwtYWQaz5+1bSy2VgdQ0zHa0nPQJL8abxkeQmw4LwvgmYBYrKbts5t D55t4JCyy5yQo1HYNn4cgr/+UYS3WQgWubiKACmJ4VjWnRzK70QFzZmwAm8JWWvs1qXOjq mRJzXGi98dsAlJCiqHDFYPPT2+y1TWtf7fd5go85Q1HtKBSLCfq1zU0MxqZgwPZFny/exs XT9YqBl5uIpwpcbTzjd+UqO1m54xw3YX9/glBCg9Yq34joCV/DRmLocg8VdTzdktwmv0Bz M+V2Zn4IqOnMZCSzqsNYOm/oUJ89yHYNbGvAPah4aQy9v56ViLGYtUeXSyUbbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767036470; a=rsa-sha256; cv=none; b=t7vZ6z1+mxu9716hYdcwVLB09jRGBYAt6WSis97J/TIp9a6JWRGC4JzVFjZwKJLFsye0ZH it64VAJHEgZ+nGrw1I5qTl/OM3Xdx9Wo0GFCleyxtsqaYmbPISqCFrv6Rfb2gMAHc4TYAB lYmBG4v0RQFfV00nAVZdMFEHMW+be8uZwrtQU893ohGZ8REOoQh4UVmnjYWVIXW2Bsg14B K+FSTVOCRO5K40hqwR7UQQ8md6QUONdmxcZC7K/Tvbm6duP1YDTs/hXMJpHykzFYw4G+pd lRoU92IZXQgrhcIr1Mf8EctXoSne1iF7vg94aZAEonanwwzLMzfOWhCZ2jAbVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg5pZ05B2zCbq for ; Mon, 29 Dec 2025 19:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bd91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 19:27:49 +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: e2afbc45258f - main - ioctl.2: Mention EACCES List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: e2afbc45258f2fa4bdcf126e959ac660e76fc802 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 19:27:49 +0000 Message-Id: <6952d635.3bd91.2abc42bf@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e2afbc45258f2fa4bdcf126e959ac660e76fc802 commit e2afbc45258f2fa4bdcf126e959ac660e76fc802 Author: Felix Johnson AuthorDate: 2025-12-29 19:21:26 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-29 19:25:23 +0000 ioctl.2: Mention EACCES ioctls can fail with EACCES, see sys/kern/tty.c PR: 239504 MFC after: 3 days Reviewed by: ziaee Reported by: Brennan Vincent Differential Revision: https://reviews.freebsd.org/D49072 --- lib/libsys/ioctl.2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libsys/ioctl.2 b/lib/libsys/ioctl.2 index e96c5c48d097..5784f43ef98b 100644 --- a/lib/libsys/ioctl.2 +++ b/lib/libsys/ioctl.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 11, 2013 +.Dd December 29, 2025 .Dt IOCTL 2 .Os .Sh NAME @@ -110,6 +110,9 @@ The system call will fail if: .Bl -tag -width Er +.It Bq Er EACCES +The process does not have permission to call this +.Nm . .It Bq Er EBADF The .Fa fd From nobody Mon Dec 29 20:18:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg6wm5tFxz6MHjQ for ; Mon, 29 Dec 2025 20: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg6wm505wz3f7d for ; Mon, 29 Dec 2025 20: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=1767039496; h=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=52PqiSiJeGLrNkRqkEmY2kq+XbcECoYz4nmmLj1mgmg=; b=uQvPojQWBi43QynMO1jFppu908I5iAgD9R8JD1Q5uD9+Llj1tYw3HKboRx8Jj7TAWis8LI kQoobabUTjUiqis0WBVZYHwqrs1Q1iTaXjjVFLbqDrvXHGXdv+wbIwF11AjWt+Hajrm28i xn6c5gTS6iqx2B9bnOLCldcM3DWrJYqyOx/fxLdDdL3ohkhe1K5SZv3T/MjMQG/TjczNSi k9+CAXAfWlmCy4606tAmMqhURQSsOl51GkwWOcVEGbjyxAFIOd1VCnz/sEFoySVeLs60WG rW3M/JmFoHvVhDfNF26HxMNk6VN+CAHRa0fjG1/pj0HfmK3EW5YQhJ+03Vim3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767039496; h=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=52PqiSiJeGLrNkRqkEmY2kq+XbcECoYz4nmmLj1mgmg=; b=CFSJhHSu4CSVkX0jidK4w2CDSxRKHtNqljwsEc0UFYHOvsx+PNKuqJfV0BEUWTNVZ5wBZp WwLb0MJ9XHzj8j6f09bTE0vs/+yeRYgUJ6RUFRtECCo7/HjkkXxgb+slg6HzSqqD8AUNBT 9oPf0vvi9fYcEvMhrV8KU5g7SbfWbFi6fZUAM6Ih90CI5mMSD9iV/NF6R80UgWQbZD7+HL hlP8IfD+XIZ6WPDs+PppZ9nNjxQ4eYr/o8wtH3QveN/W5yXvbE+owGXptvYdw5VYeVuGcr Fsmb28qm06ONr0nTlrZ72a1w1Jem+zu6+7ikSglBV1fSG3ORlwEaCxqlYzCONA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767039496; a=rsa-sha256; cv=none; b=cT3/vyLEqsMPUCq0uJbOZR+zkqLpZ7azeZmV5YKCFvky5yiNlBIQHIFDiZRx1CVzPLOmBl v2WFhlKeZsWyrkj3eAgVS/EcF+7Q0aBOkiHDdA9tX+6kyDccMqzolQuu64LQbfur29xZ2C ff29Xw9GeASsZnNf/wkMN3Pl53pNBm/QTVa7IqKTWZ/eH5HXHn89NpVcDcB+RKPzSERavC txoWMut2Xw+eX/MHkA2u61enWJAcUkd3nj/57DzG/6UJKwiVazrpx+Si2j6ntTEo4rZYoi n3ye2569CzTAzLTkUtVlMOZqdlBL6oPve/d689eoUJx09cF9MUuMtN2Bb0B5PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg6wm4MDXzTgt for ; Mon, 29 Dec 2025 20:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40aa2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 20:18:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Yan-Hao Wang From: Alexander Ziaee Subject: git: bbaa7d628175 - main - kyua manuals: Correct --results-file short form List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: bbaa7d628175ee484e31a054fb3cf7b7866cad13 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 20:18:16 +0000 Message-Id: <6952e208.40aa2.54e5d9b3@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=bbaa7d628175ee484e31a054fb3cf7b7866cad13 commit bbaa7d628175ee484e31a054fb3cf7b7866cad13 Author: Yan-Hao Wang AuthorDate: 2025-12-29 20:13:16 +0000 Commit: Alexander Ziaee CommitDate: 2025-12-29 20:16:04 +0000 kyua manuals: Correct --results-file short form PR: 290647 Ref: kyua/cli/common.cpp#104 MFC after: 3 days Reviewed by: ziaee Closes: https://github.com/freebsd/kyua/issues/267 --- contrib/kyua/doc/kyua-db-exec.1.in | 2 +- contrib/kyua/doc/kyua-db-migrate.1.in | 2 +- contrib/kyua/doc/kyua-report-html.1.in | 2 +- contrib/kyua/doc/kyua-report-junit.1.in | 2 +- contrib/kyua/doc/kyua-report.1.in | 2 +- contrib/kyua/doc/kyua-test.1.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/kyua/doc/kyua-db-exec.1.in b/contrib/kyua/doc/kyua-db-exec.1.in index 04f34c7b54e7..2e3bada4f849 100644 --- a/contrib/kyua/doc/kyua-db-exec.1.in +++ b/contrib/kyua/doc/kyua-db-exec.1.in @@ -62,7 +62,7 @@ The following subcommand options are recognized: .Bl -tag -width XX .It Fl -no-headers Avoids printing the headers of the table in the output of the command. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Results files diff --git a/contrib/kyua/doc/kyua-db-migrate.1.in b/contrib/kyua/doc/kyua-db-migrate.1.in index 67e46de46fec..4a1852aafd36 100644 --- a/contrib/kyua/doc/kyua-db-migrate.1.in +++ b/contrib/kyua/doc/kyua-db-migrate.1.in @@ -47,7 +47,7 @@ database lives. .Pp The following subcommand options are recognized: .Bl -tag -width XX -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Results files diff --git a/contrib/kyua/doc/kyua-report-html.1.in b/contrib/kyua/doc/kyua-report-html.1.in index 1f9f55b69a3f..3ff044ca8d30 100644 --- a/contrib/kyua/doc/kyua-report-html.1.in +++ b/contrib/kyua/doc/kyua-report-html.1.in @@ -64,7 +64,7 @@ The directory must not exist unless the option is provided. The default is .Pa ./html . -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .It Fl -results-filter Ar types Comma-separated list of the test result types to include in the report. diff --git a/contrib/kyua/doc/kyua-report-junit.1.in b/contrib/kyua/doc/kyua-report-junit.1.in index f1ad3a2e7f29..508ea30a3f6e 100644 --- a/contrib/kyua/doc/kyua-report-junit.1.in +++ b/contrib/kyua/doc/kyua-report-junit.1.in @@ -50,7 +50,7 @@ The following subcommand options are recognized: .Bl -tag -width XX .It Fl -output Ar directory Specifies the file into which to store the JUnit report. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .El .Ss Caveats diff --git a/contrib/kyua/doc/kyua-report.1.in b/contrib/kyua/doc/kyua-report.1.in index 8e2485f9c4ac..a3e4d75456cf 100644 --- a/contrib/kyua/doc/kyua-report.1.in +++ b/contrib/kyua/doc/kyua-report.1.in @@ -70,7 +70,7 @@ and .Pa /dev/stderr can be used to specify the standard output and the standard error, respectively. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-read.mdoc .It Fl -results-filter Ar types Comma-separated list of the test result types to include in the report. diff --git a/contrib/kyua/doc/kyua-test.1.in b/contrib/kyua/doc/kyua-test.1.in index 8cd5f34ae6af..07db6cf461c2 100644 --- a/contrib/kyua/doc/kyua-test.1.in +++ b/contrib/kyua/doc/kyua-test.1.in @@ -69,7 +69,7 @@ Specifies the Kyuafile to process. Defaults to a .Pa Kyuafile file in the current directory. -.It Fl -results-file Ar path , Fl s Ar path +.It Fl -results-file Ar path , Fl r Ar path __include__ results-file-flag-write.mdoc .El .Pp From nobody Mon Dec 29 21:03:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg7wV3hqQz6MLm0 for ; Mon, 29 Dec 2025 21:03: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg7wV1jBCz3pbm for ; Mon, 29 Dec 2025 21:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767042186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oIQJD5G3xtDtTpif3Ll2XYBRc0SzYNnfog4xEKSnY38=; b=aa+ywcXGCaaZsLedyZWrafS8r9l1uv952ZOqohQ8LBgWChFDfjTjOg3yRnEQ3znNwyUnbS mc7xcKfMT/luF2RlxSmcvTUCdDilz23LEJmcPpgbZyxS5LxxYKvkgVC35c2hsrHg2aBahf uLvl6zQlldZvAoWtmPcswuefmBD3sThzYq+hBk2j0WZLFE8KzX6x6vDcU3z4K5KubmJGSp 7tQCJ5Id2WQxRGWThaHVRLnMLHU61C3IGHBWJiqa+S9ywNdrfPW4ucjeQ+cWu1TTwlF4C+ SVa2Zaxv6tBQFVtw7cbWyoKcvNv4owYXEB1y9EAqF4dz19DZnh3Eb9YLdUoO2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767042186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oIQJD5G3xtDtTpif3Ll2XYBRc0SzYNnfog4xEKSnY38=; b=anAxaFnk6hRA2Gv0dk7eGrE8boM4O7fx0PWAcbIC7wYtpRAaN7lwZWX/139fOi2JSmbbOp 9S3IRKoaGORZt3L6MUWWRU5/dwylN8N+bvopOWK09R8OafHxZHA8l3PgWbGNHh7ZxXRjpG d4J1tKgcxWRqPq7n2lF1lGu8d+Wi/NWIKdmo8JLQin2YsKFaApJ1Tm0TNo46IueUinAMv5 3CW2wi49r3S2xlZkWpP3V+RAsLHh62qQTwAnaaimT/1qdk/GmGGOewv4pTZA93MYU86T4h G+UWOcJnVuStPtRVYjPTdBKRC2+Deb/0al/NZaKCUGVsCATtUwwgqObNFspWjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767042186; a=rsa-sha256; cv=none; b=nIEGKCkc5sZubEXo3p4AOuhnNJJyQvXmOjDSoaZ97qf/QefBg+vvN2wZFxIgvFC6bg0dhf LOjgr/USg2etIqiDsNsrgog3yC2TJw9BIMekF7DVgXphBdj2hor8waPs7+31MIldgLT7PL /BwUWmuVB2H9CVvdNJOeQp8NO9cf315eS5KJualsIZVfvjLo5frcqSlEKDpFIVQ7TRA9Sr Epdr7qzB1uCbjX5yAEt5Lh786cOULTgNqMNpgOj9zShJWufDGzmWtJZq+aVvpiG5qj7eID wxcDBhlQBjhJTepvcv7W7WBvUeJfAWCL+3BMRTIV4SPLp0QjLPA6BfHZBpalzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg7wV14LrzWWQ for ; Mon, 29 Dec 2025 21:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45f48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 21:03:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 660416fd1943 - main - Move MK_REPRODUCIBLE_PATHS to bsd.opts.mk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 660416fd1943bf9e69895f910902e305e195b860 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 21:03:06 +0000 Message-Id: <6952ec8a.45f48.41f9bbe7@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=660416fd1943bf9e69895f910902e305e195b860 commit 660416fd1943bf9e69895f910902e305e195b860 Author: Dimitry Andric AuthorDate: 2025-12-29 15:13:10 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 21:02:59 +0000 Move MK_REPRODUCIBLE_PATHS to bsd.opts.mk In commit faeaa25f5624 MK_REPRODUCIBLE_PATHS was introduced, but some ports that include bsd.debug.mk then started to fail with: make: /usr/share/mk/bsd.debug.mk:19: Variable "MK_REPRODUCIBLE_PATHS" is undefined in /usr/share/mk/bsd.lib.mk:525 in /wrkdirs/usr/ports/devel/libsysinfo/work/libsysinfo-0.0.3/Makefile:16 make: Fatal errors encountered -- cannot continue This is because bsd.debug.mk includes bsd.opts.mk, not src.opts.mk. Move the MK_REPRODUCIBLE_PATHS option to bsd.opts.mk to fix this. Reviewed by: imp, emaste Fixes: faeaa25f5624 --- share/mk/bsd.opts.mk | 1 + share/mk/src.opts.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 66eb427c3505..4902e6a6bf4c 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -79,6 +79,7 @@ __DEFAULT_NO_OPTIONS = \ INSTALL_AS_USER \ MANSPLITPKG \ REPRODUCIBLE_BUILD \ + REPRODUCIBLE_PATHS \ RETPOLINE \ RUN_TESTS \ STALE_STAGED \ diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 0805c88976da..0d806702417f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -217,7 +217,6 @@ __DEFAULT_NO_OPTIONS = \ MALLOC_PRODUCTION \ OFED_EXTRA \ OPENLDAP \ - REPRODUCIBLE_PATHS \ RPCBIND_WARMSTART_SUPPORT \ SORT_THREADS \ ZONEINFO_LEAPSECONDS_SUPPORT \ From nobody Mon Dec 29 21:34:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg8cw4GLdz6MN7d for ; Mon, 29 Dec 2025 21:34: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg8cw2bwNz3spS for ; Mon, 29 Dec 2025 21:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767044080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=76czSjKAUTmu+F59fYySghvRS3ubpYWaHM+2J/nBcZ4=; b=Ar2AZgUlJ+Uy3/dpNNsCU+X7J0Xim15BqpdtmcMFi4sasPhUkJe1Nrf7hnm5djx6Yr08bR 8lNc8fgRuwWW/8jnAf1uBIdKmvhYSas/nfiC0Z/2e37ByaHINKyR0sFQAtRZC2ba3DXAPY vVFIPkENoiEJhap7BiTPoNy5nTJSVBFrl6dh2h8xyOffJHwQFgxF6NNPbcdhZvjmqzPfyM QpqHVvivMxyfUTTiOHFUkytwHZGdYl3x15HJJTKMAKsgKvuiWc4WTIlNxW1Qe9bSJDUe8N MbSq/YtJybGISs9/Pb4BrSW83/d2OvfLGN0GsgbpWZ93blGaIXIrjcauvAhitQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767044080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=76czSjKAUTmu+F59fYySghvRS3ubpYWaHM+2J/nBcZ4=; b=S5bGuOe/Y22DXkuT7930yY2YKyrfY/83/j61r7cm4rN7Z4eIMh8LszpB/v3t98sqdsn8zV Fkv2/niza0EI3OGZG6adSXb+1YQkrWSOWnFLK8VDbmflzHKUFHCrBg08Kk5TR2lRGzXbff nvTwx/zTM37ROkkLGngp+9aT4hRVBAOsr3s3qcLu5stgFTuVjH+IfS1JoU1M4KZOJjOM1J aqytqS/QZvM7n4GewPtQT8v5rYeempJnFtkUTuU3v4b2nSqnCKhv/X9WKNvocqneD66vln ynKdvufgOYqJJ6bn03i2avx+J78m46UTbi5VdhYHLIl+YpPdBCm30Vz/71VQDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767044080; a=rsa-sha256; cv=none; b=Unn2Pb+XfQhNw+S55IbpDWaAKUYMZhChtEvcB6v/OAXl+0qisS+o+QJklKWQ7vI6WNkWLo ln9cybVy069PN/oNXufBGkAyuR0t7cUmFcxgK8/rhA0ZKhY9HpH7W1IK1wRcav+8eTFZmA fuyLeyNSSYET5t3prVS+4eRaxo2zh8yvVfyD6Y7WumyVfIswzeNRSABJn7r77fqa+n8EZd T+vg313jOOsYX38+uUACJDLiqRy1WqoWb3r23+5PdNTZ3+TYfV9hBBjSTXNSGC3NuWVVKq KmFSuTrqXoohESh/WxtYKS6lepk+75vyIHnEjMwZFJxVMmRGaVAW22HEHud0bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg8cw1PyWzXbQ for ; Mon, 29 Dec 2025 21:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4685c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 21:34:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 8e9515839369 - main - Fix typo in tools/build/options/WITH_REPRODUCIBLE_PATHS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e951583936980909d34a6104ace781541fb62b1 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 21:34:40 +0000 Message-Id: <6952f3f0.4685c.2da16e6b@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8e951583936980909d34a6104ace781541fb62b1 commit 8e951583936980909d34a6104ace781541fb62b1 Author: Dimitry Andric AuthorDate: 2025-12-29 21:34:22 +0000 Commit: Dimitry Andric CommitDate: 2025-12-29 21:34:22 +0000 Fix typo in tools/build/options/WITH_REPRODUCIBLE_PATHS Fixes: faeaa25f5624 --- share/man/man5/src.conf.5 | 8 ++++---- tools/build/options/WITH_REPRODUCIBLE_PATHS | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index a047dfb528fd..f028a3d1aac4 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd December 28, 2025 +.Dd December 29, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1593,9 +1593,9 @@ bit-for-bit identical output. .It Va WITH_REPRODUCIBLE_PATHS Modify the paths encoded in binary artifacts to be standard path -Normaly, the actual path is encoded in the binary. However, this makes the build -differ depending on the path it was built from. With this option enabled, the -paths recorded are /usr/src, regardless of the actual path. With this option +Normally, the actual path is encoded in the binary. However, this makes the +build differ depending on the path it was built from. With this option enabled, +the paths recorded are /usr/src, regardless of the actual path. With this option disabled, the actual paths are recorded. .It Va WITHOUT_RESCUE Do not build diff --git a/tools/build/options/WITH_REPRODUCIBLE_PATHS b/tools/build/options/WITH_REPRODUCIBLE_PATHS index e71ebff204d7..88d4a0870976 100644 --- a/tools/build/options/WITH_REPRODUCIBLE_PATHS +++ b/tools/build/options/WITH_REPRODUCIBLE_PATHS @@ -1,6 +1,6 @@ Modify the paths encoded in binary artifacts to be standard path -Normaly, the actual path is encoded in the binary. However, this makes the build -differ depending on the path it was built from. With this option enabled, the -paths recorded are /usr/src, regardless of the actual path. With this option +Normally, the actual path is encoded in the binary. However, this makes the +build differ depending on the path it was built from. With this option enabled, +the paths recorded are /usr/src, regardless of the actual path. With this option disabled, the actual paths are recorded. From nobody Mon Dec 29 22:10:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dg9RR4qDvz6MPvP; Mon, 29 Dec 2025 22:11:31 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp052.goneo.de [85.220.129.60]) (using TLSv1.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 4dg9RR2V3dz3x6n; Mon, 29 Dec 2025 22:11:31 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub2.goneo.de (hub2.goneo.de [85.220.129.53]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 3A8B9240C49; Mon, 29 Dec 2025 23:11:29 +0100 (CET) Received: from hub2.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPS id 646FD240027; Mon, 29 Dec 2025 23:11:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1767046287; h=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=nCave6ImA+YG6olzMb3JPPpfpsIcCfCnkSie4MP24U4=; b=bLyozxHwXXrszToUBDYA7VHc2Uj8luqT/XlUJH2nBRIvBBKb2z7/LZms7ZfY38rm7GQW+9 AH2yrW4xso3bXp7g+ymmcyf53ksjriL3dh899H5lFluWEU4zwJiEVVPpbz0FXnzWx26V5L GnO+OlNWwTcypfG9WMX9tTQzHyq7zLG2ezo+dhpEODy9jgk/u5VJVncLKEUZGLk5IpT+he xTLZh3gPi+pUxivJPrNVEgq0lgA+fuyjY/c0VVigWTfRc3iMxWa3owoaVeVV40l68sLgoQ 0g/9fePOhAwcVXTDvokmGEiLmt6G4zxHETXpnr1fO21xQOqa6TAaID9846xc5g== Received: from thor.sb211.local (dynamic-2a02-3100-22bf-3c02-021b-21ff-fe4e-8f4d.310.pool.telefonica.de [IPv6:2a02:3100:22bf:3c02:21b:21ff:fe4e:8f4d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPSA id 0DE9A240024; Mon, 29 Dec 2025 23:11:27 +0100 (CET) Date: Mon, 29 Dec 2025 23:10:53 +0100 From: A FreeBSD User To: Dimitry Andric Cc: Warner Losh , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: faeaa25f5624 - main - kernel: MK_REPRODUCIBLE_PATHS for full paths vs /usr/src Message-ID: <20251229231120.5019f897@thor.sb211.local> In-Reply-To: <86EF92B6-B19D-477E-8BBF-2B25190C781C@FreeBSD.org> References: <6950e7a3.3b044.1eb2b705@gitrepo.freebsd.org> <86EF92B6-B19D-477E-8BBF-2B25190C781C@FreeBSD.org> X-Mailer: Claws Mail 3.21.0 (GTK+ 2.24.33; amd64-portbld-freebsd16.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/1pR50pAJhkCK_3w/Jdk0fYr"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Rspamd-UID: 8a964d X-Rspamd-UID: 1ad3dc X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:85.220.128.0/17, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dg9RR2V3dz3x6n --Sig_/1pR50pAJhkCK_3w/Jdk0fYr Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Am Tage des Herren Mon, 29 Dec 2025 16:09:24 +0100 Dimitry Andric schrieb: > On 28 Dec 2025, at 09:17, Warner Losh wrote: > >=20 > > The branch main has been updated by imp: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dfaeaa25f562493370a5da84b= 429ab0a117c3213a > >=20 > > commit faeaa25f562493370a5da84b429ab0a117c3213a > > Author: Warner Losh > > AuthorDate: 2025-12-28 07:31:05 +0000 > > Commit: Warner Losh > > CommitDate: 2025-12-28 08:16:39 +0000 > >=20 > > kernel: MK_REPRODUCIBLE_PATHS for full paths vs /usr/src > >=20 > > There are many environments that you do not want the paths to be > > canonicalized. For example, if I always build a product from a speci= fic > > path in a jail that's dependent on the product version, I don't want > > that to be sanitized to /usr/src because when I have profiling tools= run > > against multiple kernels, I can't do A/B testing and results process= ing > > if everything points to /usr/src (sadly, the profiling tools cannot > > remap back to the original like gdb can). Since we need both active = at > > the same time, symbloic link fallbacks don't work. > >=20 > > We do want the rest of the build to be reproducible, however. We'll = get > > the same binaries if we rebuild later since we always rebuild with t= he > > same path. > >=20 > > Turn them both on for maximum reproduction for environments where th= at > > cannot be guaranteed. > >=20 > > Sponsored by: Netflix > > Input from: emaste, ivy > > Differential Revision: https://reviews.freebsd.org/D52959 =20 >=20 > This breaks at least the devel/libsysinfo port, which error out with: >=20 > =3D=3D=3D> Building for libsysinfo-0.0.3_3 =20 > make: /usr/share/mk/bsd.debug.mk:19: Variable "MK_REPRODUCIBLE_PATHS" is = undefined > in /usr/share/mk/bsd.lib.mk:525 > in /wrkdirs/usr/ports/devel/libsysinfo/work/libsysinfo-0.0.3/Makefile:16 > make: Fatal errors encountered -- cannot continue > make: stopped making "all" in /wrkdirs/usr/ports/devel/libsysinfo/work/li= bsysinfo-0.0.3 > *** Error code 1 >=20 > I think bsd.debug.mk should now include src.opts.mk, not only bsd.opts.mk? >=20 > Either that, or MK_REPRODUCIBLE_PATHS should be moved to bsd.opts.mk. >=20 > -Dimitry >=20 >=20 ... same with x11/nvidia-driver, see PR 292005 (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D292005) --=20 A FreeBSD user --Sig_/1pR50pAJhkCK_3w/Jdk0fYr Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRQheDybVktG5eW/1Kxzvs8OqokrwUCaVL8iAAKCRCxzvs8Oqok r22rAP96+jjYaOKGZnTwt4l1xTc8kZg4dtVx3P0z8Q/oHgOdTQD+MZijui9xYq4r DSPZ5bA2Cv63SwnYdFMtpndDYBmEEA8= =Eepy -----END PGP SIGNATURE----- --Sig_/1pR50pAJhkCK_3w/Jdk0fYr-- From nobody Tue Dec 30 03:25:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ6350Tz6MlBf for ; Tue, 30 Dec 2025 03:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgJQ61Gddz3VgC for ; Tue, 30 Dec 2025 03:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9LbPGd+7sN0KJ09mbAMrghVzP6Lb9fsel4jDZb1s3jI=; b=k1j6s0KXHE+RwB6wmNR5ATNmQHMaE0lLtUtFh3w67zIdjic8tLpcVqOTeamCvpXx+nlhLC r4OS/DfTz20kqdgwJq21/fltQxb3aept4U1oi7G8ygEFOg7qnLIBxtlExqL9+uY0IIKnu/ FJYJhEGRLIpEs6AXzvckaGOjleXx7zyHlKHeLChU6u3SezBt4ENDj6DYHqHQjRnH7SBvS/ YuX02aO0UCqf51wK0ypgWJSzCtug5sS1PxaYvuGODdVvdV5Psz6VycI/G4YmrNUDlonYJF 6yheO85UeJelhHkuIXSKz1vJDDhUpmpjbLqcckIjn+oaBAMlXijmbK6eOnH9EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9LbPGd+7sN0KJ09mbAMrghVzP6Lb9fsel4jDZb1s3jI=; b=Ha2AXNcoFsVOBgOEl7R5KYAGS9LJcpLrDJB9ZMM6n2ke/wcQZhbU2wnv8y8j37dwjh64p6 FRFlN/IimNa8rm3ABqrzUr5fTLfaDpzWzTYibGVHWN+Zqo3VkUWet2IvASA5p2hu61XLmu TXKBNz+pq0QVlsj3JUQAjMtdV8CAhu3fIpB8HvU1JR9q4F8LjH4NIRPdimBPMALc5hhaXr DkYa0VZ8FjYIEthJwNzZFq4A1waFp+E3n4+sKzucQWu4aZSsIwwzKw2i4NxzvLCqAQ2j18 VPMvCSohwjp5Ink7ZZ5mGw40hKtUbL1U1lf6UZ4/4yOLr0S6X5BEuZ6LJPMy/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767065150; a=rsa-sha256; cv=none; b=rngDfeYH+IlnA8ilYhjDHJdY2BnaJRYeEMWiGs6DDj3+fIUP3r3UV4Li1KRUjsoMwmvITc EciD9KrwhlmzofGJoWFgrXViZRBxV8Yc7a+wWe25KFNzti0txSPyd3hkwzQFwe1uuHskGu mCaAWJ0mn7mxjvcxef495tElemuL0/L6WXAKqBwrUO/f/RB65Y2t8EUhIYn54tvPLF/EgO IU8imyLcRXHo98hSd66mdda2dZRzyVibK+O4hnGjoIW2JaCSxmlcggYc7bRz4OufGNwTLN WqNjTA0MFJSmVCHH11lhzpebtq9A12Z02Q/zTvxtU8qh/QPOkrMiRPim5+8f/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ60sQWzjvp for ; Tue, 30 Dec 2025 03:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9dbb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 03:25:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e7053d9a126a - main - vm_object_coalesce(): simplify common expression List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: e7053d9a126a60b3c0b1348b6c5131b5f2025894 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 03:25:50 +0000 Message-Id: <6953463e.9dbb.36e75169@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e7053d9a126a60b3c0b1348b6c5131b5f2025894 commit e7053d9a126a60b3c0b1348b6c5131b5f2025894 Author: Konstantin Belousov AuthorDate: 2025-12-18 22:14:29 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-30 03:25:20 +0000 vm_object_coalesce(): simplify common expression Add the next_end variable to replace commonly occuring the next_pindex + next_size expression. Suggested by: alc Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54263 --- sys/vm/vm_object.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index a8ec98f2c98d..36edb279bbce 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2163,7 +2163,7 @@ boolean_t vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, vm_size_t prev_size, vm_size_t next_size, boolean_t reserved) { - vm_pindex_t next_pindex; + vm_pindex_t next_end, next_pindex; if (prev_object == NULL) return (TRUE); @@ -2197,6 +2197,8 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, return (FALSE); } + next_end = next_pindex + next_size; + /* * Account for the charge. */ @@ -2224,14 +2226,13 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * deallocation. */ if (next_pindex < prev_object->size) - vm_object_page_remove(prev_object, next_pindex, next_pindex + - next_size, 0); + vm_object_page_remove(prev_object, next_pindex, next_end, 0); /* * Extend the object if necessary. */ - if (next_pindex + next_size > prev_object->size) - prev_object->size = next_pindex + next_size; + if (next_end > prev_object->size) + prev_object->size = next_end; #ifdef INVARIANTS /* @@ -2243,7 +2244,7 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, vm_pindex_t pidx; pidx = swap_pager_seek_data(prev_object, next_pindex); - KASSERT(pidx >= next_pindex + next_size, + KASSERT(pidx >= next_end, ("found obj %p pindex %#jx e %#jx %#jx %#jx", prev_object, pidx, (uintmax_t)prev_offset, (uintmax_t)prev_size, (uintmax_t)next_size)); From nobody Tue Dec 30 03:25:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ53C9xz6MlJd for ; Tue, 30 Dec 2025 03:25: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgJQ50hbcz3Vg9 for ; Tue, 30 Dec 2025 03:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jFNkeXa62k+d2PRPOp1tSR8rruCGqNRkEfoR2xjXveE=; b=mxL/YGH9AYSIlNnu6Ac6ZjztJLFjAOmv35v+Hm1p1mp3rRL6dF3PBDY3UwoxtP/R3Gigsj 8ie8IRZVkK/Kh9wMRkBGHYGrMaCVRtZnNQbD859q5FR4bmpf1f0nLVMmfTcgxPecpHI4B8 Ju5M1cZbEFllwSFN4lK+kfAsqAkJBSoZ9s9yhtO9O1O/JzN5a0rwuiqsMH4YEGRUJhfc8l GepN9ydTNPq18fDUZqEj/FN1BcggvrGONdsft63V9gTYI8Zv3hOhpbdG5UFT3Qns2+b611 CgSpqTVWm2FmSTCj26E44UkbQ8a10iyemilXixaJvW7cOOSW6u7xsM+M63V0qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jFNkeXa62k+d2PRPOp1tSR8rruCGqNRkEfoR2xjXveE=; b=F8msK8ZHWvPhY/6tahHmscKyxoS3V39KpcYFWfNpkQO91YndKnALnkFKkElj+MvRL59KWi 0ApMUalxR/fPnqLlD4IuPJeV/rIVwNZ38yjFfJNzI8i6Zr78zikQITO7fOAFQyu2ecCOQ8 ZfENveqXFc+bx1sFwAXxswLyKcb7lrV2KnPqCT+5roDVnUcc6JAXEi+gTl72OHZvIEnMBW YS2AZn2cJEGhNnJTA0AsF8RaPw+JxycMad2bxfQVHi8ufBaP8jwf5UpX+smAAzD/jhAWZW II7WflKVFY9iuCpyOUB3QnG33gDuWWf4m6hymB+Xc14bJ6kleIU3+imuh/l23A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767065149; a=rsa-sha256; cv=none; b=MNe1LUH8Q4U0/ftnRebg01EEyKfoH/yaEHVv4f/71PsyViIQ43whWUrd1AbL0cV0g4NfGI TP/ViRyeuFAzv+e1/JsGfYaTOCHkVVYWuDW0ifmib+HEfNDlVQSdl63KA/SfHQ7JDwRsoy hCiiyREJxnZ/+Orri7T7giWDrhznP4cq0S/SefHpULFWydakaObQFc1ISOP9xQRQ05pmgg Gcw4Xj3h2l6dpjMUAEgTFMW4fF5Y34vO0G8UNI75fsMNmiXVKAPM3vXPxcC5pA4/92h6jO Id+JGAcmcXNdiTphmLpwNEAXVGn6NG6WlfMjfJ/qsX1ZynbcaVd5rF3eWwXl/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ509CrzkYt for ; Tue, 30 Dec 2025 03:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9d3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 03:25:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: efcb109940ca - main - vm_object_coalesce(): remove commented out code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efcb109940ca607130af4498e1e33b54c58ba43c Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 03:25:49 +0000 Message-Id: <6953463d.9d3e.32ca39a8@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=efcb109940ca607130af4498e1e33b54c58ba43c commit efcb109940ca607130af4498e1e33b54c58ba43c Author: Konstantin Belousov AuthorDate: 2025-12-20 16:09:38 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-30 03:24:35 +0000 vm_object_coalesce(): remove commented out code Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54263 --- sys/vm/vm_object.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 117900135ac3..a8ec98f2c98d 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2223,20 +2223,9 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * Remove any pages that may still be in the object from a previous * deallocation. */ - if (next_pindex < prev_object->size) { + if (next_pindex < prev_object->size) vm_object_page_remove(prev_object, next_pindex, next_pindex + next_size, 0); -#if 0 - if (prev_object->cred != NULL) { - KASSERT(prev_object->charge >= - ptoa(prev_object->size - next_pindex), - ("object %p overcharged 1 %jx %jx", prev_object, - (uintmax_t)next_pindex, (uintmax_t)next_size)); - prev_object->charge -= ptoa(prev_object->size - - next_pindex); - } -#endif - } /* * Extend the object if necessary. From nobody Tue Dec 30 03:25:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ73lfCz6MktM for ; Tue, 30 Dec 2025 03:25: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgJQ71y2Tz3VLm for ; Tue, 30 Dec 2025 03:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8opr1u2aDRz/VRKwLT6SwSGLFfbC2EOoPGxGXD04Oo=; b=UCqa8lgHmZBFZ59LxJYZ5TNejT0PU2ncjfo+UQLwcffnLnXBJVkUa4ZLy5NHuNnKra8un3 KHDZiY6tyRadDaspS/+AknOOKKsHu1ouusenq0jqaxWmfPlxOYEaa9FZDVW+lCu+xqWYd+ MlbLO4Ux64K+lSVdCnLcY8hB/Mq3x1+mUYkgRkQt48hklt3kjfbMGOWxSEiqsQRaTYpRQP cmSyLhE6GoS5G890cIekfCgU6Zf+sRncUkeFhNOEOmFlya0QKhFmuhWcmEyg0ZMaQzNOEN k6x10rOiWghLeGBrHtsMTGl6UUGGY0s3okjiycyRrtLL5XZ2ug2r2BXqkzWvSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8opr1u2aDRz/VRKwLT6SwSGLFfbC2EOoPGxGXD04Oo=; b=cl/diSR4RHN4mlrnXJk9iibMM1Hj8fT1I4CdbqpJabbPFG8bbqCXPT2VZUUqf8M7/ggwuk U0frwg/35mBtKBp9qjxUcuPU1A2aXVOOKJrowt7zCP38r8HxifCmOZpIUmYQPJ2deU2YIm d30v/+iaqBk9yJQl6LfZ7HxwDjQtfYb4CRCqC07vgLcVKhC0Y128jgDTIMrzL9H9UKfkv9 lltuDohEUZ9wQiW0U1jNpGuqoMdDqza7eCMNNzHR/Opdt5v88+f3oDKiD8DOup3mkXcD0R v7ZO36wGFFyw0YHcwkISltyHgkRA1ZY3hTyiTsZOqilquZluaEKr8LVB/mVniQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767065151; a=rsa-sha256; cv=none; b=Dd+pSl6uB3wVsqxWj0jN/W85Fi+n0zRHKRidj9Ogg0RGuh8ov0ABzMTtYQYiB97KUl0j2o VYwSRv1YEugPIul9u2gYkt4hfQb84VWfCJaqMUDj8+hZZd7oJO/o3cZk+nJjBne3Vvo7Gv jEXQlJbeOlMx8xNJ33ta6UANYa544NQpn2TNWGlXR97nV0twK1z1z/cabs8/+7fY0mh23j rVQe53YrKqZv8GwgfZ6ahHHy87PxM/HRW0yyla4LXqvxVtcNblqZQFTPAU5CdxZ5hmMHle raqLFCHSPcvv+IsY4FgkumhAEUPGLIP50YTZjO/3j1LEy9/fc5cAmPVpNF0DTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ71Wl0zkYv for ; Tue, 30 Dec 2025 03:25:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b120 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 03:25:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 353ba3bf08fd - main - vm_object_coalesce(): do not account holes twice List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 353ba3bf08fdef69b77e3e565435e50784a51412 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 03:25:51 +0000 Message-Id: <6953463f.b120.10e84c41@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=353ba3bf08fdef69b77e3e565435e50784a51412 commit 353ba3bf08fdef69b77e3e565435e50784a51412 Author: Konstantin Belousov AuthorDate: 2025-11-27 21:53:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-30 03:25:36 +0000 vm_object_coalesce(): do not account holes twice alc wrote: Suppose that the object is OBJ_ONEMAPPING and that we, in fact, have a single mapping to it. Then, we punch a hole in that mapping. vm_map_entry_delete() only subtracts from the object's charge when we shrink the size of the object. Now, suppose that we perform mmap(MAP_ANON) to reallocate some of the hole. Aren't we going to add to the charge here, even though vm_map_entry_delete() never subtracted from the charge for the hole that was created? Only account the change in the charged object size that was added to it. Noted by: alc Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54263 --- sys/vm/vm_object.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 36edb279bbce..c216fdc01af1 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2202,7 +2202,8 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, /* * Account for the charge. */ - if (prev_object->cred != NULL) { + if (prev_object->cred != NULL && + next_pindex + next_size > prev_object->size) { /* * If prev_object was charged, then this mapping, * although not charged now, may become writable @@ -2213,12 +2214,14 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * entry, and swap reservation for this entry is * managed in appropriate time. */ - if (!reserved && !swap_reserve_by_cred(ptoa(next_size), - prev_object->cred)) { + vm_size_t charge = ptoa(next_pindex + next_size - + prev_object->size); + if (!reserved && + !swap_reserve_by_cred(charge, prev_object->cred)) { VM_OBJECT_WUNLOCK(prev_object); return (FALSE); } - prev_object->charge += ptoa(next_size); + prev_object->charge += charge; } /* From nobody Tue Dec 30 03:25:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ9126nz6Mkyr for ; Tue, 30 Dec 2025 03:25: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgJQ84HY7z3VgM for ; Tue, 30 Dec 2025 03:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjhNTRvGDRC5MLlejagKCGP/eab3wsTXD/fWYvsid38=; b=u/3Bglcup0x6Z0KVjAAOGKdii5KoPx7JqPJ3NOxQ5Mi6vtpZjcAjaYSEjVxSUCfTmeFR+L PPq5l0ZoDI8aVAWndilWXgW4BGcUHXN7vPFzPCp4RqTy5jDD7oKYG0hS9QvxIO1XFLUl+k L+u9QBLoRJMhPK/DXQT4ghVObEszmABWHb0/j2CbGLTTm9uRzJPfsLEvOVyU/ORMZJt+p1 Ibj/DwsjY/SuIw9w+krbNX98pBVVUevGrsvXlGUUXfBBmqJge6O3KvjjScN1kavMq9nnXr zl/qz12spGd+gXP70JjpAUI3zRVpoavGEcckP7TGIFPQWuRbn2UqsUVXXO9mNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767065152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjhNTRvGDRC5MLlejagKCGP/eab3wsTXD/fWYvsid38=; b=N/Xuze5KGlTaJHrLsSu3iEm6m5+aWibzQ1dJnIP6RHDSUcTMlxwJMxX2d3DoTSY7li57jH WUlvyh6MRNomZk1OjGWC2xTJWVcpgVOvH516bS5/NwaKwtfozIVGFT7HjJzub6wlDGjMDk PBU1cey57jsvC6PuEExiTzIyP+4Km+wQGL/UFphvBHVi0OcBfWt7sBpcy/KEVwOYwng4eE 9JvmAmKXhbQvLzMJMxK14PmpdxjDFOnuwTtGKtzZbYG0JE0Qw8lrBlXGcfN8o+RaTGtKjO rjnF67A2QlGzxxI5tK/2j0bIXkqPat3GpIhAxS9TEVHLGex6fUdvEstq9eKvGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767065152; a=rsa-sha256; cv=none; b=YdWIMNYqdCyKxBwVrFmi03nXJ+Bt9lDrWAyd8GEj8p+mwn/bVkqt84GHvEK2B/GxU4tzLo D5BhoOqlzVttCCBAxAN/HVkKcw3lB5ZGZvpaKBrdKPXaBAvWDU0eRd94keqEqYCKprEWgB h7ZVV+/wWEd+Goo2T0GPB58w3vnF8ltP7zzwS2bOa63L8XzH5LUpfUu0nJUpuX7Xy2aDgl 3spt02v7Kt6QBRgoU4QcQY2iblTEeY7BME/8bgy1rlhj5p/j408GZLeNcQrzLgqdmS90dV MADcZQdGHTTX8RbKX7/L+2APLU1xDl8znoowPId6z3x7szUdnaNjIwuyLYJsog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgJQ82SBVzkYw for ; Tue, 30 Dec 2025 03:25:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9dbf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 03:25:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7685aaea8850 - main - vm_object_coalesce(): return swap reservation back if overcharged List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 7685aaea8850f5b6995a17740a016019e0956c70 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 03:25:52 +0000 Message-Id: <69534640.9dbf.27c06818@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7685aaea8850f5b6995a17740a016019e0956c70 commit 7685aaea8850f5b6995a17740a016019e0956c70 Author: Konstantin Belousov AuthorDate: 2025-12-20 16:03:40 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-30 03:25:36 +0000 vm_object_coalesce(): return swap reservation back if overcharged It is possible for both vm_map_insert() and vm_object_coalesce() to charge both for the same region. The issue is that vm_map_insert() must charge in advance to ensure that the mapping would not exceed the swap limit, but then the coalesce might decide to extend the object, and already (partially) backs the mapped region. Handle this by passing to vm_object_coalesce() exact information about the charging mode of the extending range 'not charging', 'charged' using flags instead of simple boolean. In vm_object_coalesce(), detect overcharge and undo it if needed. Note that this relies on vm_object_coalesce() call being the last action in vm_map_insert() before extending the previous map entry. Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54338 --- sys/vm/vm_map.c | 44 ++++++++++++++++++++++++++++++-------------- sys/vm/vm_object.c | 41 +++++++++++++++++++++++++++++++---------- sys/vm/vm_object.h | 8 +++++++- 3 files changed, 68 insertions(+), 25 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 6b09552c5fee..68dcadd2b2f1 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1620,6 +1620,7 @@ vm_map_insert1(vm_map_t map, vm_object_t object, vm_ooffset_t offset, vm_inherit_t inheritance; u_long bdry; u_int bidx; + int cflags; VM_MAP_ASSERT_LOCKED(map); KASSERT(object != kernel_object || @@ -1696,20 +1697,36 @@ vm_map_insert1(vm_map_t map, vm_object_t object, vm_ooffset_t offset, } cred = NULL; - if ((cow & (MAP_ACC_NO_CHARGE | MAP_NOFAULT | MAP_CREATE_GUARD)) != 0) - goto charged; - if ((cow & MAP_ACC_CHARGED) || ((prot & VM_PROT_WRITE) && - ((protoeflags & MAP_ENTRY_NEEDS_COPY) || object == NULL))) { - if (!(cow & MAP_ACC_CHARGED) && !swap_reserve(end - start)) - return (KERN_RESOURCE_SHORTAGE); - KASSERT(object == NULL || - (protoeflags & MAP_ENTRY_NEEDS_COPY) != 0 || - object->cred == NULL, - ("overcommit: vm_map_insert o %p", object)); - cred = curthread->td_ucred; + if ((cow & (MAP_ACC_NO_CHARGE | MAP_NOFAULT | MAP_CREATE_GUARD)) != 0) { + cflags = OBJCO_NO_CHARGE; + } else { + cflags = 0; + if ((cow & MAP_ACC_CHARGED) != 0 || + ((prot & VM_PROT_WRITE) != 0 && + ((protoeflags & MAP_ENTRY_NEEDS_COPY) != 0 || + object == NULL))) { + if ((cow & MAP_ACC_CHARGED) == 0) { + if (!swap_reserve(end - start)) + return (KERN_RESOURCE_SHORTAGE); + + /* + * Only inform vm_object_coalesce() + * that the object was charged if + * there is no need for CoW, so the + * swap amount reserved is applicable + * to the prev_entry->object. + */ + if ((protoeflags & MAP_ENTRY_NEEDS_COPY) == 0) + cflags |= OBJCO_CHARGED; + } + KASSERT(object == NULL || + (protoeflags & MAP_ENTRY_NEEDS_COPY) != 0 || + object->cred == NULL, + ("overcommit: vm_map_insert o %p", object)); + cred = curthread->td_ucred; + } } -charged: /* Expand the kernel pmap, if necessary. */ if (map == kernel_map && end > kernel_vm_end) { int rv; @@ -1741,8 +1758,7 @@ charged: vm_object_coalesce(prev_entry->object.vm_object, prev_entry->offset, (vm_size_t)(prev_entry->end - prev_entry->start), - (vm_size_t)(end - prev_entry->end), cred != NULL && - (protoeflags & MAP_ENTRY_NEEDS_COPY) == 0)) { + (vm_size_t)(end - prev_entry->end), cflags)) { /* * We were able to extend the object. Determine if we * can extend the previous map entry to include the diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index c216fdc01af1..f4c54ba91742 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2161,7 +2161,7 @@ vm_object_populate(vm_object_t object, vm_pindex_t start, vm_pindex_t end) */ boolean_t vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, - vm_size_t prev_size, vm_size_t next_size, boolean_t reserved) + vm_size_t prev_size, vm_size_t next_size, int cflags) { vm_pindex_t next_end, next_pindex; @@ -2202,8 +2202,7 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, /* * Account for the charge. */ - if (prev_object->cred != NULL && - next_pindex + next_size > prev_object->size) { + if (prev_object->cred != NULL && (cflags & OBJCO_NO_CHARGE) == 0) { /* * If prev_object was charged, then this mapping, * although not charged now, may become writable @@ -2214,14 +2213,36 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * entry, and swap reservation for this entry is * managed in appropriate time. */ - vm_size_t charge = ptoa(next_pindex + next_size - - prev_object->size); - if (!reserved && - !swap_reserve_by_cred(charge, prev_object->cred)) { - VM_OBJECT_WUNLOCK(prev_object); - return (FALSE); + if (next_end > prev_object->size) { + vm_size_t charge = ptoa(next_end - prev_object->size); + + if ((cflags & OBJCO_CHARGED) == 0) { + if (!swap_reserve_by_cred(charge, + prev_object->cred)) { + VM_OBJECT_WUNLOCK(prev_object); + return (FALSE); + } + } else if (prev_object->size > next_pindex) { + /* + * The caller charged, but: + * - the object has already accounted for the + * space, + * - and the object end is between previous + * mapping end and next_end. + */ + swap_release_by_cred(ptoa(prev_object->size - + next_pindex), prev_object->cred); + } + prev_object->charge += charge; + } else if ((cflags & OBJCO_CHARGED) != 0) { + /* + * The caller charged, but the object has + * already accounted for the space. Whole new + * mapping charge should be released, + */ + swap_release_by_cred(ptoa(next_size), + prev_object->cred); } - prev_object->charge += charge; } /* diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index e58fae5f0090..98afb93f8389 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -228,6 +228,12 @@ struct vm_object { #define OBJPR_NOTMAPPED 0x2 /* Don't unmap pages. */ #define OBJPR_VALIDONLY 0x4 /* Ignore invalid pages. */ +/* + * Options for vm_object_coalesce(). + */ +#define OBJCO_CHARGED 0x1 /* The next_size was charged already */ +#define OBJCO_NO_CHARGE 0x2 /* Do not do swap accounting at all */ + TAILQ_HEAD(object_q, vm_object); extern struct object_q vm_object_list; /* list of allocated objects */ @@ -354,7 +360,7 @@ vm_object_t vm_object_allocate_anon(vm_pindex_t, vm_object_t, struct ucred *, vm_size_t); vm_object_t vm_object_allocate_dyn(objtype_t, vm_pindex_t, u_short); boolean_t vm_object_coalesce(vm_object_t, vm_ooffset_t, vm_size_t, vm_size_t, - boolean_t); + int); void vm_object_collapse (vm_object_t); void vm_object_deallocate (vm_object_t); void vm_object_destroy (vm_object_t); From nobody Tue Dec 30 12:47:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgXt50BP1z6LsPm for ; Tue, 30 Dec 2025 12:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgXt44g93z3Q26 for ; Tue, 30 Dec 2025 12:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767098844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=glP4Y0QJvof/BB371LR0BrB4O/J/jqZm6K29jb6s2DA=; b=PwWFqojtLnC5tpr+G/o42fwf7NB8nUCBmNpvK+dHb3cO3vTjWBnVdDI/7fZJYA5ckiI+Yx MkChS56i69fQ9phnlRbZRcnl797XB1fZgwtSs43nOfpQqJImjHJCR4gyNPm2vxMDxjXlqj Iw0cBl9DF4UcAAuzkZXoT7dMNkm6kslqzBWKqTd6tpTblM4cNm6hdqPEQUSl1d05teTkRr NiD+0SBwitdkylb8/HALuEwYYfVRVnYWJyFNHw1tkKTKH5F70QqqkrNOJgF4Kz3g6cPQ75 BaZ5//t1qDbJQp1q3b+Cyvkx+Epoci6IL3E811OBCJ+jI5qQEdlpVB1crvHXIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767098844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=glP4Y0QJvof/BB371LR0BrB4O/J/jqZm6K29jb6s2DA=; b=DnpDSUhjQrvlLJ4P5pZVrpyqXcnU9oVJgyP16klLBpL+rtJKtMiKlz9qSzvK47vh4UY7r3 g8/osgD9n8Vj2TgX2JrTSP86uRSiq+ZphAtfZxuyaPdIwY1IqjGNSu2tmDLSoZNFAntFfC 8uT62PycpdAAHvCqBZKymNRG1jUGBp4LNJSP4rq8SyR70U/EOwZqd02ue6g1xgZtInrRgW oPzV9nbUBhHij2Y00a4EChgYkxQbSBN2VJwi8IhhPWy6KUaC9qgWtl2tn+nC12VTLxZwyq xvj65zKn8sIAXNI9/BrXAhSxOeMu2I83F2qehpRyR8l1U7CZbektQyzWWn7NUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767098844; a=rsa-sha256; cv=none; b=BjvE3CaQBotjBObJdWXZmoDPAjwDNhmvJQLmI5j7VxyVF73RBro07ZFM1qLS4rXfUVBz0X OvuGTlRR3+iu/TmZd0roMPLvu1yZWjwS0yh1t4Dy9j/Xuh4Lo8mhJaf6wK0mqoppea7JGC pBr1oJdU/1HerkLwBIkB/Q09RTTnaelXQkpjlp8xxBKpYK3awpRIdfuT1a1XMrqBo8M9mV OHUKwGNGH5Epv+/8bHFcV5NSUyTBvRej0pySaNA8otAUMgfJ1Gyk312Nze1+zPqBX6JR3U WfZShUiLtko+Fjk6WIB7esejlTuoyxikmaWg8xrUAQk54kpmFSIqqgrJFLGVFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgXt43Sfvz11Sp for ; Tue, 30 Dec 2025 12:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 394b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 12:47:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 710ec409dffe - main - crypto: avoid warnings about too-long initializer strings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 710ec409dffed3306ced253bba85dbdc7758510b Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 12:47:24 +0000 Message-Id: <6953c9dc.394b6.4b8b5085@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=710ec409dffed3306ced253bba85dbdc7758510b commit 710ec409dffed3306ced253bba85dbdc7758510b Author: Dimitry Andric AuthorDate: 2025-12-30 12:46:20 +0000 Commit: Dimitry Andric CommitDate: 2025-12-30 12:46:46 +0000 crypto: avoid warnings about too-long initializer strings Mark `sigma` and `tau` as `__non_string`, to avoid warnings from clang 21 similar to: sys/crypto/chacha20/chacha.c:53:31: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 53 | static const char sigma[16] = "expand 32-byte k"; | ^~~~~~~~~~~~~~~~~~ sys/crypto/chacha20/chacha.c:54:29: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 54 | static const char tau[16] = "expand 16-byte k"; | ^~~~~~~~~~~~~~~~~~ MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54364 --- sys/crypto/chacha20/chacha.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/crypto/chacha20/chacha.c b/sys/crypto/chacha20/chacha.c index cb06003b0ecf..0509b05cab22 100644 --- a/sys/crypto/chacha20/chacha.c +++ b/sys/crypto/chacha20/chacha.c @@ -50,8 +50,8 @@ typedef struct chacha_ctx chacha_ctx; a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \ c = PLUS(c,d); b = ROTATE(XOR(b,c), 7); -static const char sigma[16] = "expand 32-byte k"; -static const char tau[16] = "expand 16-byte k"; +static const char sigma[16] __nonstring = "expand 32-byte k"; +static const char tau[16] __nonstring = "expand 16-byte k"; LOCAL void chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits) From nobody Tue Dec 30 12:49:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgXwc2YLxz6Ls8q for ; Tue, 30 Dec 2025 12:49: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgXwc1wpFz3QgK for ; Tue, 30 Dec 2025 12:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767098976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hv4lRVtiBxczeYLYPT3lLxgM8RbmAWR7NMM0SYABe14=; b=lugCzOYJfI2DmE998AXAc48YDhtKqJl4wPa73ZUqG88ATLcxybiAVfEKfAsszE3WstpPMi JU6QE0tHe05nNtA8tCYL79GKRwynF8NVSaP2k1VkAzJgC7IGnr11M0EfmzZEUwedC5/NpY ZpDitC5hMlXkX9KaJEJqWJZWh5NbpYFYioEJNN2oVOOlf/tBLsg4eRJyJ/X7Bu5AAUqbhc dLX+iyuEIlZWwuRdjobEzULJI8bfQetcYsxbY3sDtoJCW/6BpKpcgPXaOMNVCXzES7ju1S jfJuBlGg6rfsp5ww7iXEZDcpyTxjT/Qeua67jumb/9udDB7dJtahgH4S8L5PHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767098976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hv4lRVtiBxczeYLYPT3lLxgM8RbmAWR7NMM0SYABe14=; b=nyMJjqpmMWVS1P1rrhjJ04Lck4f9I9gs+CByN69NStp90mp2HX+O40kS7+feUrTlhbMcB+ ZVc0T/b5p5QZaaEX1cO6Zffw7v2K4uqMbbIuS+9zcVQoN5LeISPLMOTauR/3xZBLct734W 7lzfN+8Fo44MXs2XJ0GOFf4RkyMVWqHd1FfaeYhj0NqsN+gfDUOf9sDDatNpo8ayiGt9US JYt9AnSuqtcmZLL2jsQQ1Z6qQqBxHiuO9onM/qaEh3Ybuc724MU8yoni0tKwd3lsaKbp/D rnu1rS6MJ7abqCv+6OJ9Wg9pcwK40q3pdmOrHoTEqjYU5nEzOLf50xjl/ecyMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767098976; a=rsa-sha256; cv=none; b=aa708A3Y5tVUO4iI0v1qo5qLjgoyRAd8lM94l6ya1KEdlHDlHC04XVYQ84vyfW+fV7WQc4 CCj0F6nZkzLZ8WjnrjpnnVwx2BxF5xPshTG3B2GlOYuuqkVILO81d+oRbrDLf78QaDfryy QU7aY7blF95CPggbgLplUIcBBwb/jA8XtcarC00DmSJ9/4SCf02eIgroS2FE0XrkB8qyOO qJsitz5ezLH6gahJC7HXSEkTEEY6fHSom97pcjTlOD9/Rwkz5rxr6IEDH94pmV3/RVKK02 nEjzY6P+5Rbz8nEM9zGXjcu8BFeeViQbCfoZG7SR1acE9801L5WRsPNVkN0KFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgXwc1TN1z11lJ for ; Tue, 30 Dec 2025 12:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 392d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 12:49:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 667259b392ec - main - ncurses: avoid warnings about too-long initializer strings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 667259b392ec0a86d066ccc6ba0f4025b3d2a083 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 12:49:36 +0000 Message-Id: <6953ca60.392d8.2ff7c69d@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=667259b392ec0a86d066ccc6ba0f4025b3d2a083 commit 667259b392ec0a86d066ccc6ba0f4025b3d2a083 Author: Dimitry Andric AuthorDate: 2025-12-30 12:48:07 +0000 Commit: Dimitry Andric CommitDate: 2025-12-30 12:48:56 +0000 ncurses: avoid warnings about too-long initializer strings Increase the size of `assoc::from` to 8 bytes, to avoid warnings from clang 21 similar to: contrib/ncurses/progs/infocmp.c:702:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 702 | DATA("\033[2J", "ED2"), /* clear page */ | ^~~~~~~~~ contrib/ncurses/progs/infocmp.c:716:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 716 | DATA("\033[!p", "DECSTR"), /* soft reset */ | ^~~~~~~~~ Reviewed by: markj Obtained from: https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241207.patch.gz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54371 --- contrib/ncurses/progs/infocmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ncurses/progs/infocmp.c b/contrib/ncurses/progs/infocmp.c index 7932203ac2b1..f61633cfad80 100644 --- a/contrib/ncurses/progs/infocmp.c +++ b/contrib/ncurses/progs/infocmp.c @@ -687,7 +687,7 @@ compare_predicate(PredType type, PredIdx idx, const char *name) #define DATAX() DATA("", "") typedef struct { - const char from[4]; + const char from[8]; const char to[12]; } assoc; From nobody Tue Dec 30 12:51:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgXyh1j4tz6LsV6 for ; Tue, 30 Dec 2025 12:51: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgXyg35R8z3R3x for ; Tue, 30 Dec 2025 12:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767099083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N51n0MrGe/tPRbNDghTqAHA5Z7vi6bwC/b6ngUHgj7Q=; b=VX/qLyG8lYNTllFRx324Plx94/o29XYtBNyJefDN8dhdDBOZTn2nkTg7IWHz18w4NYzNBe XsObTi3KL6sCpq9SpeHXwO9pfMcJjiCUUaVDZrkKtxC2suazsF53N3MG7YW4YtXwtg3JGn 4dvyGf81Q+sf9k7G8CH2y3U25TZ1wGquZtolucaV4hj5t6RckP9WzJQw4TS9h9GByAePt9 h3nnYr5F8nSehWtsFaERZCbY3xqRz5LUXURsC2MjDxRf+zvVxA7lOuruSLa6CNrf4wJJqV PJpG7P/weZpI6kx52H24XxBZWlYNcQWG2Tk9dkiJF61hkvkH1SPZFLbnC7D7fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767099083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N51n0MrGe/tPRbNDghTqAHA5Z7vi6bwC/b6ngUHgj7Q=; b=UVk+tbVmzOazit77fTYyNZWC5FU7CXxRVk8bAEatHaHtRFhxFFq6tglShj9lX0gFP4vcO4 rxTzF5o50Laccz0ZtOvjVqOr4s2IlTGeOJjCzw2tabb1Epdus+QrHPO4gr1iPck6t0nPQ/ 18wt65lS17ynr36gjKZdN/AizUHscAAhp+fSeHVhHoRgioDPRNoAzdouVbHDWQT4jCJfxi 5QEUmQHPgVQbR7/6CyzaTYsRD9fv7T9g4EKyLpl3yGNezHKtYMSypmFaLEw3bu2JHLBs3I GVd84S0tAeYZy8iB/FMwpB7cy3CMylU6iIHOytx1pmEGAoLxVoXrrvGaRM91ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767099083; a=rsa-sha256; cv=none; b=mMdLmJXbhNhv11OVBLSNyGm8y6zpRLZmjrMvxIfbYYYpTRI1BfpHmD6MjyDnAGmvPbgWD+ EokD3csE76o9M/PLSrjSP9ZU3/HmeLFBdmDB995pmJOHyVq0DHazJ2YvYHOZyvOOi9dEDL FBgPH8CsyaicdrIftEz1ebY8Qs5LwiTfJ5KgixMW5OW1m8aT3ndq0c9pvwidl30PRBO759 18ri0T+LZKeP62LkX/ETHbDxAdFBkfZUI5h8mOscuE/8gHji7Wr/08v7SOXXxz3pnYLX1Y uS5MxrryFYLO9rh9lnST1KUIrTv0sgI8AcQPmzHimVqv8vBFCD3K8tJ36lTu0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgXyg1wZtz11Yk for ; Tue, 30 Dec 2025 12:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a2c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 12:51:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: bcd9ea853b14 - main - zfs: rename several printf attribute declarations to __printf__ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcd9ea853b14c85a61eb9079c59e966eed336578 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 12:51:18 +0000 Message-Id: <6953cac6.3a2c6.5dd38de3@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd9ea853b14c85a61eb9079c59e966eed336578 commit bcd9ea853b14c85a61eb9079c59e966eed336578 Author: Dimitry Andric AuthorDate: 2025-12-30 12:50:24 +0000 Commit: Dimitry Andric CommitDate: 2025-12-30 12:50:45 +0000 zfs: rename several printf attribute declarations to __printf__ For kernel builds, we redefine `__printf__` to `__freebsd_kprintf__`, to support FreeBSD kernel printf(9) extensions with clang. In OpenZFS various printf related functions are declared with __attribute__((format(printf, X, Y))), so these won't work with the above redefinition. With clang 21 and higher, this leads to errors similar to: sys/contrib/openzfs/module/zfs/spa_misc.c:414:38: error: passing 'printf' format string where 'freebsd_kprintf' format string is expected [-Werror,-Wformat] 414 | (void) vsnprintf(buf, sizeof (buf), fmt, adx); | ^ Since attribute names can always be spelled with leading and trailing double underscores, rename these instances. Note that in FreeBSD proper we usually use `__printflike` from , but that does not apply to OpenZFS. Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54388 --- sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h | 16 ++++++++-------- sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h | 4 ++-- sys/contrib/openzfs/include/sys/spa.h | 4 ++-- sys/contrib/openzfs/include/sys/vdev.h | 2 +- sys/contrib/openzfs/include/sys/zfs_debug.h | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h index 93dd1196d977..fa55b3917669 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h @@ -52,28 +52,28 @@ extern "C" { #ifndef _ASM extern void cmn_err(int, const char *, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vzcmn_err(zoneid_t, int, const char *, __va_list) - __attribute__((format(printf, 3, 0))); + __attribute__((format(__printf__, 3, 0))); extern void vcmn_err(int, const char *, __va_list) - __attribute__((format(printf, 2, 0))); + __attribute__((format(__printf__, 2, 0))); extern void zcmn_err(zoneid_t, int, const char *, ...) - __attribute__((format(printf, 3, 4))); + __attribute__((format(__printf__, 3, 4))); extern void vzprintf(zoneid_t, const char *, __va_list) - __attribute__((format(printf, 2, 0))); + __attribute__((format(__printf__, 2, 0))); extern void zprintf(zoneid_t, const char *, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vuprintf(const char *, __va_list) - __attribute__((format(printf, 1, 0))); + __attribute__((format(__printf__, 1, 0))); extern void panic(const char *, ...) - __attribute__((format(printf, 1, 2), __noreturn__)); + __attribute__((format(__printf__, 1, 2), __noreturn__)); #define cmn_err_once(ce, ...) \ do { \ diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h index a9619d7d0219..4ae96c91a5f3 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/kmem.h @@ -55,9 +55,9 @@ MALLOC_DECLARE(M_SOLARIS); typedef struct vmem vmem_t; extern char *kmem_asprintf(const char *, ...) - __attribute__((format(printf, 1, 2))); + __attribute__((format(__printf__, 1, 2))); extern char *kmem_vasprintf(const char *fmt, va_list ap) - __attribute__((format(printf, 1, 0))); + __attribute__((format(__printf__, 1, 0))); extern int kmem_scnprintf(char *restrict str, size_t size, const char *restrict fmt, ...); diff --git a/sys/contrib/openzfs/include/sys/spa.h b/sys/contrib/openzfs/include/sys/spa.h index 2a4cc60c4aa8..db30b5a066de 100644 --- a/sys/contrib/openzfs/include/sys/spa.h +++ b/sys/contrib/openzfs/include/sys/spa.h @@ -1127,9 +1127,9 @@ extern void spa_set_allocator(spa_t *spa, const char *allocator); /* Miscellaneous support routines */ extern void spa_load_failed(spa_t *spa, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void spa_load_note(spa_t *spa, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void spa_activate_mos_feature(spa_t *spa, const char *feature, dmu_tx_t *tx); extern void spa_deactivate_mos_feature(spa_t *spa, const char *feature); diff --git a/sys/contrib/openzfs/include/sys/vdev.h b/sys/contrib/openzfs/include/sys/vdev.h index 510474d6c085..86f2235f03ac 100644 --- a/sys/contrib/openzfs/include/sys/vdev.h +++ b/sys/contrib/openzfs/include/sys/vdev.h @@ -54,7 +54,7 @@ extern int zfs_nocacheflush; typedef boolean_t vdev_open_children_func_t(vdev_t *vd); extern void vdev_dbgmsg(vdev_t *vd, const char *fmt, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(__printf__, 2, 3))); extern void vdev_dbgmsg_print_tree(vdev_t *, int); extern int vdev_open(vdev_t *); extern void vdev_open_children(vdev_t *); diff --git a/sys/contrib/openzfs/include/sys/zfs_debug.h b/sys/contrib/openzfs/include/sys/zfs_debug.h index 0f021d15157b..6fe5cf062c17 100644 --- a/sys/contrib/openzfs/include/sys/zfs_debug.h +++ b/sys/contrib/openzfs/include/sys/zfs_debug.h @@ -68,7 +68,7 @@ extern int zfs_dbgmsg_enable; extern void __set_error(const char *file, const char *func, int line, int err); extern void __zfs_dbgmsg(char *buf); extern void __dprintf(boolean_t dprint, const char *file, const char *func, - int line, const char *fmt, ...) __attribute__((format(printf, 5, 6))); + int line, const char *fmt, ...) __attribute__((format(__printf__, 5, 6))); /* * Some general principles for using zfs_dbgmsg(): From nobody Tue Dec 30 13:17:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXS5pYKz6LtwW for ; Tue, 30 Dec 2025 13:17: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgYXS40Yxz3TkQ for ; Tue, 30 Dec 2025 13:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BsA539rFm6XFgsOu1blV7Qur7S0jZMOkwzIocpHzgMc=; b=R+354odsEEvrcoECgEzEt+3oSyDgxOB8+A2JfTaCaHWwxDOJBv2SklhnEjL+c2L3CjsfVs p5ECVaEJVAqWz53JKBb4wwlg4kn6Z6ZCqO4SzbY370HZazwja/2Omd+872pdTMMzsyQaL9 soRR3KZB+osUzPtrej6JHnM2po1zNLdlVJEUG2mfGTo/x/0n67xgbCG8Q1SmsBCw4VHNQM PrVx699cqavqjg16XrhAQd0OLbh4ifGV+ZkrN10muf8cK9+b8XFU1Y9ZfhntRsAr2Qo81C 1yVFrDf8hWJfREdsq2gaeR6zOww7NRTAd01hxfBF0u8Wn+6L3erCdHJg+/tDwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BsA539rFm6XFgsOu1blV7Qur7S0jZMOkwzIocpHzgMc=; b=mgcDQqdunptGFPPEqnQ7mh/46lAmuvEtdMKFq17MPKyeBpGhtUVfJfqfFJ/vGck4QN6M00 Q9RD9LN4V5nY5lmISqper9ymGLwzGCQeUTsIysCqCYqBNSDWTISG24pETqb+iQceBKfcTh KSbXmM6GjbSHZdx1MfyBhB1DTnOubTSjk2YLl7NXN0TitgCot8b1ivzhNBsxuTFUjGbZ4F KMeSUbNz/nUp5bhbFcwcrpEmT0Yeu3fLkhRgw4+iOFsIPN01r4z8OP+yau3fjJIrrlqYcE E5N6MtPef3MJdm9Zaju+OoSAABbYqgHxlrdWJMA3gknnPCUwi7K+1mRv2u9x4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767100632; a=rsa-sha256; cv=none; b=Vdwg7QqCz1IxtN0rQEUiIwS8FsgdBkbwDOo+S/M7490fzb+PsAaGf6UB3uI9dihlFmYswd iBREN801DtdnJNPuSlc5GSlCP58qqCQxvEGsq/jaYXL6mdunZg7DOSCJRCaUL3Z0EIZ8+S ngnozTDppxCtbyxWwyXZVWcaGjRzBxbL2UMV/5HCWaRwfN/5tJuAaquvnQsHyKPkJ2k97D LMcdrjpU1BygtEEs2NpbdOrAvW2aPBiTm9kRA/WNss9PGFsxrMoJamKhlQMEfnQJU0ymAn lzGGVz8QNs5Hd7FOXaXnC/ehmkjFKz/G5KZ6MKv5JCEYJbjWdeq/jBvYN6ODkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXS3SW6z12JK for ; Tue, 30 Dec 2025 13:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c15f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 13:17:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c2e7a52374b3 - main - pf: move DIOCRCLRASTATS into libpfctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2e7a52374b3e4bef41c5cad4c24f158c870b476 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 13:17:12 +0000 Message-Id: <6953d0d8.3c15f.4e8f391c@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c2e7a52374b3e4bef41c5cad4c24f158c870b476 commit c2e7a52374b3e4bef41c5cad4c24f158c870b476 Author: Kristof Provost AuthorDate: 2025-12-29 09:45:48 +0000 Commit: Kristof Provost CommitDate: 2025-12-30 13:16:52 +0000 pf: move DIOCRCLRASTATS into libpfctl Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 25 +++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 2 ++ sbin/pfctl/pfctl_radix.c | 18 +----------------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 7e5a07ccd55a..6aac9a9c04ae 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3843,3 +3843,28 @@ pfctl_get_astats(struct pfctl_handle *h, const struct pfr_table *tbl, return (0); } + +int +pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, + struct pfr_addr *addr, int size, int *nzero, int flags) +{ + struct pfioc_table io; + + if (size < 0 || !tbl || (size && !addr)) { + errno = EINVAL; + return (-1); + } + + bzero(&io, sizeof io); + io.pfrio_flags = flags; + io.pfrio_table = *tbl; + io.pfrio_buffer = addr; + io.pfrio_esize = sizeof(*addr); + io.pfrio_size = size; + if (ioctl(h->fd, DIOCRCLRASTATS, &io) == -1) + return (-1); + if (nzero) + *nzero = io.pfrio_nzero; + return (0); +} + diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 9576118fe146..b885497ab0e8 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -587,5 +587,7 @@ int pfctl_clear_addrs(struct pfctl_handle *h, const struct pfr_table *filter, int pfctl_get_astats(struct pfctl_handle *h, const struct pfr_table *tbl, struct pfr_astats *addr, int *size, int flags); +int pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, + struct pfr_addr *addr, int size, int *nzero, int flags); #endif diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 3ea127dd2451..4ae301756200 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -201,23 +201,7 @@ int pfr_clr_astats(struct pfr_table *tbl, struct pfr_addr *addr, int size, int *nzero, int flags) { - struct pfioc_table io; - - if (size < 0 || !tbl || (size && !addr)) { - errno = EINVAL; - return (-1); - } - bzero(&io, sizeof io); - io.pfrio_flags = flags; - io.pfrio_table = *tbl; - io.pfrio_buffer = addr; - io.pfrio_esize = sizeof(*addr); - io.pfrio_size = size; - if (ioctl(dev, DIOCRCLRASTATS, &io) == -1) - return (-1); - if (nzero) - *nzero = io.pfrio_nzero; - return (0); + return (pfctl_clr_astats(pfh, tbl, addr, size, nzero, flags)); } int From nobody Tue Dec 30 13:17:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXV303qz6LtwZ for ; Tue, 30 Dec 2025 13:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgYXT6DsNz3Thb for ; Tue, 30 Dec 2025 13:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUw+a3pXs/Ct6pFqKW42mcVQ7zC7U42emv8hgh/vdxw=; b=tt2uYHw09PWwVy5FpYa3n7ZkicrWrSgqRyy1JekvKDZCRIse+zFgWTHJEUxJY215rXsvtw +Q81GoAGh5NHE0YBCeq/vydk3fuGPBl/xHA8AX4QSEuqp27i2dwJxTLKhKz9ZuWgWGmp3r 4Sdt/RnY9cpnz+2B+9vuIQFsrRQQoLzQsmXYfZClv74nxswSkHx5VFF9RbJoCypS30f/0S tSfZYZsCdm3XGGHz4SE0Zzxc5SLhjx2Q/hOzn2xxThX2aMoGQzEOny+dgLNtKJCzHLFvtT lwFIyI5eSC+tnvhwFAh6DHwAFUp1PbQsin6goYkN1IfKbM8zC0SApHuRb0uNhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUw+a3pXs/Ct6pFqKW42mcVQ7zC7U42emv8hgh/vdxw=; b=VVfzi+WrFYgU0rEjuQetrK7zwpdE+xbQQIRXoQh5onGcVyI/NiI8/y8ZjxTZyi/hD+WpfG iIpes5xyeefBkYgCe7b+amZbe5Jtl2+QswUI30t1sqnllXCBBrVqedmX+LQOpe8pr7Wk1j iZkjd4hmE866QMVFVdUKyHNlW3jvzJjr6E1BIAKZVwwB6CqpPn0bf+/9FPS7gPxI9SQX4U D50aSsGxPlTgqBlBGRC2IVGVhedtI9VSgjUijuB0iukdPHUwcL49PvJ7PYRD7DestPuTw8 mTpcFQICRfom+hBx+YFjiP+wGBj44YzRlN4L02B3ddQAJgTtFrt0it/e8A9zfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767100633; a=rsa-sha256; cv=none; b=gJhiSfevyG2N1AvVPqefdYR8iAM9T1P0nx97m1vvqim548zqMScr4nkkXQm2JT+/sdC2Tp iLFG84CFISHbleJ3+z4OhKd2pPhX1NhH+F1KGKqVw5SqWZNBW1tgomDbk7jtEzS/u/DCgN mL8bHcyC5kzaEhN4WLYWKfoAiNFiJMcikmbI+MjHYeLbmAIUf2/xpZknnUIqneTCPNvhTw RNh56xhQ40k4F0cVAtXwvM53xY30wqzS/O1zW7QXcdz1Chb0vYleVzBEkoQyJ/gcPOdPY4 kIMpqq0e1LSar5F4YJ2Wi9TlMSwImkZflXlh/QgYV1Jbp7oLbO0jMZQtA0QdYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXT4Fpfz12Yj for ; Tue, 30 Dec 2025 13:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d07b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 13:17:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 96c7e70c18a4 - main - pf: convert DIOCRCLRASTATS to 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96c7e70c18a42e8cad9305db2a3b30328d76d84f Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 13:17:13 +0000 Message-Id: <6953d0d9.3d07b.555f9bcb@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=96c7e70c18a42e8cad9305db2a3b30328d76d84f commit 96c7e70c18a42e8cad9305db2a3b30328d76d84f Author: Kristof Provost AuthorDate: 2025-12-29 16:50:08 +0000 Commit: Kristof Provost CommitDate: 2025-12-30 13:16:53 +0000 pf: convert DIOCRCLRASTATS to netlink Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 78 +++++++++++++++++++++++++++++++++++++----------- sbin/pfctl/pfctl_radix.c | 8 ++++- sys/netpfil/pf/pf_nl.c | 40 +++++++++++++++++++++++++ sys/netpfil/pf/pf_nl.h | 2 ++ 4 files changed, 109 insertions(+), 19 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 6aac9a9c04ae..f8c92a5cd319 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3757,7 +3757,8 @@ struct nl_astats { struct pfr_astats *a; size_t max; size_t count; - uint64_t total_count; + uint32_t total_count; + uint32_t zeroed; }; #define _OUT(_field) offsetof(struct pfr_astats, _field) @@ -3792,6 +3793,7 @@ snl_attr_get_pfr_astats(struct snl_state *ss, struct nlattr *nla, static struct snl_attr_parser ap_table_get_astats[] = { { .type = PF_TAS_ASTATS, .off = 0, .cb = snl_attr_get_pfr_astats }, { .type = PF_TAS_ASTATS_COUNT, .off = _OUT(total_count), .cb = snl_attr_get_uint32 }, + { .type = PF_TAS_ASTATS_ZEROED, .off = _OUT(zeroed), .cb = snl_attr_get_uint32 }, }; #undef _OUT SNL_DECLARE_PARSER(table_astats_parser, struct genlmsghdr, snl_f_p_empty, ap_table_get_astats); @@ -3844,27 +3846,67 @@ pfctl_get_astats(struct pfctl_handle *h, const struct pfr_table *tbl, return (0); } -int -pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, - struct pfr_addr *addr, int size, int *nzero, int flags) +static int +_pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, + struct pfr_addr *addrs, int size, int *nzero, int flags) { - struct pfioc_table io; + struct snl_writer nw; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + uint32_t seq_id; + struct nl_astats attrs; + int family_id; - if (size < 0 || !tbl || (size && !addr)) { - errno = EINVAL; - return (-1); + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); + + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_TABLE_CLEAR_ASTATS); + + snl_add_msg_attr_table(&nw, PF_TA_TABLE, tbl); + snl_add_msg_attr_u32(&nw, PF_TA_FLAGS, flags); + for (int i = 0; i < size; i++) + snl_add_msg_attr_pfr_addr(&nw, PF_TA_ADDR, &addrs[i]); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + seq_id = hdr->nlmsg_seq; + + if (! snl_send_message(&h->ss, hdr)) + return (ENXIO); + + while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { + if (! snl_parse_nlmsg(&h->ss, hdr, &table_astats_parser, &attrs)) + continue; } - bzero(&io, sizeof io); - io.pfrio_flags = flags; - io.pfrio_table = *tbl; - io.pfrio_buffer = addr; - io.pfrio_esize = sizeof(*addr); - io.pfrio_size = size; - if (ioctl(h->fd, DIOCRCLRASTATS, &io) == -1) - return (-1); if (nzero) - *nzero = io.pfrio_nzero; - return (0); + *nzero = attrs.zeroed; + + return (e.error); +} + +int +pfctl_clr_astats(struct pfctl_handle *h, const struct pfr_table *tbl, + struct pfr_addr *addrs, int size, int *nzero, int flags) +{ + int ret; + int off = 0; + int partial_zeroed; + int chunk_size; + + do { + chunk_size = MIN(size - off, 256); + ret = _pfctl_clr_astats(h, tbl, &addrs[off], chunk_size, + &partial_zeroed, flags); + if (ret != 0) + break; + if (nzero) + *nzero += partial_zeroed; + off += chunk_size; + } while (off < size); + + return (ret); } diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 4ae301756200..e8d3a1b8dcc3 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -201,7 +201,13 @@ int pfr_clr_astats(struct pfr_table *tbl, struct pfr_addr *addr, int size, int *nzero, int flags) { - return (pfctl_clr_astats(pfh, tbl, addr, size, nzero, flags)); + int ret; + + ret = pfctl_clr_astats(pfh, tbl, addr, size, nzero, flags); + if (ret != 0) + errno = ret; + + return (ret); } int diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 6bd858373bd2..0a8538607ed7 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -2434,6 +2434,39 @@ out: free(pfrastats, M_PF); return (error); } +static int +pf_handle_table_clear_astats(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct nl_parsed_table_addrs attrs = { 0 }; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + int error; + + error = nl_parse_nlmsg(hdr, &table_addr_parser, npt, &attrs); + if (error != 0) + return (error); + + PF_RULES_WLOCK(); + error = pfr_clr_astats(&attrs.table, &attrs.addrs[0], + attrs.addr_count, &attrs.nchange, + attrs.flags | PFR_FLAG_USERIOCTL); + PF_RULES_WUNLOCK(); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_TABLE_CLEAR_ASTATS; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + nlattr_add_u32(nw, PF_TAS_ASTATS_ZEROED, attrs.nchange); + + if (!nlmsg_end(nw)) + return (ENOMEM); + + return (error); +} static const struct nlhdr_parser *all_parsers[] = { &state_parser, @@ -2708,6 +2741,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_TABLE_CLEAR_ASTATS, + .cmd_name = "TABLE_CLEAR_ASTATS", + .cmd_cb = pf_handle_table_clear_astats, + .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_NETINET_PF, + }, }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index 5ca14758932a..216f3d13db32 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -72,6 +72,7 @@ enum { PFNL_CMD_TABLE_SET_ADDR = 34, PFNL_CMD_TABLE_GET_ADDR = 35, PFNL_CMD_TABLE_GET_ASTATS = 36, + PFNL_CMD_TABLE_CLEAR_ASTATS = 37, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) @@ -504,6 +505,7 @@ enum pf_table_astats_t { PF_TAS_ASTATS = 2, /* nested, pfr_astats_t */ PF_TAS_FLAGS = 3, /* u32 */ PF_TAS_ASTATS_COUNT = 4, /* u32 */ + PF_TAS_ASTATS_ZEROED = 5, /* u32 */ }; #ifdef _KERNEL From nobody Tue Dec 30 13:17:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXW16XYz6LvNl for ; Tue, 30 Dec 2025 13:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgYXV5V6Nz3TsW for ; Tue, 30 Dec 2025 13:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2CthdihQa1SgzRxOWtJ6R0nJ8unGVJhMhOkofCt+UmI=; b=xyg2lQmocbkYFkGvUnx7hhiG1szsCHOxTUKZzpzI2gCDPszKqifESDT0b/jpQx/1W+yHEH tsut8j5/PSYLC0hpPLiE+IOXOddU+Qtpz/fT2/s+kF/z5DAVF1HuM7p0z1KoAsgjeU0r8m EfiwS5B7WajHBsgTag1Clwv1Fz/AiMn4CYUXThhxJoeIOud8MDL+RfyfCFnI5+VOeqaQdm yulHfinRZZpM7t8NAamMxB8hHMqKJuqhbGrcH5zgmZ+HODjpukn3LN4nlSg8bvHZYpnN1K yPZYdGxisAWjXg0WnpXvRG2S+kw9pPEL+FB8LCAY8jZ3Ditu4f6MXvwjffE5Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2CthdihQa1SgzRxOWtJ6R0nJ8unGVJhMhOkofCt+UmI=; b=c0PdXE3mj1PKHjLRchAJHURB2ZpYjnEOpd+1eDC7sq8Z0ceO4g1jITI9mWSUIQz59FEyAL 0VWhO+11LPZcMAg09c12OZfOS8rHya+2YdoyG/u9bPedwd72iuzJI8ZrDE4TuI8MABna0/ zF9qdGwrIp26lh5IDvcGfd0BQR/a7UvcXlO+5ddIHyZjEfdX4trlT2OcUkSMXPU4nTcZLf poReGcgdVamNa9GpeEU8UiA1EH90frVR6BOjXrl9Jt0RV2ssrhYxjfLWfqc/5uKEmfANcK zYXMeB8DpgBhzz46La/8dkqMeXUzrrbVTy3GtvJoiR6mj5DJ69mLHV0fgCI4lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767100634; a=rsa-sha256; cv=none; b=LvRfBdoVU87/jW/PKtSOt+d0hpL5nRM8SsjAM9nc/Mw7SHjNbFlLba1B2JwUYclsagoNMS bOAvJfYyDnPqG7krnvWSzGwEjw4+xVy4glB7MaipGAu1+YzvAaYMDPsLz1r5ClssNQR4W3 rKrGvSUFbsxYTmLSzXJU29sUbtHNIpUyBEUFL/TRHOM3dx+oBerf9NtwepKsYFjjTqJeAN oLbCf4PSp2tPFcwx4+gaMp1z0xHs1Vktsrwgr9q6SU5RfTRnp6TwT2MQi/eGVtcgZh3tJV VyGzOWhihLRxDQBvXGBGUGu8dGYnG0nNZdDkDPx3kEX669Rz5wqgfIwq5gZOBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXV51Gmz11xk for ; Tue, 30 Dec 2025 13:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c163 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 13:17:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2eec2bcca297 - main - pf tests: avoid cleanup failures on skipped 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2eec2bcca2972b58fb8e9acb65c208af423f2181 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 13:17:14 +0000 Message-Id: <6953d0da.3c163.726cd9e1@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2eec2bcca2972b58fb8e9acb65c208af423f2181 commit 2eec2bcca2972b58fb8e9acb65c208af423f2181 Author: Kristof Provost AuthorDate: 2025-12-30 10:30:15 +0000 Commit: Kristof Provost CommitDate: 2025-12-30 13:16:53 +0000 pf tests: avoid cleanup failures on skipped tests If we skip the nat:binat_* tests (e.g. because pf.ko isn't loaded) the inetd_tester.pid file isn't created. We still run the cleanup function, which tries to use this file to clean up the test environment. This results in 'broken: Test case cleanup did not terminate successfully'. Avoid this by checking if the pid file exists before using it. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/nat.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 3d953b495953..025471f75f97 100644 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -804,8 +804,8 @@ binat_compat_body() binat_compat_cleanup() { + [ -f ${PWD}/inetd_tester.pid ] && kill $(cat ${PWD}/inetd_tester.pid) pft_cleanup - kill $(cat ${PWD}/inetd_tester.pid) } atf_test_case "binat_match" "cleanup" @@ -872,8 +872,8 @@ binat_match_body() binat_match_cleanup() { + [ -f ${PWD}/inetd_tester.pid ] && kill $(cat ${PWD}/inetd_tester.pid) pft_cleanup - kill $(cat ${PWD}/inetd_tester.pid) } atf_test_case "empty_pool" "cleanup" From nobody Tue Dec 30 13:17:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXX5wzqz6LvD8 for ; Tue, 30 Dec 2025 13:17: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgYXR4Whbz3Tq2 for ; Tue, 30 Dec 2025 13:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3lphhODO2G2tvCpM2IhaP7/ZQmYV6UrXln1J3mfhUk=; b=p45PHDexd6E8OMmN9gqHP1GZcuv9OYN3/KUggftCmCXazwua6Ouu2UtG+pJ407RBX2Cg/8 YRLavNymUKOHrCrBYnynLx6WPn7tWuvmIoxILSUGFvZkvgjNMsc58dV0/PHWjNMsZw7eAS DnLNfunTcu4SUqC1pc08m/0ofoJo7T5dXgDKuEXyUN0Gw1zn3THOXoqkP/1rvdSieMQQsJ oFlvzjX5TpHzRAMTiG0GVrF1+mXMZLFdltLUAQp9SAmojxIOXdQsE/5ZnD2Dftfg7jiqqu Zw/8IAlO8mF26oshD6TMFD+TXuhsaFNInkZxsDu907qQXUU+GTXoCMHvVKwnbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767100631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3lphhODO2G2tvCpM2IhaP7/ZQmYV6UrXln1J3mfhUk=; b=XOJZJVPSt2fRMqcX+czwk9OaoVy4Zjwa7qSWo8MHkvbf/TfJO1ZbZAEqe6xZPUQa1D5C5B e04Mj+if5gPoZpJwBi5oAO7SVwIDnRViUY+5n1ARBP3uugYfe/6cX5PV374U+43Qts0+U/ hfM5wBjJI/HAUTImiwvCUl8Uh61N2sk0QGYytwZa05G/DJWLVA+Hd2FfEoDR5uHcLw2hRH MlV56+Po/IhcwieN1gMX+7MEjel5CmcOTX9jGSDMR3dXEag+zCgwDsDeoK7tm6S6I2pHoT Qkd85qXrEzp19U/dgDL+iqX+Re/x4skdcQvvw0JG0sX3W/LJXy4WiRvPKxH+HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767100631; a=rsa-sha256; cv=none; b=dZvcH0FhrEB7wAlFp7K5MA2PgLUjkGw4yQOQhDSTMIKAdgYQWmbD3UIO+RQNhg+37HGr4o yemszfvkhMVnSv7zeflS9HAPmDPDHduEVHGQYJtWbtdUgmplOa5h/2sKyTbWkWfgtsZzjX REZGLKVwLh9eupu1u05hk3xzt2giZQ2RomR+XqtD6MkpTD0Vhtn7pz1OfJi8FDZ3KeiM5I OKFFjY74abctSMqjEdCywJt/QbNZiLSyf5HFoHdzrQ/trdmDzCCZzFOmu+Pl0PQsDiDZQt mdDOPfM+WKsKalFozkruXJpSwYBxD7A5DjVEk2n8QCsMDGrbo3h/HeaCrgh/qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgYXR3Kh4z121p for ; Tue, 30 Dec 2025 13:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d21f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 13:17:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 190c1f3d9326 - main - pfctl: allow network programs select DSCP_VA for network ToS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 190c1f3d9326afbc1eabd48e5cb3fe96043508c9 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 13:17:11 +0000 Message-Id: <6953d0d7.3d21f.ecdf8cc@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=190c1f3d9326afbc1eabd48e5cb3fe96043508c9 commit 190c1f3d9326afbc1eabd48e5cb3fe96043508c9 Author: Kristof Provost AuthorDate: 2025-12-29 09:52:39 +0000 Commit: Kristof Provost CommitDate: 2025-12-30 13:16:52 +0000 pfctl: allow network programs select DSCP_VA for network ToS OK stsp@ Obtained from: OpenBSD, phessler , f8a2f73b65 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 127e2c257d69..c52eb3f86c60 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -7604,6 +7604,7 @@ map_tos(char *s, int *val) { "cs6", IPTOS_DSCP_CS6 }, { "cs7", IPTOS_DSCP_CS7 }, { "ef", IPTOS_DSCP_EF }, + { "va", IPTOS_DSCP_VA }, { "inetcontrol", IPTOS_PREC_INTERNETCONTROL }, { "lowdelay", IPTOS_LOWDELAY }, { "netcontrol", IPTOS_PREC_NETCONTROL }, From nobody Tue Dec 30 23:28:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgq6C5DhHz6LgJ1 for ; Tue, 30 Dec 2025 23:28: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgq6C2zFrz3r0g for ; Tue, 30 Dec 2025 23:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767137331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wkFtblDOfz2UgnJSAG7+k/v9OFAKEtvUiu+bqEBfv+0=; b=VuUY8+0YWXE/SHSKNjndw8M+5pOp1GFHjkkSzf/8eUB1fI50ZjuApDbfhrKOK+prepfGhN l3r8Zqmj++teDFmu+QqnwLdC0sB6jXgZAtBdeGoyoJVoYDwlkZiRPrBIMYP3P26nPOYfmF 3x2R2u+HvZ6bUrcAKhA1NrzhAnwv4H0cNMivx2Ai9Tf4+gzlRyJtS6+sinbTLrJ5ugDBHJ 6kvcL07IsF/l6qe2EFNyBa8BP0I6DiXPMsw9CxKvvqxauaMdqgPLq0uMBe6soFmgedcR35 yt/9w+hufr39ThPWcvMW+iBba6q2ZwJk3nhbZdv/aSkfGOxcpdlYGaD+1MgOdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767137331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wkFtblDOfz2UgnJSAG7+k/v9OFAKEtvUiu+bqEBfv+0=; b=lke4VQaKIMf+dBbNMkJ6rpiOp/UHrN/27Meca0ptVA/DHYU1wjuPp65uGGB0ubdDCtk4FC Tbu91UfeS8B2xB3wmyW7MmnvkY4uSdW7T1IhS9WXffvKZNGfoxXNiveOJNzaH6Yps12v4R EMZPW4w25+NvXag5+iLqTNOAKag7khVPPmUXLpCrTQYKfibTUAjeFWiBOj/IQH/qhjAXhW JAmLhQ64wrrQRcjtV2Z+VZ1iUUZ1pSFM/PNkJBq/AQ0CgYZjVWUQDaaWK09jEsxzgiGvmW krN/PDwkkOGFhIleLR60rkuf0Sh+DLbalAlfFwKCy6bkaRMxjer0DtX6MWUSKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767137331; a=rsa-sha256; cv=none; b=DVwfRdt5LjXgwULS8S4GyFMo+dyuk3EmQaBBIM57XjX+uVhFF3DiHYojlzIlwdLKfVJRMi 93X1Yd43bmHfXwW184//rX8Dr9xQeWiOyP4UkaNgVvSsRM5BWjxbPv5Pws6Qq4zUKQtxEG QQv+jp+hf16Dj6QbCpqv7G9orh9AO0kGqwOYDGm8PhRxOd+mTRHAG2ZYEJaL3yTdoUS1MT +yuWpAsC6gxLRrdECfcvt9BCj+VBc9ZTWATw4mMM5U+BNsxy4g/8S+pwnHxFlRyQQprpzB oryoNe3TUDd4+LEqkIENQ7t8pfPcrVDVO0KKXB0raDOSPHuwEiTiah2rIyYevg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgq6C2G5Kz6Nb for ; Tue, 30 Dec 2025 23:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30b74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 23:28:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4fecc8e3fe94 - main - pfctl: remove duplicate "va" entry List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fecc8e3fe9408621429777b1028c9afb83c3925 Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 23:28:51 +0000 Message-Id: <69546033.30b74.4116c0bb@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4fecc8e3fe9408621429777b1028c9afb83c3925 commit 4fecc8e3fe9408621429777b1028c9afb83c3925 Author: Kristof Provost AuthorDate: 2025-12-30 21:23:58 +0000 Commit: Kristof Provost CommitDate: 2025-12-30 22:09:15 +0000 pfctl: remove duplicate "va" entry It turns out we'd already added this a few years ago, so didn't need to add it again. Fixes: 190c1f3d9326 Reported by: Seth Hoffert Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 1 - 1 file changed, 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index c52eb3f86c60..127e2c257d69 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -7604,7 +7604,6 @@ map_tos(char *s, int *val) { "cs6", IPTOS_DSCP_CS6 }, { "cs7", IPTOS_DSCP_CS7 }, { "ef", IPTOS_DSCP_EF }, - { "va", IPTOS_DSCP_VA }, { "inetcontrol", IPTOS_PREC_INTERNETCONTROL }, { "lowdelay", IPTOS_LOWDELAY }, { "netcontrol", IPTOS_PREC_NETCONTROL }, From nobody Wed Dec 31 02:44:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgvSD11HRz6LvnT for ; Wed, 31 Dec 2025 02:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgvSD01DWz3Db3 for ; Wed, 31 Dec 2025 02:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767149084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bNKKLijqGsytxYnRnY8p695dS6r5HHaZmQCKC53yrbg=; b=JbSDUmC6JMyx86pxPqywqqjVUQQBZ13vt9dOoe/pfw6LTL158EmYWVh68tAE5zQb1Bx826 tP4QsNAzTHYpvUgbFHX73FgtpeABzByI2uwIjq2vmDXNRNCDGVFbG92QPlFy4ImJSbquqG wSdaSqa6xviZS3tMWlyJwSba0OJmZS1W4UWHkQJxkBpQNcwxy9vodqbwyqm+IjLUc0EGOv vLzGz8bFLEtZW544pXNFB10hH7J+X/XJi3DH6HWiRK1FGxj9Z0b6VZjOH1N0O1o7+hqz6I iWhQHvFfc7Cr06DbmEOg3Y4iWvRMcv9L/0TbrB8uue7t9v9r2UsKOIztZ5yHPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767149084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bNKKLijqGsytxYnRnY8p695dS6r5HHaZmQCKC53yrbg=; b=FGtYkCB5xAWvy3QiwGG8B0CMras64C4pF2h1KeVAWTeedlGftOVU3VsPJmKhfbVUin8jaM tcqi6KLeQPNvYMvmOgi9PoDx5kf8MY87zCRi+UGw5mv+b6m4VcrSaPvWn7b1ciyF9Oad7U PEVluhA4UYLReGRT8WeL+90EJtpIb9CVqWzWCKkzjhzykxemAZguiXVkhaDTFHnDYgQpp8 lOV7ikqygtvJUptbWZySIopj8nUXlxK5kpXo0MeZ++rMF9Qp0G10oHKeiCTCUcYCgrPPJW lk3XaezSk1DkmVLvn6mnDCMhjIdcrExZa5UZW6I1emReyrkpEMM4qUyamMiXdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767149084; a=rsa-sha256; cv=none; b=SWNAo0PinLb695Cj/QnAbNeF9cE+UWYuuRArvhVxZM2+jq3klFssXGgfX8cibKQ1aK5kZM ZeoCQSQyyUZvjrcZj+2SEmCP3XnHJKEaKrPD5LmeOFfcgr8m+FACpyew/E2hG0g5bXACCI rMltYbcFOP5Ka9YuXgZBranTXCwv3uwV7wbB3P7NkOH7CY+SeuGJp4Tv0sgB9jJKn/l8A7 PLZFPhqp1bJ+WVxk1oZsy3k1r1XqSx7nSdNAg+GaI9bL1u8jOFMMt3lSvbDXsdsQY6kMRJ qDH0ZUaHsLvjEPxUrawVhmBThDrm8FPq9I6G8nwaAjChP02JT8KxB4ldV9XUOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgvSC6GF0zCVK for ; Wed, 31 Dec 2025 02:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44ab8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 31 Dec 2025 02:44:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: e8567de718a4 - main - nfscl: Fix handling of POSIX draft default ACLs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8567de718a4a16edbf5490e1c36360563e16667 Auto-Submitted: auto-generated Date: Wed, 31 Dec 2025 02:44:43 +0000 Message-Id: <69548e1b.44ab8.74afc39c@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=e8567de718a4a16edbf5490e1c36360563e16667 commit e8567de718a4a16edbf5490e1c36360563e16667 Author: Rick Macklem AuthorDate: 2025-12-31 02:43:23 +0000 Commit: Rick Macklem CommitDate: 2025-12-31 02:43:23 +0000 nfscl: Fix handling of POSIX draft default ACLs A POSIX draft default ACL may not exist. As such, an ACL with zero ACEs needs to be allowed. This patch fixes acquisition of POSIX draft default ACLs when they do not exist on the directory. Fixes: a35bbd5d9f5f ("nfscommon: Add some support for POSIX draft ACLs") --- sys/fs/nfsclient/nfs_clvnops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 7484a5a7e082..1bd77ab27ced 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3779,7 +3779,8 @@ nfs_getacl(struct vop_getacl_args *ap) return (EINVAL); error = nfsrpc_getacl(ap->a_vp, ap->a_type, ap->a_cred, ap->a_td, ap->a_aclp); - if (error == 0 && ap->a_aclp->acl_cnt == 0) + if (error == 0 && ap->a_aclp->acl_cnt == 0 && + ap->a_type != ACL_TYPE_DEFAULT) return (EOPNOTSUPP); if (error > NFSERR_STALE) { (void) nfscl_maperr(ap->a_td, error, (uid_t)0, (gid_t)0); From nobody Wed Dec 31 03:29:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dgwTd2mqMz6Lytp; Wed, 31 Dec 2025 03:31:01 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgwTd2DqVz3L0D; Wed, 31 Dec 2025 03:31:01 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767151861; h=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=3yMFx4K+MNS0PyAcemIY5Dwi4KiLkd7wQoINr0OR02U=; b=GhA913Fl6VHwYcgqWVTm2MI5wZR+CGOCTD6OhMlCXRmp1PP4juUuoah0Vx2+7Kj7yvdg/w 0I9zreheTzr32pw8lMbwLcyqfdBWMWh2jNrHY6uG1nJjd4l9Zw87vhL0U14EIXCbb6LGLX gX7M1xveVkJydXbTbdn5TAOXO+VLMQOtK7W81Fp8k4TSBLmu420NCa6Tf+W5hW459DZmfh GGUJXSj+ZgVdh2XV1Oib4N59iVW0RQQJwlRkbEzn5BABgdKC0DP0oOW2m4dTT8DKvDREJ6 N+wOVfTqRmADGozBrNne7utimes28J+5wtY0zsYQjd7IFFtbdViJ82FUcKcmFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767151861; h=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=3yMFx4K+MNS0PyAcemIY5Dwi4KiLkd7wQoINr0OR02U=; b=XmKh5Cr+06WPbCSWqTUSsgJhSS5cf3vyvbDT1PMJimzchCvTMkmg9wSGJbgxAnXTA2/yvA 2B4hRwAu0GSIOjIWFC9UO8JPiNT67pAdPC1EoY/bJ1Zg20FjjtWzGVtRiI0mAk5Z0GUoYC GINLHu+yIAj/HLs0TTCmjM0qw6Yi1ENzdyRFrokmhsc64iaap2fPdV/IlRwDskOZDsssxL aO+XwDBa6rRgmNMqeGd4131VcoBoddLDxOmK2hnDvoSKgepAe2HV3Latn2LPqncHznxnPv Ig8JE7K4daxakjsmpsjqXz9WLwaZKAdfNSzP9b+yuyp5c1JW4tQV7rfdC0ocrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767151861; a=rsa-sha256; cv=none; b=g/R3EEooFpS8Iz8C+OrbXYfdXAUKcg5oJRWIc4Clb2pAw/bUur+IMbMpR8xf6702r0b5HC cJO1QkK4A7ycQk+v0TyIbs1keIPK56tJuqo8PNXv65HC20mt1ub6lK6lHi1b1QI11ijh3y 79SXQgBn1faKdD4T4v+1lpOYkRjao3Pi8QUnD4ga2UaZY0hACo7gK5cQU1GCh/+REZnqsm Yk53bzb8mnNBpszfLGOcIi62sf+g6spq8YXieAfDDHN7KWixvmYDLVvux2PxfU698aQ7uX oYY2gSOY9eeGQ0NK5tJjTUKDO4kJvp0mjWVZiB3rLXRZEBFaRFQ0YiAA6t2L0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4dgwTc5xfZzB6B; Wed, 31 Dec 2025 03:31:00 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Wed, 31 Dec 2025 03:29:56 +0000 From: Lexi Winter To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 424089a0fc82 - main - loader: Fix powerpc64le by working around slof bug in qemu/slof Message-ID: Mail-Followup-To: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <6950c4c5.25792.96d1fae@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="CKlEfo+egKfo3OtD" Content-Disposition: inline In-Reply-To: <6950c4c5.25792.96d1fae@gitrepo.freebsd.org> --CKlEfo+egKfo3OtD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Warner Losh wrote in <6950c4c5.25792.96d1fae@gitrepo.freebsd.org>: > loader: Fix powerpc64le by working around slof bug in qemu/slof > =20 > MFC After: 3 days (maybe EN too) EN would be of limited use here since you can't boot or install on affected systems and we don't rebuild the install media for errata. that said, i'm not opposed to it if someone thinks it would be useful. --CKlEfo+egKfo3OtD Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaVSYtAAKCRD1nT63mIK/ YBFVAQD63+4k1B8kM05NVI5Q9Log/64MAzgn9xi7DCL1XFZCEwEAkYY0ImW4AEa/ OlJgidfWF9x+4SkOranCNKBDnnPhgQQ= =NPfy -----END PGP SIGNATURE----- --CKlEfo+egKfo3OtD-- From nobody Wed Dec 31 17:16:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dhGpY2DPyz6Ly6H for ; Wed, 31 Dec 2025 17:16: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhGpY1Q37z45jM for ; Wed, 31 Dec 2025 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767201413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GU2Q20BzztMFYcYa/OuF+mti6uapzVnRNyEhaadixvw=; b=Pit4+mUH9Wvr+nfPVhWNrOwt11KldulFRF9flWqqC1tyV+AYmZXHtACGz9UafD3Dp06BNF uo4ZYEZRFCmDFMInXqenJiKJetumlwUp0fkMt/2z0PBcXULd1eOpsYRJVe0eYUAVsJS6X2 bOT5vYSpDtSb6LRn/bEcT5f3f4nCbfYmO+bVxhLYPX8ADeuFGOKnUUMdlqksTs/o/UpG5y MDKdz4zZVgxOG5l7POUkEqLvItrw9ZLTvBBM6hINOSzMIui6Qw/Upbh7MSTez5tJz/U3wB JXkhP9Eeyy5MlNKkEgttN+29LQ9hxXIrpw1Ii8AwetGSUVfI7PwsB6mOVce6Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767201413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GU2Q20BzztMFYcYa/OuF+mti6uapzVnRNyEhaadixvw=; b=XzvCFP62SZyT7hTFSpHzR/itOPHz3dxfb0K+JIS5d7QWcASb+LsEh8VfdiaqFSJe5SZ9xq Wnr6xF1wynyRrUKIzWd2NQEtVSAojqtOfhKJGc50TgXMYrZed90FWOF1KPpqDS3KyboWML prxf0ow28opRoEMkZD/MHQV7+H/3j+ay7QXJ7zcpBRfSTduBwJYQ3CoO24qCVKFTd0a0cK s+ddPqCF5N3JYiOUQujT6Ma4EWhl5l4X+q+opAJBH7h42FtUvjztY3OUJUz9RD0p+5Xk+V NG1vyI0g4BkQusSX1a2LwEyo6+na7x22RE9hCR1u/AoJQhgcgoo0ASE5WFp0Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767201413; a=rsa-sha256; cv=none; b=teUFnoO1TBmHjSm2XWujIQyTpd2RB9mmp9fHcDMwcy0ge+98qrmGECT48TpToG+/0Vjx2h +pmEBAMpBLscczPE2A4Gk7Ondz1BQzFEbinF2dlMLhzszybzphpHM4MUsvfehSEVytAwCg tluqm9EVO/3PNiE5pk5lkPsljQoaxmkkjx8Z2+Wu2ulE9kyVRBSJzaUtJ34qELDUuoB3rs ad+qH6ODzNGPWC9BWXQ6mpXGInYsvQFGzrM2rzP+Rz/nk6Ce0kh4iIX7Jt+/nA2zEbJTOJ 8AcXh5uZd6/A3mHLamryzxERXiYsS5gmeWLEzxyhlFQeU/3Dmpt8cgQJV0gJ6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhGpY0nVzzvv1 for ; Wed, 31 Dec 2025 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22037 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 31 Dec 2025 17:16:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 39047538cf5d - main - Merge commit faa5141b9be4 from file git (by Christos Zoulas): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 39047538cf5d8f26112f7b08b3c56967f70f7f94 Auto-Submitted: auto-generated Date: Wed, 31 Dec 2025 17:16:53 +0000 Message-Id: <69555a85.22037.62b46f04@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=39047538cf5d8f26112f7b08b3c56967f70f7f94 commit 39047538cf5d8f26112f7b08b3c56967f70f7f94 Author: Jessica Clarke AuthorDate: 2025-12-31 17:14:55 +0000 Commit: Jessica Clarke CommitDate: 2025-12-31 17:14:55 +0000 Merge commit faa5141b9be4 from file git (by Christos Zoulas): PR/656: harry.sintonen: Fix bug in byte swapping that was caused by the change to make flags uint16_t and cont_level uint8_t. This fixes using a magic.mgc built with a different endianness than file(1) itself, e.g. when building powerpc64 on amd64. PR: 292079 Fixes: ae316d1d1cff ("MFV: file 5.46.") MFC after: 3 days --- contrib/file/src/apprentice.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/file/src/apprentice.c b/contrib/file/src/apprentice.c index 5289f8e87267..dde2dd1e0c2d 100644 --- a/contrib/file/src/apprentice.c +++ b/contrib/file/src/apprentice.c @@ -3646,15 +3646,14 @@ file_varint2uintmax_t(const unsigned char *us, int t, size_t *l) file_private void bs1(struct magic *m) { - m->cont_level = swap2(m->cont_level); + m->flag = swap2(m->flag); m->offset = swap4(CAST(uint32_t, m->offset)); m->in_offset = swap4(CAST(uint32_t, m->in_offset)); m->lineno = swap4(CAST(uint32_t, m->lineno)); if (IS_STRING(m->type)) { m->str_range = swap4(m->str_range); m->str_flags = swap4(m->str_flags); - } - else { + } else { m->value.q = swap8(m->value.q); m->num_mask = swap8(m->num_mask); } From nobody Wed Dec 31 17:36:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dhHFf66fHz6M03N for ; Wed, 31 Dec 2025 17:36: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhHFf5R3sz4817 for ; Wed, 31 Dec 2025 17:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767202614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brgdRvBMUQyzxQbrIVBAiosow27vQO2r2I0pdq90QFc=; b=BsMQK+G7UMjGEsKB5kTyV6DHmqtn3LUn6rh3l6AoEzExcHYi1kEJP8H5ooObfSaGyJDJTf 3fen9j/b80FQT3QjFVXkaXnQaaVeH6E/KY2oLwhcS6o5RHCv8Ff9gKQ3UBePcKZMKBnjaG 5ZbfatWH5/Le9nScf2CYj9rH+/yud6zn3vn5IkWmxvxYYWX+uRqqifomstjV9fILmq51+1 ApMZiIPY3qL8s2PLcvBVhzq7o42IXBjh+6evOaarf9/b+u38r4DhBr/mP0IwWyVOoczMwJ wK1ttWPY9vQCkJ+8FUqnbonIUeV5Jqrcp3i8HJCg3tU6s0dQZRY7k5UHF0e1eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767202614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brgdRvBMUQyzxQbrIVBAiosow27vQO2r2I0pdq90QFc=; b=y22Jyy1YbIE4LRzJqNB10R+ES4E3NQUJ4qp48bFeb7BiPh4IKF5Ub9UzUa09yUH40OqOkR 4Sx/K6FtQ+BoDKlKvWjWEoY07UaKpD/1Bywakk1/42KFOjGXb6rDTIrmu5QaQpIepY1/vx MYdx3pjYuc+9mRAp4i4exT2CmGdzM3KKBogb6Z5mbTjjyhlyQ9g6Nm76FThi+/kz37GS7/ +6Lj9PJQnJuZ6YYzOl3ferlLmkrHsG+a4y4LP6tjGEgp6bO7oX2ON49Ftjrg0pmvzOyuiX +dYQPJqNTLmJdwE+BRTeBDbE460SJTMLpNlEgOVjPOQ7SMpcsIcgAhJoK0yx3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767202614; a=rsa-sha256; cv=none; b=cI/y9Vec/yEoR6Jhs+oeZBLyu61xgd1ueofckQ1RldyH6lKZekqzp4++5sU1EVOj3NuXkb n8lSyp4zPSMVxr0H8663287r72GpsoJ6QaJOuzUCkdqpMkOn/aCE+Icn+GOGvlT9thGSrk zF2dQAHwtnUqUNKUz3mXF+RemSsG4HFR2/r0hiMSC58wG2i/ibKpGmfEQzVRb6gmQVecgM UVggwpSdGopRDeN2968rYYvcm9ozDnNiU1dryg2rWHJUbPjE6KDvK+gjTfjXD8gsHzIEAj dCsMMnk/c5spY6nn3Mmz5aNBE8RPpB2D84c8gl3sEL4L8L9ZvcJK4HR93r2XgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhHFf4Rdqzwnf for ; Wed, 31 Dec 2025 17:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22863 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 31 Dec 2025 17:36:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 2c0e9a76c1ce - main - Makefile.inc1: Make NO_INSTALLKERNEL less of a hack List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 2c0e9a76c1cee8766245a0b5bdad73e995b790c6 Auto-Submitted: auto-generated Date: Wed, 31 Dec 2025 17:36:54 +0000 Message-Id: <69555f36.22863.80e0842@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2c0e9a76c1cee8766245a0b5bdad73e995b790c6 commit 2c0e9a76c1cee8766245a0b5bdad73e995b790c6 Author: Jessica Clarke AuthorDate: 2025-12-31 17:36:10 +0000 Commit: Jessica Clarke CommitDate: 2025-12-31 17:36:10 +0000 Makefile.inc1: Make NO_INSTALLKERNEL less of a hack Rather than adding a dummy entry which requires everyone to know to skip it, introduce a new INSTALLEXTRAKERNELS which contains the set of kernels to install as kernel.KERNCONF. Reviewed by: ivy MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54291 --- Makefile.inc1 | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9518d4034afc..c0bf42c3d008 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1753,10 +1753,6 @@ KERNCONF?= ${GENERIC_KERNCONF} BUILDKERNELS= INSTALLKERNEL= -.if defined(NO_INSTALLKERNEL) -# All of the BUILDKERNELS loops start at index 1. -BUILDKERNELS+= dummy -.endif .for _kernel in ${KERNCONF} .if !defined(_MKSHOWCONFIG) && exists(${KERNCONFDIR}/${_kernel}) BUILDKERNELS+= ${_kernel} @@ -1798,12 +1794,12 @@ _BUILDKERNEL_START!= date '+%s' # Builds all kernels defined by BUILDKERNELS. # buildkernel: .MAKE .PHONY -.if empty(BUILDKERNELS:Ndummy) +.if empty(BUILDKERNELS) @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \ false .endif @echo -.for _kernel in ${BUILDKERNELS:Ndummy} +.for _kernel in ${BUILDKERNELS} @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`" @echo "--------------------------------------------------------------" @@ -1865,6 +1861,16 @@ NO_INSTALLEXTRAKERNELS?= yes NO_INSTALLEXTRAKERNELS?= no .endif +.if ${NO_INSTALLEXTRAKERNELS} != "yes" +.if defined(NO_INSTALLKERNEL) +INSTALLEXTRAKERNELS= ${BUILDKERNELS} +.else +# First kernel is installed separately by INSTALLKERNEL, typically to +# /boot/kernel, rather than to a config-suffixed directory. +INSTALLEXTRAKERNELS= ${BUILDKERNELS:[2..-1]} +.endif +.endif + # # installkernel, etc. # @@ -1891,8 +1897,8 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY echo ">>> Install kernel(s) ${INSTALLKERNEL} completed in $$seconds seconds, ncpu: $$(${_ncpu_cmd})${.MAKE.JOBS:S/^/, make -j/}" @echo "--------------------------------------------------------------" .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} @echo "--------------------------------------------------------------" @echo ">>> Installing kernel ${_kernel} $$(LC_ALL=C date)" @echo "--------------------------------------------------------------" @@ -1929,8 +1935,8 @@ distributekernel distributekernel.debug: .PHONY ${METALOG_SORT_CMD} >> ${DESTDIR}/${DISTDIR}/kernel.meta .endif .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} rm -f ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta ${_+_}cd ${KRNLOBJDIR}/${_kernel}; \ ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \ @@ -1961,8 +1967,8 @@ packagekernel: .PHONY @${DESTDIR}/${DISTDIR}/kernel.meta | \ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ ${TAR_CMD} cvf - --exclude '*.debug' \ @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ @@ -2330,8 +2336,8 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap create-kernel-packages: .PHONY .endif -.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -. for _kernel in ${BUILDKERNELS:[2..-1]} +.if !empty(INSTALLEXTRAKERNELS) +.for _kernel in ${INSTALLEXTRAKERNELS} . if exists(${KSTAGEDIR}/kernel.${_kernel}.meta) . if ${MK_DEBUG_FILES} != "no" _debug=-dbg From nobody Thu Jan 1 00:29: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 4dhSQB4rgzz6MSrW for ; Thu, 01 Jan 2026 00:29: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhSQB49wSz3cbs for ; Thu, 01 Jan 2026 00:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767227394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5rMVb7TuI6Sagd9Ku/RQMFlQ49/J/9iTxmCcNnJKWMs=; b=xjWKhC1HjPqHHlO5VpYrJ3rZSH2zltogjzZj+jwtwSOsj+gQ16XbDAkwDm8UYXDYke4RXZ UzypVeqjm3rcUT6pzjpZcLD8HLIun1BK+Bcw1gWBZ15gFuW9Se8DpwfbEUbNafs7dbH9Vc 31F4A83EBZ/gRC8ZZOmowyRcQph1F7x1kFrDIUxkJnD6wFvx0C5r+TVp+R8BfOAMLD9FXz ow+0HzP7J/sDt+dA01jY3TeQp50cmoUZDlp+GROTap2ZgzxNF0ItJFr7/Jtsj/94zhmRiM ReyRi5ThWIfAUFS6jiL6O4x21NJSiCABfUUtnQw5xFwgdKEKD8w5/jpNtOf8dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767227394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5rMVb7TuI6Sagd9Ku/RQMFlQ49/J/9iTxmCcNnJKWMs=; b=VAV23sK8oVuQrtEPo++8j8mvubw0vX1M3tzZjo0KATBTcDuebMipOP/xaEziYJydpySaGN cwkycJ9QHO5tFsKIIHgEZiz+bviSjjrKM09I3A62cu/K43DTtS3XzZ7KRu2y/yPEoq0UqN FdkyavkPAAJ7BOt0x1jp6XNYHohVfsUHtWmQaJ5XhZuC4euHggIRPBPP45RQCYu481ujCV DhWyMdM1O8GjTBMWMzfIUfvdt+RvFK6x1JIyVtvFPBYy6z7Nc9R23tmjW175FwSC4AXZNu jvCOGvdnSXiDk0Ye5jkmMwJ63umZX6NkVV6jGRCxMPKcDgaMJXDPu4WxsqhXuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767227394; a=rsa-sha256; cv=none; b=QHiKkKj/ubJRb7PYTHYr5+nYkVhGmJdAa3Muho54rkFBokOHKyztVaUzcy5yqcHV4ZSBov VQSuDzi3AEcrT+D8ROJlXhRbh1ayvqCksoJ5wOiQ+QfJkA3ZFxFaeaIs0iTagREgVm2Bei 0PSMl7NxNPJnsKLXkwo52grjJnjrv+AUvvBOOcjsgOdkccNxOh++ljx6I9HP7XUpnvsA74 eZNc5OfypE7PonJbBUOhFxoNQqf7ycUArOT3eQfhaBrBJkB6SoLzfOR1F2TCZ/xT2p1frI HHqK3R7OFmf8ji7jOC2oNPvpPfjgkNJMQl2E05tUHAOm5u6Tt/du/wQm+tnPIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhSQB3YQYz17ft for ; Thu, 01 Jan 2026 00:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34f1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 00:29:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 8f41677ea496 - main - copyright: Happy New Year 2026! List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f41677ea4963254a3a190ede7cea16f2486cb1d Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 00:29:54 +0000 Message-Id: <6955c002.34f1d.3ddeac75@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=8f41677ea4963254a3a190ede7cea16f2486cb1d commit 8f41677ea4963254a3a190ede7cea16f2486cb1d Author: Xin LI AuthorDate: 2026-01-01 00:29:23 +0000 Commit: Xin LI CommitDate: 2026-01-01 00:29:23 +0000 copyright: Happy New Year 2026! We are now one quarter into the 21st century. --- COPYRIGHT | 2 +- sys/sys/copyright.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 9f8b3d4c01d6..f7134c977fa6 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -2,7 +2,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2025 The FreeBSD Project. +Copyright (c) 1992-2026 The FreeBSD Project. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h index 8c89adf7f885..1d660dd60646 100644 --- a/sys/sys/copyright.h +++ b/sys/sys/copyright.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (C) 1992-2025 The FreeBSD Project. All rights reserved. + * Copyright (C) 1992-2026 The FreeBSD Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -35,7 +35,7 @@ /* FreeBSD */ #define COPYRIGHT_FreeBSD \ - "Copyright (c) 1992-2025 The FreeBSD Project.\n" + "Copyright (c) 1992-2026 The FreeBSD Project.\n" /* Foundation */ #define TRADEMARK_Foundation \ From nobody Thu Jan 1 17:59: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 4dhvj11GFvz6MVff for ; Thu, 01 Jan 2026 17:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dhvj10W4Nz3X2W for ; Thu, 01 Jan 2026 17:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJda3lribrxMZko/fXw3bo5VhPvHTaHokHj/p6naN6s=; b=V/DEzwp7H7EukkPp5t5C64UwTsqizOj9MCIlnIQ5Oxw7Yx5efM2xjMANveBvnd+iwvZCC+ DjytQfATywN9wy9TQFNv2baCl9rtGNnFo0qo9ohxip2nt1x3bwyVBjOACmT76DDE+M9alc p8jx342qDbKIzRpAsshSlEQ2Cq1Naz8lICgsprVM6zUuz5Sw8HpMKyk1ryJJcLHuDos/VD Lo/AO5Oy3caIZUcfmokrhHQuQClve+O6zAupU3jTGSPCZMofBA4SHqTQQAjhgn2Xj07vCz 6J/BEmWSsRiFkMY0rbwHXw6lRcL6U6nYAm/CD03LMSRHqh9onZRiLb3TGJhWFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767290357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vJda3lribrxMZko/fXw3bo5VhPvHTaHokHj/p6naN6s=; b=uwyNBZHKvt4p1rJ2OQbASvQUyd5VbLopf1KPFV05Jrsgac4otHvGSj16kWk5RT3gmiN3H2 dac2L6+Va3sonKBpzagsBSV6pGoGSYeGyK7QxtKLvwfHvjQfwb8b1QGlLV0KH69rKya61O /9BXvQg4ENGWOthBJ74cARYeZHUA9GH8bKGOR2ZhJrF/9BHAMUlmHaO4GO6pTksHA6HKzo FdHj4oKDFv2TFZsAM6FpeX86FjGgB1dUWBsSZiHarDllfANoTcqqsTFcMwarQEtw/xq4Lg 2hsyg4U8ui1wjD1Cha00HsdgHTKsQsGn32gm6PDf2bgrHbKSfWHEUoFqPKo7wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767290357; a=rsa-sha256; cv=none; b=hAcXAQTzQdUIpyX1HUNniSCev5c/Wun7pWH39OHnsBG9krhLOflpi9HhSe95JySe56CDDG wz9r+6DM5YRfq6JgHYQVGJcG0qGqAAJKLLst4vvu1XiUIgUbmzxO9HkQ6ZD43ha7WTYYxO G4+veJIHe2jwafF8B+WlqIdV4zNgwm/kz9/Whp626zQeaYQKd5RFDEsasOlPrhhthHVrnH sTkYGHqjkRcruhvSOeJ33peu+saK0JOzkA2bavVp63QNgCVSx5HcJF6hALk0PQjredQ69+ mhCiR0yVeX8z80JMjrTGceNPn8mOljU1FU7XtihvcU/3rhTlRO5TtBX/IDLkDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dhvj06jg3zjkN for ; Thu, 01 Jan 2026 17:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34b1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Jan 2026 17:59:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 68d6abd97143 - main - periodic/801.trim-zfs: Fix daily-trim-zfs-flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 68d6abd9714384a41028dc0d5086b4930366bbea Auto-Submitted: auto-generated Date: Thu, 01 Jan 2026 17:59:16 +0000 Message-Id: <6956b5f4.34b1b.3d046ab@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=68d6abd9714384a41028dc0d5086b4930366bbea commit 68d6abd9714384a41028dc0d5086b4930366bbea Author: Alexander Ziaee AuthorDate: 2026-01-01 17:53:31 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-01 17:57:15 +0000 periodic/801.trim-zfs: Fix daily-trim-zfs-flags This variable was named incorrectly, resulting in any specified flags being silently ignored. PR: 292074 MFC after: 3 days Reported by: CrazyMihey@Ya.Ru Fixes: 493908c4b45c (Add a daily zfs trim script) --- usr.sbin/periodic/etc/daily/801.trim-zfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/periodic/etc/daily/801.trim-zfs b/usr.sbin/periodic/etc/daily/801.trim-zfs index 17d2ce217c10..9eed9788d016 100755 --- a/usr.sbin/periodic/etc/daily/801.trim-zfs +++ b/usr.sbin/periodic/etc/daily/801.trim-zfs @@ -44,7 +44,7 @@ case "$daily_trim_zfs_enable" in if ! zpool status "${pool}" | grep -q '(trimming)'; then echo " starting trim of pool '${pool}'" - zpool trim ${daily_zfs_trim_flags} "${pool}" + zpool trim ${daily_trim_zfs_flags} "${pool}" else echo " trim of pool '${pool}' already in progress, skipping" fi From nobody Fri Jan 2 07:40: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 4djFwx5Hdsz6MV95 for ; Fri, 02 Jan 2026 07:40: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djFwx4PFcz49MN for ; Fri, 02 Jan 2026 07:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767339649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6CIouuqymknNOBEbc1g49C9d95fTVENgH+1NEE4m6po=; b=pqS282NpV5N5N/92kben3ARwhB9tA16Oyh3e5bpl54q7BMkE8FSzZTrjCXd5YkxhqfDVEY mAeA4FB4OMxytH6sXa19WElMDE3xdWn1ZwFENrQHy2YUmaZ+w1q2QHzhM7lCWaW0AyxNwx Ug+JFzBtTY23Zfhrb4qwZnOep3Vp5CciLk8xDc3lAhOvTcfWNTZ0LqLIKy/sKKc0GXtqhS GmW0AZVw/pVCUbYTY0plc4LpKo4dcfhrWYNK+xHpoMk+/4UV8l7Jh7U6wQCiVIyGyxLEhZ rPwWKhAElkDHM8PMrmQd1GmPruLHkAm8l+RiwxCOJzbkmP0NNd63PgTPQST1hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767339649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6CIouuqymknNOBEbc1g49C9d95fTVENgH+1NEE4m6po=; b=U+RBv6uqVQa2USXJ7UdK0uwrlj5RKitu6mOyGNMYRRyRYNEI8I83NUpnyULy3qMbqy6u8F lrRfL2CB62vlvOEkaqrCv5J2pG84i5cuTmhT535mXCNn72cTmOITJL4seGRFjCchZjf1AG sC1uMeb0vALQuloRYMN4GrnMiXP5ZYxxypO7BVfrGmOpAQkHzjmwEhapKDGLdte4miRTio jBwdekUgEH16eFYIqyfNXfqx0MkPamDKqU9J54MZ0YA3aRBAvl5BIgrYs1xXmU4o2ZdXv9 6vFeHRqJRm4ta/lOYcQKmnSJUM9tpmE3ddN4ntbGryMp9xdW1Gt+10LtJ8Egqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767339649; a=rsa-sha256; cv=none; b=O/DMubopqBo/xqD8hzPp+9pqRnUGFfJinS+3/rPFz4poG5LIfH+TZPpizoUjRdHln4aLRv Ttx7ywJHrGe0xOqwiorQ7109g9HLfHj5+E1t/YsgkHQdpGjxyv+amaOA8YhBuGWdMmAlPW zC9VBlmF1jO5W6KxmpBQul4gkqq7Q/J90xNOnyEc+8UI9+hYR5ptjrCcTkatKVZF49xNIg aNpE1bVJwunvEZF+NoQT0EgwTR0vJuHvJ19V+RdC2UzkIygEmV+vcVjzFUWqaKXSysHPID HM2OS8UOKe58AgdgogNb8QA9DFy51XBJTMfHp+wm+OZiB2jW85G7FNdtrGm0Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djFwx3ygMz17HT for ; Fri, 02 Jan 2026 07:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e120 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 07:40: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: 3542d60fb804 - main - linuxkpi: Don't clobber result on failure List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 3542d60fb8042474f66fbf2d779ed8c5a80d0f78 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 07:40:49 +0000 Message-Id: <69577681.3e120.15bea2a2@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3542d60fb8042474f66fbf2d779ed8c5a80d0f78 commit 3542d60fb8042474f66fbf2d779ed8c5a80d0f78 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-02 07:30:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-02 07:30:06 +0000 linuxkpi: Don't clobber result on failure In kstrto*(), don't assign to *res until we know the conversion is successful, and address issues that may result in warnings if code that uses is compiled at high warning levels. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: bz, emaste Differential Revision: https://reviews.freebsd.org/D54440 --- sys/compat/linuxkpi/common/include/linux/kstrtox.h | 43 +++++++++++++++------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kstrtox.h b/sys/compat/linuxkpi/common/include/linux/kstrtox.h index 5da99de24197..6a145c409038 100644 --- a/sys/compat/linuxkpi/common/include/linux/kstrtox.h +++ b/sys/compat/linuxkpi/common/include/linux/kstrtox.h @@ -74,14 +74,17 @@ static inline int kstrtoul(const char *cp, unsigned int base, unsigned long *res) { char *end; + unsigned long temp; - *res = strtoul(cp, &end, base); + temp = strtoul(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') end++; if (*cp == 0 || *end != 0) return (-EINVAL); + + *res = temp; return (0); } @@ -89,14 +92,17 @@ static inline int kstrtol(const char *cp, unsigned int base, long *res) { char *end; + long temp; - *res = strtol(cp, &end, base); + temp = strtol(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') end++; if (*cp == 0 || *end != 0) return (-EINVAL); + + *res = temp; return (0); } @@ -106,7 +112,7 @@ kstrtoint(const char *cp, unsigned int base, int *res) char *end; long temp; - *res = temp = strtol(cp, &end, base); + temp = strtol(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') @@ -115,6 +121,8 @@ kstrtoint(const char *cp, unsigned int base, int *res) return (-EINVAL); if (temp != (int)temp) return (-ERANGE); + + *res = (int)temp; return (0); } @@ -124,7 +132,7 @@ kstrtouint(const char *cp, unsigned int base, unsigned int *res) char *end; unsigned long temp; - *res = temp = strtoul(cp, &end, base); + temp = strtoul(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') @@ -133,6 +141,8 @@ kstrtouint(const char *cp, unsigned int base, unsigned int *res) return (-EINVAL); if (temp != (unsigned int)temp) return (-ERANGE); + + *res = (unsigned int)temp; return (0); } @@ -142,7 +152,7 @@ kstrtou8(const char *cp, unsigned int base, uint8_t *res) char *end; unsigned long temp; - *res = temp = strtoul(cp, &end, base); + temp = strtoul(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') @@ -151,6 +161,8 @@ kstrtou8(const char *cp, unsigned int base, uint8_t *res) return (-EINVAL); if (temp != (uint8_t)temp) return (-ERANGE); + + *res = (uint8_t)temp; return (0); } @@ -160,7 +172,7 @@ kstrtou16(const char *cp, unsigned int base, uint16_t *res) char *end; unsigned long temp; - *res = temp = strtoul(cp, &end, base); + temp = strtoul(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') @@ -169,20 +181,20 @@ kstrtou16(const char *cp, unsigned int base, uint16_t *res) return (-EINVAL); if (temp != (uint16_t)temp) return (-ERANGE); + + *res = (uint16_t)temp; return (0); } static inline int kstrtou32(const char *cp, unsigned int base, uint32_t *res) { - return (kstrtouint(cp, base, res)); } static inline int kstrtos32(const char *cp, unsigned int base, int32_t *res) { - return (kstrtoint(cp, base, res)); } @@ -190,14 +202,17 @@ static inline int kstrtos64(const char *cp, unsigned int base, int64_t *res) { char *end; + quad_t temp; - *res = strtoq(cp, &end, base); + temp = strtoq(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') end++; if (*cp == 0 || *end != 0) return (-EINVAL); + + *res = (int64_t)temp; return (0); } @@ -208,17 +223,20 @@ kstrtoll(const char *cp, unsigned int base, long long *res) } static inline int -kstrtou64(const char *cp, unsigned int base, u64 *res) +kstrtou64(const char *cp, unsigned int base, uint64_t *res) { char *end; + u_quad_t temp; - *res = strtouq(cp, &end, base); + temp = strtouq(cp, &end, base); /* skip newline character, if any */ if (*end == '\n') end++; if (*cp == 0 || *end != 0) return (-EINVAL); + + *res = (uint64_t)temp; return (0); } @@ -231,7 +249,7 @@ kstrtoull(const char *cp, unsigned int base, unsigned long long *res) static inline int kstrtobool(const char *s, bool *res) { - int len; + size_t len; if (s == NULL || (len = strlen(s)) == 0 || res == NULL) return (-EINVAL); @@ -302,7 +320,6 @@ static inline int kstrtou32_from_user(const char __user *s, size_t count, unsigned int base, unsigned int *p) { - return (kstrtouint_from_user(s, count, base, p)); } From nobody Fri Jan 2 15: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 4djSn13vt8z6Lphc for ; Fri, 02 Jan 2026 15:49:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djSn12z3zz3qwZ for ; Fri, 02 Jan 2026 15:49:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767368981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSgJMxCa3iF6SUH4thAbtp/Xt0KCQYSwGnHBTJ3kvvM=; b=oeDs5rYlBHYvmb3HMIrjxj16Rm3Q76oTMXZ213hZROFLA9KUdXGNSsMpdpZvQF8jkeiXmZ 7oPgkxGwBljV4UmZ1lU0R5aSHoMEb6enmwEugOCMcrFYyLAlCYs7SM0ovpDbh/89LcZdt0 4t5hzKF0J9bIQZ0fgrVnhdkFKk9IUFZfhZ36Ieax+dOOFOpTU//HOEutcJ4q5fMxFs/myK Vx7D25qoTZY94YjznPuDu26rXfPqM2R86CPpkDUTLpnkD27b/7tnKoRMJhjTLgQRJ1LrrT p2j5OZMJdlLwTjFuI692RYBtFLLM4JGKRasVYwW5/+UBt1ouQL7uxkJ+mlVCsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767368981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSgJMxCa3iF6SUH4thAbtp/Xt0KCQYSwGnHBTJ3kvvM=; b=GNjCFkt6YMvHQuxSgDjnHnO6fPfo+ejxXU9kLEscSND/S82oUVtjSLioo9+Cb1xbD6lO5T twWU7wZaSCmw1tiUrpxK9e4DIlZFNHEnthSG5JtauNUnb9ktSv+DAAoP0jUJHXsWQAmNgE yLCN2Iyk6wfWx1t46PpgjyZj0zs0PeCm5ikveGmRn/IeKVHqtqXjj9a+mVboL0sgNJ+IRV QA0LcK2veDptqH35oeJFziuM+jeY4ubt40j4WO0BdWYAZEsMq+79KmsEKt3Fhv/SolKNRS OkAukydUq27CCAMZfEFJbzdZFsxaHDeW1XDfCAXBf6Al9IBv/70XG6W+kzB4yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767368981; a=rsa-sha256; cv=none; b=jMyPE7xXkA8q3fUmOtT4AcICOCKJCOp28V5Fb8C6BqzfBKVR2eON9tRvhqYJ4QxHRyabS9 yLEcOZ+uiDWU4kbjZQvNWStbTaf+Ch6o3R1YbNn7GFbHBsVDbM6/NmNEUa/gz2FNFO1Ugw O49N30+/NIcAOt+XvGWzaUhjpvFYXctC2DEfx10yjoQCpiQgn0AT2rV9EjYmtaoAPP7O+d kPt7ZrAMhqhtLtJhdGElHS2vF4jPyltVi8rLeFpFjhUUHYqm+Qq5IkkAOWjv1r/ZR0fLzF 8x+VGAH4tbUlVnuyhzIFf1yep1AFbKGtT8HHn/XdYmuDT8B3t9pw8uacz5AnWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djSn12Z5Dz8VZ for ; Fri, 02 Jan 2026 15:49:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d4fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 15:49:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2455db44ef08 - main - snd_hda: Default to 256 when corb/rirb is invalid List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 2455db44ef088797d113397f863d46c50e77134f Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 15:49:41 +0000 Message-Id: <6957e915.d4fb.62b2ee57@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2455db44ef088797d113397f863d46c50e77134f commit 2455db44ef088797d113397f863d46c50e77134f Author: Christos Margiolis AuthorDate: 2026-01-02 15:49:33 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 15:49:33 +0000 snd_hda: Default to 256 when corb/rirb is invalid PR: 289284 Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D54339 --- sys/dev/sound/pci/hda/hdac.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index d1de81e7ba29..d397e98b4be3 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -545,9 +545,12 @@ hdac_get_capabilities(struct hdac_softc *sc) HDAC_CORBSIZE_CORBSZCAP_2) sc->corb_size = 2; else { - device_printf(sc->dev, "%s: Invalid corb size (%x)\n", + device_printf(sc->dev, "%s: Hardware reports invalid corb size " + "(%x), defaulting to 256\n", __func__, corbsize); - return (ENXIO); + sc->corb_size = 256; + corbsize = HDAC_CORBSIZE_CORBSIZE(HDAC_CORBSIZE_CORBSIZE_256); + HDAC_WRITE_1(&sc->mem, HDAC_CORBSIZE, corbsize); } rirbsize = HDAC_READ_1(&sc->mem, HDAC_RIRBSIZE); @@ -561,9 +564,12 @@ hdac_get_capabilities(struct hdac_softc *sc) HDAC_RIRBSIZE_RIRBSZCAP_2) sc->rirb_size = 2; else { - device_printf(sc->dev, "%s: Invalid rirb size (%x)\n", + device_printf(sc->dev, "%s: Hardware reports invalid rirb size " + "(%x), defaulting to 256\n", __func__, rirbsize); - return (ENXIO); + sc->rirb_size = 256; + rirbsize = HDAC_RIRBSIZE_RIRBSIZE(HDAC_RIRBSIZE_RIRBSIZE_256); + HDAC_WRITE_1(&sc->mem, HDAC_RIRBSIZE, rirbsize); } HDA_BOOTVERBOSE( From nobody Fri Jan 2 16:19: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 4djTR06f2Mz6Ls7h for ; Fri, 02 Jan 2026 16:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djTR05dhvz3xV5 for ; Fri, 02 Jan 2026 16:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767370748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4UQX38MR5H55DJksMEfBrktLL25mVhCJZWFTMinXQk=; b=IULosAVlhGwMfxB00kdeOy75585uOQQ7R4n2PRjHkiu9vSzm9jebin3+5z9pXKTH0rVs9e fSPTUIydEwbKTE25JNgPgiKZhjSZEn6KYtR3mpx8FIQp6KA/OXobxuzMBFI/I5pbdH77P1 YU/s05N8n5Qee1zv1WEFgsroWrXa+LslO/38U340pM8dxtAb1diuDPEFgldv+pTNBHbFmd N/odgp7eIhkwnf4faSzCQ0q4Jrmsf9Z8GAYa+pqFiuJ/POUJcvgrzaDJj8+LLjZbJ3yA8p I6GiDJGUJvVLk34fYlUG09Lp43SnJGrgvXu8Ls6JXoR21d8Y05aA2aVRrCW/KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767370748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4UQX38MR5H55DJksMEfBrktLL25mVhCJZWFTMinXQk=; b=X7hFs04F1NOGEoaRG3bCEr68fulnkxZs51YBAqYuOE6O7nsFHveV4WIeFo/3uE4z3u4SRC H5nL71KxC8eOkpjOoVinVk8wdWFqVs3wVblfBbda0pC/qDyZXsR1Vk2y2E5NMMx1Y+GXpg 3TGbUAY4x17P6pyvQ8yOufmiexXDDYlrpZNRrbqso6L1qhLGSRMp3gusNjmBccBrgpXfkv bVtpjd68v34HNHLAVxrQosWc/Fd2Ubu8EPVrseLlDZpBD/tYuQ6+nEYlrclgaY/FJxmnXr PS/+UETZ1yqsPpx7Eo80QSl3v3I0dpTOl6Zp33DPy8XYn+00nBwyub6il7oogQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767370748; a=rsa-sha256; cv=none; b=uv4nJrwcoSoNpejNTESIeBupnAUYrBm4tGaqPO0Go9O891UXgX3n3oWYjrlcNiBsz+bJ8J tRwgzjnSUbnrNZWSKPGeOVkoCycjmfZr5EXVwOu37n5b6QDwjrR0AfoRbaeqE4CXmSQPny v5TJ0Z55Jiha+YW51kZCMeH8Nfk5+mk4XuQJXZONAA5XPkNZp9SfLuaBpJifDGOG4RkcFp EZhQy5vx6YhfeZApgfpQtZQHZP1mv00kLsLmzXzVnUeF5pOBhAzrKlW+yeZJI3oEEJlMeI /ZKIVrpV+x+6nr9gT9k9XoqeBZL679/Q9bOL07bKAXxCA3655lMETj0denP2ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djTR04RH9z8X7 for ; Fri, 02 Jan 2026 16:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ff0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:19:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: fb476c703117 - main - pf: sprinkle const over pf_addr_cmp() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb476c70311788dfd6850d73a3f8d9abb7c3d58c Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:19:08 +0000 Message-Id: <6957effc.ff0a.13537d1c@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb476c70311788dfd6850d73a3f8d9abb7c3d58c commit fb476c70311788dfd6850d73a3f8d9abb7c3d58c Author: Kristof Provost AuthorDate: 2026-01-02 14:10:53 +0000 Commit: Kristof Provost CommitDate: 2026-01-02 16:05:29 +0000 pf: sprinkle const over pf_addr_cmp() Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 2 +- sys/netpfil/pf/pf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index daaa2d3cddf7..6582250879ca 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2600,7 +2600,7 @@ int pfi_clear_flags(const char *, int); int pf_match_tag(struct mbuf *, struct pf_krule *, int *, int); int pf_tag_packet(struct pf_pdesc *, int); -int pf_addr_cmp(struct pf_addr *, struct pf_addr *, +int pf_addr_cmp(const struct pf_addr *, const struct pf_addr *, sa_family_t); uint8_t* pf_find_tcpopt(u_int8_t *, u_int8_t *, size_t, diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8219aacd20de..60ca9039e9ce 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -570,7 +570,7 @@ pf_sctp_checksum(struct mbuf *m, int off) } int -pf_addr_cmp(struct pf_addr *a, struct pf_addr *b, sa_family_t af) +pf_addr_cmp(const struct pf_addr *a, const struct pf_addr *b, sa_family_t af) { switch (af) { From nobody Fri Jan 2 16:58: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 4djVJ6421pz6LvT0 for ; Fri, 02 Jan 2026 16:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJ63D2Wz41vn for ; Fri, 02 Jan 2026 16:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3F+MVtPPL8xxiZ5JBAu6zicF6/jwh+Hin59k4cyRLEg=; b=BUIYPe/RUAEbzMAqrj13fKVehDq0g3+NArcLkVK1tV0w6Nd2k2taRZlGeinNzbLDJbSZyN k4v42LlpacTPA5lTRDkFcHbGb9sUjkv8ut3KDr64WsgjZTmior/GEk4SYwx2yH6L89AqbQ poFXnIxd7pzbYx22PjlDlPNh8KIhG4g0fA6JkKHq9p0I4NdsX5zw+FiO7Gwxgc9xfO7Kiy IhvsFvufxAkul6TTpHkgNZBYgyjKI8aiNWebwhFsS7MjIDI4+t8ECR8QhgBIY0mcuidayD nXyO7OkFXvBGBeaTpodzFl0i5DEmuP08AIyAnXRJJvAmOcc2XGiKsHTzpKOZAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3F+MVtPPL8xxiZ5JBAu6zicF6/jwh+Hin59k4cyRLEg=; b=HOn3J3pr00aAoxzF1Rmy3iriVuYHaHQH9vtiELXTmrda9mas3CTyIbK5DoSjJLJqX8FjPX 7i492Eet6GStNxqNYFRQLL/RaKz6EirBxpGgWamGUlhMZe77YgsgJO1oOYol4gcjD1eCb1 k7avqD7OXiDM2R4Q/L/qwc8qb8roruxcHi50fNaKbbfMc6qu2+l3YOMqXT+9SIEGx1kNza Y/WDrmYH1vtRHgNjGtCJCUSbr3TKiDGBJntY7qG3nC4HLMkN0+EcRw97UIVzlcn41qEXTO hDWGiIFm9l16Ut4OqI84PvuYZniLUyGD0im8V2nCidqt6elHiyRfYMROQRIAyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373094; a=rsa-sha256; cv=none; b=kOiwFpW4IMZ6FQVxkoHU1bZo9SMNgPqB9i5R8Bzf0vzrqLTpEkqe0GK6Yigi3mMuP8aUDt D1CON9FfOQedoXAfRZVGBRm+iswLYV439giYSnpDcMD09dP2hCAX9pzX5bOX8l5P4JQU9i 60hithoF6y/aDMSZslwk2nAL9xSEDARwed2l+XSsx3nmffO+h34PLu2F25Z7zYj+Ladp+4 yMlWX4cpal58zyeqafq4W4YnZcsaZWJ9bUHtQS86Gb9Q9VaIz6tigDqhU4/CHjWgto9+nH UAPoEhs7VxGjaJKpjxfayjiOEXkZXlG7ajlAkFEKOtviIYMbWSH8JWLFpICZpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJ62nTkzBMn for ; Fri, 02 Jan 2026 16:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24495 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 84976625da38 - main - sound: Retire pcm_feeder->desc_static List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 84976625da387a266f01b0a566aab447426609f7 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:14 +0000 Message-Id: <6957f926.24495.1ac3e38c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=84976625da387a266f01b0a566aab447426609f7 commit 84976625da387a266f01b0a566aab447426609f7 Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:44 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:04 +0000 sound: Retire pcm_feeder->desc_static Not sure what the value of this was. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54103 --- sys/dev/sound/pcm/feeder.c | 3 +-- sys/dev/sound/pcm/feeder.h | 2 +- sys/dev/sound/pcm/feeder_chain.c | 4 ++-- sys/dev/sound/pcm/feeder_eq.c | 10 +++++----- sys/dev/sound/pcm/feeder_format.c | 14 +++++++------- sys/dev/sound/pcm/feeder_matrix.c | 9 ++++----- sys/dev/sound/pcm/feeder_mixer.c | 10 +++++----- sys/dev/sound/pcm/feeder_rate.c | 8 ++++---- sys/dev/sound/pcm/feeder_volume.c | 14 +++++++------- sys/dev/sound/pcm/sndstat.c | 36 ++++++++++++++++++------------------ 10 files changed, 54 insertions(+), 56 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index fa4e4e16a133..2a7f54e5d30f 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -75,9 +75,8 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) return NULL; f->class = fc; - f->desc = &(f->desc_static); if (desc != NULL) - *(f->desc) = *desc; + f->desc = *desc; err = FEEDER_INIT(f); if (err) { diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index f1c96d86fda0..ed4ebc91fca7 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -51,7 +51,7 @@ struct feeder_class { struct pcm_feeder { KOBJ_FIELDS; int align; - struct pcm_feederdesc *desc, desc_static; + struct pcm_feederdesc desc; void *data; struct feeder_class *class; struct pcm_feeder *source, *parent; diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 32dd4ca14faf..4ec50d810253 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -473,8 +473,8 @@ feeder_build_root(struct pcm_channel *c, struct feeder_chain_desc *cdesc) c->feederflags |= 1 << FEEDER_ROOT; - c->feeder->desc->in = cdesc->current.afmt; - c->feeder->desc->out = cdesc->current.afmt; + c->feeder->desc.in = cdesc->current.afmt; + c->feeder->desc.out = cdesc->current.afmt; return (0); } diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 3838328fb0bb..4ab7334715d5 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -275,16 +275,16 @@ feed_eq_init(struct pcm_feeder *f) { struct feed_eq_info *info; - if (f->desc->in != f->desc->out) + if (f->desc.in != f->desc.out) return (EINVAL); info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); - info->fmt = AFMT_ENCODING(f->desc->in); - info->channels = AFMT_CHANNEL(f->desc->in); - info->align = info->channels * AFMT_BPS(f->desc->in); + info->fmt = AFMT_ENCODING(f->desc.in); + info->channels = AFMT_CHANNEL(f->desc.in); + info->align = info->channels * AFMT_BPS(f->desc.in); info->rate = FEEDEQ_RATE_MIN; info->treble.gain = FEEDEQ_L2GAIN(50); @@ -309,7 +309,7 @@ feed_eq_set(struct pcm_feeder *f, int what, int value) if (value < SND_CHN_MIN || value > SND_CHN_MAX) return (EINVAL); info->channels = (uint32_t)value; - info->align = info->channels * AFMT_BPS(f->desc->in); + info->align = info->channels * AFMT_BPS(f->desc.in); feed_eq_reset(info); break; case FEEDEQ_RATE: diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index d2c4d7618ab4..25103b71d135 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -61,23 +61,23 @@ feed_format_init(struct pcm_feeder *f) { struct feed_format_info *info; - if (f->desc->in == f->desc->out || - AFMT_CHANNEL(f->desc->in) != AFMT_CHANNEL(f->desc->out)) + if (f->desc.in == f->desc.out || + AFMT_CHANNEL(f->desc.in) != AFMT_CHANNEL(f->desc.out)) return (EINVAL); info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); - info->channels = AFMT_CHANNEL(f->desc->in); + info->channels = AFMT_CHANNEL(f->desc.in); - info->ibps = AFMT_BPS(f->desc->in); + info->ibps = AFMT_BPS(f->desc.in); info->ialign = info->ibps * info->channels; - info->rdfmt = AFMT_ENCODING(f->desc->in); + info->rdfmt = AFMT_ENCODING(f->desc.in); - info->obps = AFMT_BPS(f->desc->out); + info->obps = AFMT_BPS(f->desc.out); info->oalign = info->obps * info->channels; - info->wrfmt = AFMT_ENCODING(f->desc->out); + info->wrfmt = AFMT_ENCODING(f->desc.out); f->data = info; diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 2c7a3e04690d..198fe86d994f 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -283,15 +283,15 @@ feed_matrix_init(struct pcm_feeder *f) struct pcmchan_matrix *m_in, *m_out; int ret; - if (AFMT_ENCODING(f->desc->in) != AFMT_ENCODING(f->desc->out)) + if (AFMT_ENCODING(f->desc.in) != AFMT_ENCODING(f->desc.out)) return (EINVAL); info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); - info->in = f->desc->in; - info->out = f->desc->out; + info->in = f->desc.in; + info->out = f->desc.out; info->fmt = AFMT_ENCODING(info->in); info->bps = AFMT_BPS(info->in); info->ialign = AFMT_ALIGN(info->in); @@ -413,8 +413,7 @@ feeder_matrix_setup(struct pcm_feeder *f, struct pcmchan_matrix *m_in, struct pcmchan_matrix *m_out) { - if (f == NULL || f->desc == NULL || f->class->type != FEEDER_MATRIX || - f->data == NULL) + if (f == NULL || f->class->type != FEEDER_MATRIX || f->data == NULL) return (EINVAL); return (feed_matrix_setup(f->data, m_in, m_out)); diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 10de42ba727a..74ab633bf3c7 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -78,16 +78,16 @@ feed_mixer_init(struct pcm_feeder *f) { struct feed_mixer_info *info; - if (f->desc->in != f->desc->out) + if (f->desc.in != f->desc.out) return (EINVAL); info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); - info->format = AFMT_ENCODING(f->desc->in); - info->channels = AFMT_CHANNEL(f->desc->in); - info->bps = AFMT_BPS(f->desc->in); + info->format = AFMT_ENCODING(f->desc.in); + info->channels = AFMT_CHANNEL(f->desc.in); + info->bps = AFMT_BPS(f->desc.in); f->data = info; @@ -321,7 +321,7 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, if (mcnt != 0) { memset(b + rcnt, sndbuf_zerodata( - f->desc->out), mcnt); + f->desc.out), mcnt); mcnt = 0; } switch (info->format) { diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index c2c232a97177..7fe8ec856a88 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1109,7 +1109,7 @@ z_resampler_setup(struct pcm_feeder *f) if (!(Z_FACTOR_SAFE(info->z_gx) && Z_FACTOR_SAFE(info->z_gy))) return (EINVAL); - format = f->desc->in; + format = f->desc.in; adaptive = 0; z_scale = 0; @@ -1344,7 +1344,7 @@ z_setup_adaptive_sinc: /* * Zero out head of buffer to avoid pops and clicks. */ - memset(info->z_delay, sndbuf_zerodata(f->desc->out), + memset(info->z_delay, sndbuf_zerodata(f->desc.out), info->z_pos * align); #ifdef Z_DIAGNOSTIC @@ -1508,7 +1508,7 @@ z_resampler_init(struct pcm_feeder *f) struct z_info *info; int ret; - if (f->desc->in != f->desc->out) + if (f->desc.in != f->desc.out) return (EINVAL); info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); @@ -1518,7 +1518,7 @@ z_resampler_init(struct pcm_feeder *f) info->rsrc = Z_RATE_DEFAULT; info->rdst = Z_RATE_DEFAULT; info->quality = feeder_rate_quality; - info->channels = AFMT_CHANNEL(f->desc->in); + info->channels = AFMT_CHANNEL(f->desc.in); f->data = info; diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 101cc7ba003b..f7c93ca716e6 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -151,20 +151,20 @@ feed_volume_init(struct pcm_feeder *f) uint32_t i; int ret; - if (f->desc->in != f->desc->out || - AFMT_CHANNEL(f->desc->in) > SND_CHN_MAX) + if (f->desc.in != f->desc.out || + AFMT_CHANNEL(f->desc.in) > SND_CHN_MAX) return (EINVAL); for (i = 0; i < FEEDVOLUME_TAB_SIZE; i++) { - if (AFMT_ENCODING(f->desc->in) == + if (AFMT_ENCODING(f->desc.in) == feed_volume_info_tab[i].format) { info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); - info->bps = AFMT_BPS(f->desc->in); - info->channels = AFMT_CHANNEL(f->desc->in); + info->bps = AFMT_BPS(f->desc.in); + info->channels = AFMT_CHANNEL(f->desc.in); info->apply = feed_volume_info_tab[i].apply; info->volume_class = SND_VOL_C_PCM; info->state = FEEDVOLUME_ENABLE; @@ -332,8 +332,8 @@ feeder_volume_apply_matrix(struct pcm_feeder *f, struct pcmchan_matrix *m) struct feed_volume_info *info; uint32_t i; - if (f == NULL || f->desc == NULL || f->class->type != FEEDER_VOLUME || - f->data == NULL || m == NULL || m->channels < SND_CHN_MIN || + if (f == NULL || f->class->type != FEEDER_VOLUME || f->data == NULL || + m == NULL || m->channels < SND_CHN_MIN || m->channels > SND_CHN_MAX) return (EINVAL); diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index a7c53ac85eb8..8f414e07757d 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -534,24 +534,24 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) while (f != NULL) { sbuf_printf(&sb, "%s", f->class->name); if (f->class->type == FEEDER_FORMAT) { - snd_afmt2str(f->desc->in, buf, sizeof(buf)); + snd_afmt2str(f->desc.in, buf, sizeof(buf)); sbuf_printf(&sb, "(%s -> ", buf); - snd_afmt2str(f->desc->out, buf, sizeof(buf)); + snd_afmt2str(f->desc.out, buf, sizeof(buf)); sbuf_printf(&sb, "%s)", buf); } else if (f->class->type == FEEDER_MATRIX) { sbuf_printf(&sb, "(%d.%dch -> %d.%dch)", - AFMT_CHANNEL(f->desc->in) - - AFMT_EXTCHANNEL(f->desc->in), - AFMT_EXTCHANNEL(f->desc->in), - AFMT_CHANNEL(f->desc->out) - - AFMT_EXTCHANNEL(f->desc->out), - AFMT_EXTCHANNEL(f->desc->out)); + AFMT_CHANNEL(f->desc.in) - + AFMT_EXTCHANNEL(f->desc.in), + AFMT_EXTCHANNEL(f->desc.in), + AFMT_CHANNEL(f->desc.out) - + AFMT_EXTCHANNEL(f->desc.out), + AFMT_EXTCHANNEL(f->desc.out)); } else if (f->class->type == FEEDER_RATE) { sbuf_printf(&sb, "(%d -> %d)", FEEDER_GET(f, FEEDRATE_SRC), FEEDER_GET(f, FEEDRATE_DST)); } else { - snd_afmt2str(f->desc->out, buf, sizeof(buf)); + snd_afmt2str(f->desc.out, buf, sizeof(buf)); sbuf_printf(&sb, "(%s)", buf); } sbuf_printf(&sb, " -> "); @@ -1330,25 +1330,25 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) sbuf_printf(s, "%s", f->class->name); if (f->class->type == FEEDER_FORMAT) { sbuf_printf(s, "(0x%08x -> 0x%08x)", - f->desc->in, f->desc->out); + f->desc.in, f->desc.out); } else if (f->class->type == FEEDER_MATRIX) { sbuf_printf(s, "(%d.%d -> %d.%d)", - AFMT_CHANNEL(f->desc->in) - - AFMT_EXTCHANNEL(f->desc->in), - AFMT_EXTCHANNEL(f->desc->in), - AFMT_CHANNEL(f->desc->out) - - AFMT_EXTCHANNEL(f->desc->out), - AFMT_EXTCHANNEL(f->desc->out)); + AFMT_CHANNEL(f->desc.in) - + AFMT_EXTCHANNEL(f->desc.in), + AFMT_EXTCHANNEL(f->desc.in), + AFMT_CHANNEL(f->desc.out) - + AFMT_EXTCHANNEL(f->desc.out), + AFMT_EXTCHANNEL(f->desc.out)); } else if (f->class->type == FEEDER_RATE) { sbuf_printf(s, "(0x%08x q:%d %d -> %d)", - f->desc->out, + f->desc.out, FEEDER_GET(f, FEEDRATE_QUALITY), FEEDER_GET(f, FEEDRATE_SRC), FEEDER_GET(f, FEEDRATE_DST)); } else { sbuf_printf(s, "(0x%08x)", - f->desc->out); + f->desc.out); } sbuf_printf(s, " -> "); f = f->parent; From nobody Fri Jan 2 16:58: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 4djVJ75rTQz6LvXq for ; Fri, 02 Jan 2026 16:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJ73wN4z41qQ for ; Fri, 02 Jan 2026 16:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RS7U46pJ93FHBvaqDC3k79FgRX8GcW2yCon5O+eYIW0=; b=fzlr2bAoZKAT1Dew2nxX3ZFNgUdwLG3nmPn9dxov2VPLTrG+ewcm3uBhUIl1PKY4bT3evx hgf0HvNPt+/2+VUml/BFLyiMx8WpyI/VOiOnqHvWns6oQGg7j06e2B6H7oQOExxfzV6oLB IJ+GitOCloKfg6IMOlA22I31L9Bm0Lj+MQtiwqserEeb5at/geN5VXKQAdYMvzhffxofVt ITc3pKJcJ5Yvjh591jVkHtgj7sXSz9mE6bXvERtNAy5wOoW5m+27uDGwlZnxHg7qWkZoPC mhgz0t8wV3hV1O8uYzFsMbhPsJL06uqd3RzOQv4VmLG4GOW+k/B34kooah3eow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RS7U46pJ93FHBvaqDC3k79FgRX8GcW2yCon5O+eYIW0=; b=pidixMdlcjd0x617+m8yxXLvM96I8aWicbV+xX46tstrrb1qO+ordaylmYIRTIA7oOLYNP K0I7btARrODEmsEn8Zc6nBtRmvB8mv+n0/O2dAatQgVuZJx1xKgC+OvQLy0QZZTpZUd2hl 8Kht4/lTjV/UMTcY4aW/Zg3CiqmFDXMD5EUDyY/LlUB8qfWp4PsjU6+JgQDu6amecc77Tf 0NlIL9uptsmvDhyDPr+vNI122a2Hd2SWdZjedHuGM4FrCw4A3dcJyrtE+o/v1mgram10P1 PR7JPV/GSmmupwDHZwf2sj6IFWP5mvUTQs7/tQJOxXVdRF6Io03uwnlVGP0pzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373095; a=rsa-sha256; cv=none; b=Sd8dtg/GF+nF3kWFqEIgnZIxGkLWK3qpuxjwIk0gJqIGeiVJ2PJ0M9Q/WDnkVenQ6EPIUe 2zK6Ofda54MBav1rmRMzRgG4xXm04uMlP1N0Nk8Myda05HXt8Dw8nNsU+oEtUKeCOVK2Tm lGY/AGsbU3s/DD3SjxtrPesVfMB4mxIfCPqnT4dUVXiXBVmM0Nd3jITK18AT5INMwN2BXv kObPO9Rc857QuKaqM2rzTj74V2mpptKTjP0OFgI3N8Fye9B1/WkHvdWT8M+BarWkWIgl9p J5Cds8kuKtGvw5pPI0bTceJpxU/Reh9SOr6gDPSNXTTjhkDvbpBH2e13zOxhzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJ73SMmzBMp for ; Fri, 02 Jan 2026 16:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25002 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2b088823df5b - main - sound: Update pcm/feeder.h LICENSE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 2b088823df5b0f28c3839bf381c9517b7b0d60c0 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:15 +0000 Message-Id: <6957f927.25002.6361ef4e@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2b088823df5b0f28c3839bf381c9517b7b0d60c0 commit 2b088823df5b0f28c3839bf381c9517b7b0d60c0 Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:47 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:04 +0000 sound: Update pcm/feeder.h LICENSE Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/pcm/feeder.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index ed4ebc91fca7..b479b108ff93 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -4,6 +4,10 @@ * Copyright (c) 2005-2009 Ariff Abdullah * Copyright (c) 1999 Cameron Grant * All rights reserved. + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions From nobody Fri Jan 2 16:58: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 4djVJ91KwJz6Lvgb for ; Fri, 02 Jan 2026 16:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJ84xXfz41yp for ; Fri, 02 Jan 2026 16:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4OG4qI7kkPIfK/V8JFUYY4KysA4U2DIqPBqWAtCq0mE=; b=g+ZnqnemK9L+uGKMXRs2PmJhgkafbHalxs5sEM9uEFVMWhNRFcJwZ0wms8Rv7io7JZW2RD d0vzbKGqEFUE2puxAhVfEKUjf/AMxOEbA3xveTr1uwWzsOTJTRPwtxePuREc8RGkBMPDi/ 1P1p8hLGyQrASYBiTI5EHbkXQTOkBeextSZaBMLU17of3CmHm2Mz1IWh1bZM+tlRg+b8Oi oeam5dcnASIqi8bA5sa4+P0y8uyU9cFWN4YRpg2G4Q/nEU7AqXbuHuX4rvSOsvXab1DSUl bFVQ3c2jhs4pVj1c9quUq1OjyrTbgX6xE8oWp+soiPI7XY+wD7DynAg1P0CRJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4OG4qI7kkPIfK/V8JFUYY4KysA4U2DIqPBqWAtCq0mE=; b=TJLlxCa6MqRSe44Gu2zZ1dDMVZ7iypION0bPCMfITW3D2HMLSZcmeCvsojBV7TMEhfh+MX RV4haAHl7d5wmLHJ1yKOJ4lD7fW11MmB0WRAFaq4jOalVdWckktrHAo7Hv1qqH9MNuHixw rY2fbjfOZ1qhHWO9OQPbPovzWph6puMgXnjEz3DyU8Th7/449GmpjmTC31uuyKYgDC6WV2 4ATMhBIDpQ9j7vuV8gLu4PAgUgtYlOz+l1tSk8+VDf5gR9RSUHd9dGYnrXjqJUUi0qlFkt cW6Ar++htZHtgWj7w3PVtKLT/ujxoCe8CLjGfEU6oge/9rC1IH0Y8nMLf//4ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373096; a=rsa-sha256; cv=none; b=Fm2BbaWYL/zD+FciNavy/PsDLPkrJ/QR/dtQ51BlDMljw7p+keJLaX7255HGhb/15+up6J dRAU+iUAzkajsicTE6s2Go0cEOyQr9q/EkofiZJbcw0yjqsoUmMl7oPNXXM/Qf5VAopjvj jefqiTe7ovewzy9USAWO+1SwFkAbB9n7ru0BRQlHnSo3SyrbgetJ1dXoZNDbIYL5QL1ybN 7AGdUuvwUkpTdLBQDvmHizvJef+BIB1YWO+H3rWmaExlqvXX9dO0aYcdluLFV/4/+aX9Go m5G2K4kDlJxRdmuEZJi2Rms7JSGanbPDl8kl8VoKRrqrWx+Mt7J8GeenvtMfJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJ84JQCz9jv for ; Fri, 02 Jan 2026 16:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23a6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 6002ce537b6a - main - sound: Retire unused pcm_feeder->align List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 6002ce537b6a0e524da1a60ccd70493d8cd59b9b Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:16 +0000 Message-Id: <6957f928.23a6d.6db88735@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6002ce537b6a0e524da1a60ccd70493d8cd59b9b commit 6002ce537b6a0e524da1a60ccd70493d8cd59b9b Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:51 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:04 +0000 sound: Retire unused pcm_feeder->align Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/pcm/feeder.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index b479b108ff93..1f106787ee83 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -54,12 +54,10 @@ struct feeder_class { struct pcm_feeder { KOBJ_FIELDS; - int align; struct pcm_feederdesc desc; void *data; struct feeder_class *class; struct pcm_feeder *source, *parent; - }; void feeder_register(void *p); From nobody Fri Jan 2 16:58: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 4djVJB2VFxz6LvXt for ; Fri, 02 Jan 2026 16:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJ96DZzz42Jk for ; Fri, 02 Jan 2026 16:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQz002S132sVjkZQEYVajnMFTKdlPzFrawQneDlDeu8=; b=FVtTI44Aj6grOuer0fsVfqutAXPbovwYgrEbu2x9Q9fktKC7BTQJAw0VOhpRvcKmstMeX+ r+439UqXoz8TcZHYCEWOQHf9DVVg6rg6yLoqW/4QeP8e7RtTE7kzrv21UllHN9rVeVEoD+ s3rsFVWB8jK1Xe91iMSTCcYrIx0rREXW9IuX/dqVTTCS82nJQu27XrdlYcuy5orFkozCQQ j5h+CLiecxuirMj9oqMrbhWkpykiFkxeI7K8vEoPVFpOUDEqSDHxZI8jHqkwjeuH2RzQFP 0AJQ3JYnNMynVBCVm4fqAt/+Is5p5VbMFEpFXNBmAbKmITNx0JffP0nF0+CAVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQz002S132sVjkZQEYVajnMFTKdlPzFrawQneDlDeu8=; b=HyhVEaWbWJvvSirbO0yW9tb1z/YeQOgCL2j05g0QZHN4CDxdarBLvTeFYKMv+SV3nQ5Reg A2moSyPWUUN8C52GFXOnLMVCy02yL2dN3JmFM8J8FW2b2BsHiUJTabZOeBgIwcdJ50KU9c mVLUpbPIeaP9bHT5+gK97HrLLrqBJg6d6isZCUVk/awF2l8ERrhGDvIPrj5DRh8f7Qjuuw KgdhyH86KcL/Hm+lixM+5woPHaCfH2ICIrC/k5uJ+4hmiU0rwcgNdPaMokDqtIOkdsDEYL PKbrmwr/qBf1+GeX10gNZ2ZOCfusZr8WN8YQgVHCvGUH+UuUdoEOTpUzloZBoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373097; a=rsa-sha256; cv=none; b=ZEg8MofAsL/neU9zCZG2IgEBtihFns5y1pXuIctCGm0PMbsi4yLMx5qj1geGZHccZj64O1 V7qqu9eUZFEOxvveoqdqdWPDc0+c0jTX7c3U0TJs2M8tc6ZLuV1KdwI9b5FXj466lPpn2M jvuysp3DZFNEpdgKZS7DrH6nKZq4zIyz9LXRUuW98PMk/fQ5z/DeYh+hhL1ixp5bHTQ1Ad dwWI5crcAY405qY9WOh9a2BKw1nob7pnnOC+wcyoRIs68ZAAMidO00ZievJtX/2aRnXRC1 eYJx7TV7nlPN8vry8KCvV76FOD7YkFxL7WwdQ7xo28mMLvShWON2mbR9LOhVDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJ950ZnzBMq for ; Fri, 02 Jan 2026 16:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2418f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 21a2aa785d7d - main - sound: Get rid of unnecessary breaks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 21a2aa785d7d7610b3e90e028ae782893d8c095a Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:17 +0000 Message-Id: <6957f929.2418f.4e2b7731@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=21a2aa785d7d7610b3e90e028ae782893d8c095a commit 21a2aa785d7d7610b3e90e028ae782893d8c095a Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:54 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:04 +0000 sound: Get rid of unnecessary breaks No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/pci/atiixp.c | 1 - sys/dev/sound/pcm/feeder_eq.c | 2 -- sys/dev/sound/pcm/feeder_format.c | 1 - sys/dev/sound/pcm/feeder_rate.c | 7 ------- sys/dev/sound/pcm/feeder_volume.c | 1 - sys/dev/sound/pcm/mixer.c | 1 - 6 files changed, 13 deletions(-) diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 12906ecc6253..0d2228ee16cd 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -804,7 +804,6 @@ atiixp_chan_trigger(kobj_t obj, void *data, int go) default: atiixp_unlock(sc); return (0); - break; } /* Update bus busy status */ diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 4ab7334715d5..08e789f6a5ad 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -319,7 +319,6 @@ feed_eq_set(struct pcm_feeder *f, int what, int value) if (info->state == FEEDEQ_UNKNOWN) info->state = FEEDEQ_ENABLE; return (feed_eq_setup(info)); - break; case FEEDEQ_TREBLE: case FEEDEQ_BASS: if (value < 0 || value > 100) @@ -343,7 +342,6 @@ feed_eq_set(struct pcm_feeder *f, int what, int value) break; default: return (EINVAL); - break; } return (0); diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 25103b71d135..3226aebf9580 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -115,7 +115,6 @@ feed_format_set(struct pcm_feeder *f, int what, int value) break; default: return (EINVAL); - break; } return (0); diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 7fe8ec856a88..63d7fe11003a 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1469,7 +1469,6 @@ z_resampler_set(struct pcm_feeder *f, int what, int32_t value) break; default: return (EINVAL); - break; } return (z_resampler_setup(f)); @@ -1485,18 +1484,12 @@ z_resampler_get(struct pcm_feeder *f, int what) switch (what) { case Z_RATE_SRC: return (info->rsrc); - break; case Z_RATE_DST: return (info->rdst); - break; case Z_RATE_QUALITY: return (info->quality); - break; case Z_RATE_CHANNELS: return (info->channels); - break; - default: - break; } return (-1); diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index f7c93ca716e6..3e9e3484fba8 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -232,7 +232,6 @@ feed_volume_set(struct pcm_feeder *f, int what, int value) break; default: return (EINVAL); - break; } return (ret); diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index f6eb669010b5..55b61ccb4911 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1071,7 +1071,6 @@ mixer_ioctl_channel(struct cdev *dev, u_long cmd, caddr_t arg, int mode, break; default: return (-1); - break; } pid = td->td_proc->p_pid; From nobody Fri Jan 2 16:58:18 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 4djVJD0kLwz6LvTF for ; Fri, 02 Jan 2026 16:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJC0Hwmz42K2 for ; Fri, 02 Jan 2026 16:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ArrTe4iue2UTq+b+tG8h8qw6gnNCcKmjGbvElHQkSg=; b=SVp5hdQvJ2Ten646hH88egO6Ub8PsyYQCB4VcYYGKEmJhaVXUXgl3YyDpTkUh7PW7RW9oU icmtgNtqc3AUbhRNaiLrZ7EHUAz/4f832jd74BSCstkEmMg9/V8Xc54lTMz5lNEpZpq7Ut ixdJH5cD4nnOn7VEdbjbs2OHN1gxUVJYpjKmFJxHSQ0+9pYyoJC68PzLaUzB3Bbxqu43BL NIUhqwmzdfuA5eoDFuVGgO548J1IPtjEvwn5S84VIoU8/+y1NYUJZxWIwVsUKsbos/BKn/ Kj3cNY+x6VLE7n0BidaOv1IO7MxRNuJ1DqNvq/qob6yU3n0OZwemZi9+6/9QJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ArrTe4iue2UTq+b+tG8h8qw6gnNCcKmjGbvElHQkSg=; b=x3a0gzXE6KAMH2HBICPGVLXc6yDCF5dodgRWIe9aw5DjxDn46mizoAsEUg44IGZQ5DjCQu eBW9JvM0yOCBV1lFjAGm48SJWSHPjSG1HMdgBi3cep8Jwv3IG8q0dJxUJ8oUi/8TZAYLHs L6kSsIepihbRvHDTMpf1Bji0xs4jbEoK1qXk41NQ4FqO1pVJiivPyUnYrv6EAzdJsYpomQ 36bd7B31RBK6l3fWRVDFBmPLZGDeGVSEjPzVALAvedAaH4q7iZIkTbVck3lI8PYDaD479q dQqAobWwqRpYg/Buqxin1Hu9PblnTuB62EMrL6sWbglnEb2lI1ssGoUVpI6Egg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373099; a=rsa-sha256; cv=none; b=IHNBvBK1zkhNB0tZCc0Rvmpr6tQ71LVykZH/BcwMpy8+Z4R3E1DQwnEH5PQOExx/Y6JwHj nLkbgAJ87dHx3mcTxgBTkwcjV9TlWJpRHb9Dgt2CpndTRH0HWqgN9Usohu+af5/jlvLC1L OxkbCbBlnOGz1RQPPn3uC5feeeRt/O/C+PLq/yuKG/w5C/7568UpmnZBtRyqOdCYzR6GPS tmjkALZXUBDMbyU8j5v0Q/Jtw7byvYSS3lEjdJMK8NiawKWQgMW3GIs1XVjuyOxCV9Qn+Q 3JsWQlMQTmsD8u4l8mLFZM/fJ43QLdEfBpq9wZtFVjffzcoElJf+CKgBE3te0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJB5sCLzBGy for ; Fri, 02 Jan 2026 16:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24212 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 45bb10e0ed5a - main - sound: Stop building midi as a module List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 45bb10e0ed5a0b87adcae33635400b5bc36337ec Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:18 +0000 Message-Id: <6957f92a.24212.62547574@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=45bb10e0ed5a0b87adcae33635400b5bc36337ec commit 45bb10e0ed5a0b87adcae33635400b5bc36337ec Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:57 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:04 +0000 sound: Stop building midi as a module There is no reason for this. The midi functions are used by drivers on-demand anyway. Use SYSINIT(9) instead to do the appropriate (de-)initilizations. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54125 --- sys/dev/sound/midi/midi.c | 44 +++++++------------------------------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index cca7b93abf5f..bf8d602c75df 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -102,8 +101,6 @@ static struct cdevsw midi_cdevsw = { }; static int midi_destroy(struct snd_midi *, int); -static int midi_load(void); -static int midi_unload(void); SYSCTL_NODE(_hw, OID_AUTO, midi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Midi driver"); @@ -701,17 +698,16 @@ midi_destroy(struct snd_midi *m, int midiuninit) return 0; } -static int -midi_load(void) +static void +midi_sysinit(void *data __unused) { sx_init(&mstat_lock, "midistat lock"); TAILQ_INIT(&midi_devs); - - return 0; } +SYSINIT(midi_sysinit, SI_SUB_DRIVERS, SI_ORDER_FIRST, midi_sysinit, NULL); -static int -midi_unload(void) +static void +midi_sysuninit(void *data __unused) { struct snd_midi *m, *tmp; int retval; @@ -731,38 +727,12 @@ midi_unload(void) midistat_unlock(); sx_destroy(&mstat_lock); - return 0; + return; exit: mtx_unlock(&m->lock); midistat_unlock(); if (retval) MIDI_DEBUG(2, printf("midi_unload: failed\n")); - return retval; -} - -static int -midi_modevent(module_t mod, int type, void *data) -{ - int retval; - - retval = 0; - - switch (type) { - case MOD_LOAD: - retval = midi_load(); - break; - - case MOD_UNLOAD: - retval = midi_unload(); - break; - - default: - break; - } - - return retval; } - -DEV_MODULE(midi, midi_modevent, NULL); -MODULE_VERSION(midi, 1); +SYSUNINIT(midi_sysuninit, SI_SUB_DRIVERS, SI_ORDER_FIRST, midi_sysuninit, NULL); From nobody Fri Jan 2 16:58: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 4djVJD1ZFgz6LvXx for ; Fri, 02 Jan 2026 16:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJC6tzMz42Tb for ; Fri, 02 Jan 2026 16:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXpsNYNprYikoXZwErC/qsZ6MC3IQnWnWN2Zrc9v8zc=; b=Jb15zHDEQO4IZVX8JxTX4leEeQmUoys45vxBSF8/d6SCGrGgww92Uc5+6i5k1girPQZruz 2ogWQoTbn8MV9F1wRB176Dblm0tcanzC5NqXsCtCzab5Xbc+iiit3I4WCMP/fNR1f+J/rG 5ZqvmNb8LxUPyuq58rGhtFKHgrO4LOzpeycfImxUfPEboQ9FINQNafR6CKwH0RlzCTHNvd cP7bQfqO9kb6jcOnboY7gfK6i+k5nkA8BWg/0zsk0UUYA/AodV6OhGqKXc7anVZCHLmsEr Z3oIV03y9lT26TCJ7kxnPb/uBQtkNqHaw5qeYPOEVFzEhM72lv3lxADn/ggZmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXpsNYNprYikoXZwErC/qsZ6MC3IQnWnWN2Zrc9v8zc=; b=P/ENNNbhxgbByEBHfHfYNkKlwouRz+0fXpEiph+jXlfvsjts+kgGoT9LqJzz0NTpqajGUa dLikvE35UwNr7XegmD9qLU4vd9DiSXa57XJgI5NlTaxC8vQF0pJPHSfpeot/iiqXRkGUAX 8wwQCeEeF6WWbgdJcx6CP4z4NPEVQcjnjSBMp7Aac7zOIWQ2YMw0+mUpZli7+ZQSuM7GP1 Y6l64hddPSlI6r6oGdtuxlswtqdsbfFGRJuyzvHpIxb6p+aeM03e6/P0SykjVR7YTxgCUQ GEWwPSzvjnWZUAyn7zBmd8xa/3pVmhnCFGbiSTbYeC+GlCWilhTJmgi8oU52PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373100; a=rsa-sha256; cv=none; b=xBpoad3cdgeA/T87vGVYyMe/7DNUkqsWCmVltDiWtH2adScIgk9vS7y2MLOI3otBA1eu41 msp/RDJ2quEuIT+vI6s5T3msiyKksYMh17KcZxq+Eu4DFcyIAMkdZLw3ixjDXibRIqbyTb PyZum9S0uoH3kXnlgIEYhfZQ7GRkbVZbozVm8ymZWXbEAv8Vqzc4hX7llLfNBIVA8Pk1rp bJh8Olf2ZNkwPIYqycOZNf+oTxdYGTSqwDt5GHRoWpE0wI3Dlvwtv4gJNQahVOpZ2qzBF5 oxuIWlZ91BOO3pHAhDawVGoB4urvC2sICxf4miQHuS/jMXZLSdP4EbDb73vK2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJC6Vc3zBMr for ; Fri, 02 Jan 2026 16:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 244a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: c508be8ca957 - main - sound: Retire midi_devs and mstat_lock List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: c508be8ca9578ef6e3e4b31de1baca8038c0e0ae Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:19 +0000 Message-Id: <6957f92b.244a0.3c5409c9@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c508be8ca9578ef6e3e4b31de1baca8038c0e0ae commit c508be8ca9578ef6e3e4b31de1baca8038c0e0ae Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:02 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Retire midi_devs and mstat_lock Nowadays midi_devs only has two uses: 1. To verify in midi_init() if a given device unit exists, as well as to calculate the next device unit. Instead, make sure we always get a unique unit and channel number using unr(9). 2. To keep track of all midi devices, so that it can destroy them all at once in midi_sysuninit(). However, since we stopped building midi as a kernel module, there is no reason to do that, simply let the drivers tear down the devices themselves. Also retire mstat_lock since it's only used to protect midi_devs. PR: 261071 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54126 --- sys/dev/sound/midi/midi.c | 130 ++++++++------------------------------------ sys/dev/sound/midi/midi.h | 7 +-- sys/dev/sound/midi/mpu401.c | 2 +- 3 files changed, 26 insertions(+), 113 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index bf8d602c75df..8a74732c8907 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -36,12 +36,11 @@ #include #include #include +#include #include #include #include -#include #include -#include #include #include @@ -62,8 +61,8 @@ struct snd_midi { struct mtx lock; /* Protects all but queues */ void *cookie; - int unit; /* Should only be used in midistat */ - int channel; /* Should only be used in midistat */ + int unit; + int channel; int busy; int flags; /* File flags */ @@ -75,13 +74,8 @@ struct snd_midi { int hiwat; /* QLEN(outq)>High-water -> disable * writes from userland */ struct cdev *dev; - TAILQ_ENTRY(snd_midi) link; }; -TAILQ_HEAD(, snd_midi) midi_devs; - -struct sx mstat_lock; - static d_open_t midi_open; static d_close_t midi_close; static d_ioctl_t midi_ioctl; @@ -102,6 +96,9 @@ static struct cdevsw midi_cdevsw = { static int midi_destroy(struct snd_midi *, int); +struct unrhdr *dev_unr = NULL; +struct unrhdr *chn_unr = NULL; + SYSCTL_NODE(_hw, OID_AUTO, midi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Midi driver"); @@ -111,70 +108,19 @@ SYSCTL_INT(_hw_midi, OID_AUTO, debug, CTLFLAG_RW, &midi_debug, 0, ""); #define MIDI_DEBUG(l,a) if(midi_debug>=l) a -void -midistat_lock(void) -{ - sx_xlock(&mstat_lock); -} - -void -midistat_unlock(void) -{ - sx_xunlock(&mstat_lock); -} - -void -midistat_lockassert(void) -{ - sx_assert(&mstat_lock, SA_XLOCKED); -} - /* - * Register a new rmidi device. cls midi_if interface unit == 0 means - * auto-assign new unit number unit != 0 already assigned a unit number, eg. - * not the first channel provided by this device. channel, sub-unit - * cookie is passed back on MPU calls Typical device drivers will call with - * unit=0, channel=1..(number of channels) and cookie=soft_c and won't care - * what unit number is used. + * Register a new rmidi device. * - * It is an error to call midi_init with an already used unit/channel combo. + * "cookie" is passed to the MPU calls, and is normally set to the driver's + * softc. */ struct snd_midi * -midi_init(kobj_class_t cls, int unit, int channel, void *cookie) +midi_init(kobj_class_t cls, void *cookie) { struct snd_midi *m; - int i; int inqsize, outqsize; uint8_t *buf; - MIDI_DEBUG(1, printf("midiinit: unit %d/%d.\n", unit, channel)); - midistat_lock(); - /* - * Protect against call with existing unit/channel or auto-allocate a - * new unit number. - */ - i = -1; - TAILQ_FOREACH(m, &midi_devs, link) { - mtx_lock(&m->lock); - if (unit != 0) { - if (m->unit == unit && m->channel == channel) { - mtx_unlock(&m->lock); - goto err0; - } - } else { - /* - * Find a better unit number - */ - if (m->unit > i) - i = m->unit; - } - mtx_unlock(&m->lock); - } - - if (unit == 0) - unit = i + 1; - - MIDI_DEBUG(1, printf("midiinit #2: unit %d/%d.\n", unit, channel)); m = malloc(sizeof(*m), M_MIDI, M_WAITOK | M_ZERO); kobj_init((kobj_t)m, cls); inqsize = MPU_INQSIZE(m, cookie); @@ -211,8 +157,8 @@ midi_init(kobj_class_t cls, int unit, int channel, void *cookie) m->busy = 0; m->flags = 0; - m->unit = unit; - m->channel = channel; + m->unit = alloc_unr(dev_unr); + m->channel = alloc_unr(chn_unr); m->cookie = cookie; if (MPU_INIT(m, cookie)) @@ -221,12 +167,8 @@ midi_init(kobj_class_t cls, int unit, int channel, void *cookie) mtx_unlock(&m->lock); mtx_unlock(&m->qlock); - TAILQ_INSERT_TAIL(&midi_devs, m, link); - - midistat_unlock(); - - m->dev = make_dev(&midi_cdevsw, unit, UID_ROOT, GID_WHEEL, 0666, - "midi%d.%d", unit, channel); + m->dev = make_dev(&midi_cdevsw, m->unit, UID_ROOT, GID_WHEEL, 0666, + "midi%d.%d", m->unit, m->channel); m->dev->si_drv1 = m; return m; @@ -241,8 +183,6 @@ err2: free(MIDIQ_BUF(m->outq), M_MIDI); err1: free(m, M_MIDI); -err0: - midistat_unlock(); MIDI_DEBUG(1, printf("midi_init ended in error\n")); return NULL; } @@ -258,7 +198,6 @@ midi_uninit(struct snd_midi *m) int err; err = EBUSY; - midistat_lock(); mtx_lock(&m->lock); if (m->busy) { if (!(m->rchan || m->wchan)) @@ -280,7 +219,6 @@ midi_uninit(struct snd_midi *m) err: mtx_unlock(&m->lock); exit: - midistat_unlock(); return err; } @@ -680,16 +618,17 @@ midi_poll(struct cdev *i_dev, int events, struct thread *td) static int midi_destroy(struct snd_midi *m, int midiuninit) { - midistat_lockassert(); mtx_assert(&m->lock, MA_OWNED); MIDI_DEBUG(3, printf("midi_destroy\n")); m->dev->si_drv1 = NULL; mtx_unlock(&m->lock); /* XXX */ destroy_dev(m->dev); - TAILQ_REMOVE(&midi_devs, m, link); + /* XXX */ if (midiuninit) MPU_UNINIT(m, m->cookie); + free_unr(dev_unr, m->unit); + free_unr(chn_unr, m->channel); free(MIDIQ_BUF(m->inq), M_MIDI); free(MIDIQ_BUF(m->outq), M_MIDI); mtx_destroy(&m->qlock); @@ -701,38 +640,17 @@ midi_destroy(struct snd_midi *m, int midiuninit) static void midi_sysinit(void *data __unused) { - sx_init(&mstat_lock, "midistat lock"); - TAILQ_INIT(&midi_devs); + dev_unr = new_unrhdr(0, INT_MAX, NULL); + chn_unr = new_unrhdr(0, INT_MAX, NULL); } SYSINIT(midi_sysinit, SI_SUB_DRIVERS, SI_ORDER_FIRST, midi_sysinit, NULL); static void midi_sysuninit(void *data __unused) { - struct snd_midi *m, *tmp; - int retval; - - MIDI_DEBUG(1, printf("midi_unload()\n")); - retval = EBUSY; - midistat_lock(); - TAILQ_FOREACH_SAFE(m, &midi_devs, link, tmp) { - mtx_lock(&m->lock); - if (m->busy) - retval = EBUSY; - else - retval = midi_destroy(m, 1); - if (retval) - goto exit; - } - midistat_unlock(); - - sx_destroy(&mstat_lock); - return; - -exit: - mtx_unlock(&m->lock); - midistat_unlock(); - if (retval) - MIDI_DEBUG(2, printf("midi_unload: failed\n")); + if (dev_unr != NULL) + delete_unrhdr(dev_unr); + if (chn_unr != NULL) + delete_unrhdr(chn_unr); } -SYSUNINIT(midi_sysuninit, SI_SUB_DRIVERS, SI_ORDER_FIRST, midi_sysuninit, NULL); +SYSUNINIT(midi_sysuninit, SI_SUB_DRIVERS, SI_ORDER_ANY, midi_sysuninit, NULL); diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h index 286e84264ef3..a4e6c2801150 100644 --- a/sys/dev/sound/midi/midi.h +++ b/sys/dev/sound/midi/midi.h @@ -41,12 +41,7 @@ MALLOC_DECLARE(M_MIDI); struct snd_midi; -void midistat_lock(void); -void midistat_unlock(void); -void midistat_lockassert(void); - -struct snd_midi * -midi_init(kobj_class_t _mpu_cls, int _unit, int _channel, void *cookie); +struct snd_midi *midi_init(kobj_class_t _mpu_cls, void *cookie); int midi_uninit(struct snd_midi *_m); int midi_out(struct snd_midi *_m, uint8_t *_buf, int _size); int midi_in(struct snd_midi *_m, uint8_t *_buf, int _size); diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 7d3edb6323ef..21141a0c8e3c 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -157,7 +157,7 @@ mpu401_init(kobj_class_t cls, void *cookie, driver_intr_t softintr, m->cookie = cookie; m->flags = 0; - m->mid = midi_init(&mpu401_class, 0, 0, m); + m->mid = midi_init(&mpu401_class, m); if (!m->mid) goto err; *cb = mpu401_intr; From nobody Fri Jan 2 16:58: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 4djVJG3ZQVz6Lvf5 for ; Fri, 02 Jan 2026 16:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJG19QKz42Tx for ; Fri, 02 Jan 2026 16:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Kxuq/XjOA7Tun4MDGYA5Tfz529KgERk4+lhatudTvQ=; b=d1cEIIz+3tFeLbCYi56uOmjVmsF0GvULx/ELsaznhvaqoVRyNgh12MvSVTMFBhdVpiGpay zNGDT//7D14v0rcf+hUVZtX7PDFipl3AX21nk/+wLhAuyYzr6VEtFmYlpr//pmNy9aUMV+ J6JNwDDZCoBCMfl23TdWhEnvb+XO7ZNfSyRsXumtw64tJ/8cCs6aLARdvTSDnXQTGIAlpE nQsDYYj4Ri5qmneG2CXRaCevOosTJfmTa4wDSFddUUHvWRRDR9HqMVua2ntsGGY6fG7SoL wJ5tabQjHNJQXEA8dzpyJYAyDb1E4qHPBRv64fcd1lYpMJkAD5OMczfKWSVogA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Kxuq/XjOA7Tun4MDGYA5Tfz529KgERk4+lhatudTvQ=; b=iidC12VWwytDzCoHQaPDxQXTDzNO0JTO3GAnubuhQGAyCLxDhLmlC9FoBAz5wlDnfF4HfV 2P3V+dEkZRvtJSnRjIAdSpvwZ+VHwu3yBXA26cvH3V3xBhkIX4BD8uAu11/pE4s7GjPzaK RmBej/CIg2BiyCL/NZErMqXzd80MP1Ksr8v/pGXBnHQmFFmtpl+/868AKTxN+2MHH1Bkis rzuQcxYgFVjMatZWkw44tf7Wb63uxUz+Juu7ayZLALWv4mLPkI7J9giA0aKDhulOhVAQdZ zjcSUpLZtsO2WH4lZVWg4m8hvMOF3JXs+odhzBJ+y3oAXuMpJ8q+DEe9zy6Z0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373102; a=rsa-sha256; cv=none; b=DTLU3UmKH4R08x0UqNakGHxlzHWnDT5h/WO2hQx+KlSM9jAFC8n1PXc8In7epHlTBHjtv9 svjMy88JU23jIrHsxOlszbZIx4usLDn4J6r2vtzvkkiaOJ2qU5NASZM5p0D4FbOBj4je+t tL2E8MkexUPmXQHh7I/eakplNvaPs0vxFKjrvWopsfErr40aP8Ge5yN6SZI81qjWqY/H64 kQ9OjHwGUBt5i7pFnovR6GY7UhOzzl/m4y2AgJsIN0KZe2kD/O8NheQSmMzx2qgBYqOecW adXwCcOMY3RzdH1pUWQQRxbPBJoNNJLkA/TMPl0L6mammFYVO5RvHfze2cPdeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJG0YvbzB3d for ; Fri, 02 Jan 2026 16:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 244a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 4cc78f5dd7c2 - main - sound: Retire snd_midi->qlock List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 4cc78f5dd7c2e82571ced6e23fa22d48c6cd1697 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:22 +0000 Message-Id: <6957f92e.244a4.6811698c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4cc78f5dd7c2e82571ced6e23fa22d48c6cd1697 commit 4cc78f5dd7c2e82571ced6e23fa22d48c6cd1697 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:12 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Retire snd_midi->qlock snd_midi->qlock is used to protect snd_midi->{in,out}q. However, apart from the numerous LORs present already in the code, there is no reason not to use snd_midi->lock, as we do for the rest of the structure Started by: https://github.com/freebsd/freebsd-src/pull/1902 Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_nicolas-provost.fr Differential Revision: https://reviews.freebsd.org/D54129 --- sys/dev/sound/midi/midi.c | 60 +++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 8a74732c8907..0ed03dbc898b 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -58,7 +58,7 @@ MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area"); #define MIDI_NAMELEN 16 struct snd_midi { KOBJ_FIELDS; - struct mtx lock; /* Protects all but queues */ + struct mtx lock; void *cookie; int unit; @@ -67,7 +67,6 @@ struct snd_midi { int busy; int flags; /* File flags */ char name[MIDI_NAMELEN]; - struct mtx qlock; /* Protects inq, outq and flags */ MIDIQ_HEAD(, char) inq, outq; int rchan, wchan; struct selinfo rsel, wsel; @@ -131,10 +130,8 @@ midi_init(kobj_class_t cls, void *cookie) goto err1; mtx_init(&m->lock, "raw midi", NULL, 0); - mtx_init(&m->qlock, "q raw midi", NULL, 0); mtx_lock(&m->lock); - mtx_lock(&m->qlock); if (inqsize) buf = malloc(sizeof(uint8_t) * inqsize, M_MIDI, M_NOWAIT); @@ -165,7 +162,6 @@ midi_init(kobj_class_t cls, void *cookie) goto err2; mtx_unlock(&m->lock); - mtx_unlock(&m->qlock); m->dev = make_dev(&midi_cdevsw, m->unit, UID_ROOT, GID_WHEEL, 0666, "midi%d.%d", m->unit, m->channel); @@ -174,7 +170,6 @@ midi_init(kobj_class_t cls, void *cookie) return m; err2: - mtx_destroy(&m->qlock); mtx_destroy(&m->lock); if (MIDIQ_BUF(m->inq)) @@ -246,17 +241,18 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) { int used; + mtx_lock(&m->lock); + MIDI_DEBUG(5, printf("midi_in: m=%p size=%d\n", m, size)); -/* - * XXX: locking flub - */ - if (!(m->flags & M_RX)) - return size; + if (!(m->flags & M_RX)) { + /* We should return 0 but this may stop receiving/sending. */ + mtx_unlock(&m->lock); + return (size); + } used = 0; - mtx_lock(&m->qlock); MIDI_DEBUG(6, printf("midi_in: len %jd avail %jd\n", (intmax_t)MIDIQ_LEN(m->inq), (intmax_t)MIDIQ_AVAIL(m->inq))); @@ -265,7 +261,7 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) MIDIQ_ENQ(m->inq, buf, size); } else { MIDI_DEBUG(4, printf("midi_in: Discarding data qu\n")); - mtx_unlock(&m->qlock); + mtx_unlock(&m->lock); return 0; } if (m->rchan) { @@ -273,7 +269,7 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) m->rchan = 0; } selwakeup(&m->rsel); - mtx_unlock(&m->qlock); + mtx_unlock(&m->lock); return used; } @@ -285,14 +281,14 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) { int used; -/* - * XXX: locking flub - */ - if (!(m->flags & M_TXEN)) - return 0; + mtx_lock(&m->lock); MIDI_DEBUG(2, printf("midi_out: %p\n", m)); - mtx_lock(&m->qlock); + if (!(m->flags & M_TXEN)) { + mtx_unlock(&m->lock); + return (0); + } + used = MIN(size, MIDIQ_LEN(m->outq)); MIDI_DEBUG(3, printf("midi_out: used %d\n", used)); if (used) @@ -308,7 +304,7 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) } selwakeup(&m->wsel); } - mtx_unlock(&m->qlock); + mtx_unlock(&m->lock); return used; } @@ -324,7 +320,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) return ENXIO; mtx_lock(&m->lock); - mtx_lock(&m->qlock); retval = 0; @@ -365,7 +360,7 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) MIDI_DEBUG(2, printf("midi_open: opened.\n")); -err: mtx_unlock(&m->qlock); +err: mtx_unlock(&m->lock); return retval; } @@ -384,7 +379,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) return ENXIO; mtx_lock(&m->lock); - mtx_lock(&m->qlock); if ((flags & FREAD && !(m->flags & M_RX)) || (flags & FWRITE && !(m->flags & M_TX))) { @@ -405,7 +399,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) MIDI_DEBUG(1, printf("midi_close: closed, busy = %d.\n", m->busy)); - mtx_unlock(&m->qlock); mtx_unlock(&m->lock); retval = 0; err: return retval; @@ -433,7 +426,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; mtx_lock(&m->lock); - mtx_lock(&m->qlock); if (!(m->flags & M_RX)) goto err1; @@ -443,9 +435,8 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) retval = EWOULDBLOCK; if (ioflag & O_NONBLOCK) goto err1; - mtx_unlock(&m->lock); m->rchan = 1; - retval = msleep(&m->rchan, &m->qlock, + retval = msleep(&m->rchan, &m->lock, PCATCH | PDROP, "midi RX", 0); /* * We slept, maybe things have changed since last @@ -459,7 +450,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) if (retval) goto err0; mtx_lock(&m->lock); - mtx_lock(&m->qlock); m->rchan = 0; if (!m->busy) goto err1; @@ -483,7 +473,7 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) * If we Made it here then transfer is good */ retval = 0; -err1: mtx_unlock(&m->qlock); +err1: mtx_unlock(&m->lock); err0: MIDI_DEBUG(4, printf("midi_read: ret %d\n", retval)); return retval; @@ -508,7 +498,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; mtx_lock(&m->lock); - mtx_lock(&m->qlock); if (!(m->flags & M_TX)) goto err1; @@ -518,10 +507,9 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) retval = EWOULDBLOCK; if (ioflag & O_NONBLOCK) goto err1; - mtx_unlock(&m->lock); m->wchan = 1; MIDI_DEBUG(3, printf("midi_write msleep\n")); - retval = msleep(&m->wchan, &m->qlock, + retval = msleep(&m->wchan, &m->lock, PCATCH | PDROP, "midi TX", 0); /* * We slept, maybe things have changed since last @@ -534,7 +522,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) if (retval) goto err0; mtx_lock(&m->lock); - mtx_lock(&m->qlock); m->wchan = 0; if (!m->busy) goto err1; @@ -567,7 +554,7 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) * If we Made it here then transfer is good */ retval = 0; -err1: mtx_unlock(&m->qlock); +err1: mtx_unlock(&m->lock); err0: return retval; } @@ -591,7 +578,6 @@ midi_poll(struct cdev *i_dev, int events, struct thread *td) revents = 0; mtx_lock(&m->lock); - mtx_lock(&m->qlock); if (events & (POLLIN | POLLRDNORM)) { if (!MIDIQ_EMPTY(m->inq)) @@ -607,7 +593,6 @@ midi_poll(struct cdev *i_dev, int events, struct thread *td) } mtx_unlock(&m->lock); - mtx_unlock(&m->qlock); return (revents); } @@ -631,7 +616,6 @@ midi_destroy(struct snd_midi *m, int midiuninit) free_unr(chn_unr, m->channel); free(MIDIQ_BUF(m->inq), M_MIDI); free(MIDIQ_BUF(m->outq), M_MIDI); - mtx_destroy(&m->qlock); mtx_destroy(&m->lock); free(m, M_MIDI); return 0; From nobody Fri Jan 2 16:58: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 4djVJF3tC3z6Lvgm for ; Fri, 02 Jan 2026 16:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJF0TNYz42RK for ; Fri, 02 Jan 2026 16:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tk6dwxl5KF8GWLJNYwhrOt1i5dwxIMCG0qJEhyUr390=; b=VO9EpKxCqZD4bL9VUvx2ZSvZ8EuKcC+8a+WK+Oa/0RD/oJsOujh14yHuIkx5o+cekJyFGH 9dfVXBPDH1yvT83jo85CatPU8VRkVzuwD78KoQ0eVl2lk0l8uLArkzwUsdwDXXLAmZK4oi T5CKQi3C7c8Ve2Iv++0mODBS622j8bzfvGk8BvrjPTgAkTdojYv/cC0lp4088LeGsAgMQq czPb7o7jdSdWspAomKVjpeJpzXeMR5rcSnHzdDJL6hBdOqGN9FVJhkfF7TmaNzywqFVJ+T 747JgP/0/9gPORAE4iE3RfArJCqTGjQJR+ziDqXp5ueMz572PIuDv7ASzTtIlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tk6dwxl5KF8GWLJNYwhrOt1i5dwxIMCG0qJEhyUr390=; b=cGDGtiGR7uGsp4tfSYPzVQCeYOtlJhME5Yk7vhSyUHdQlnrXeSm2M6E5AQffnI0lyHeKBt RzLDav7ULOsii+AvLxNK6wpHT+gFodDt9z2u96T0TdmQi/8OjmB6KUrw8B3C1pdrsjoPPn LDH3ofKEruCYVnDgOH+9qw3qEdq4Ujn0I4cohhChDSQcUqlRUFPTOH2gqEmnf+teehUtAK +p5az6VhP36ciYcRFPHBU8Y/qB2ncHZTj5iWLrxGyOSj5Zh8dbhtHzlAh0iUIHzM74jXPL XP+U+ShnmTMEOu5LWuAYtVY7+XFRVZduXq3QqlL0GkpXkqnyNBLfPE5RdjBaUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373101; a=rsa-sha256; cv=none; b=xGQ7manG7ZZcQtWjPJv15zpoq+BOhOv0eTkw2eTuHE5PiWg57iZU/VjDxRhsPflNLvbn2u Sf50T8zFVFH+Nf2xZaQ6bdDniMTmDupsWC2zagNnvL00/S/MiLrH3Leeysj4rNBsSjp6iO qFHEmYCKSKIDeEYk1Kqx/Vyoi/Vt/WeJoxt2ZmNl7z6yYWNc/datA70iMoud8g40GXTjep htgW4jE9QHxzSJMBUOMMY6MoyvOrnwFLsUxpmzEB7DC1KKs5FIn+dHdycIpbGiTStelznB +VFMuNMsyhsAkyb54ScLjOnSTUdBDO6h6pyQgGtwC/xCE43YivXHC3NGIOa2TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJD6wvZzBQG for ; Fri, 02 Jan 2026 16:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 249de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e963472ef853 - main - snd_dummy: Initial MIDI support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e963472ef8533fb39b581e746cdc2ddc7447dca2 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:20 +0000 Message-Id: <6957f92c.249de.3911185a@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e963472ef8533fb39b581e746cdc2ddc7447dca2 commit e963472ef8533fb39b581e746cdc2ddc7447dca2 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:07 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 snd_dummy: Initial MIDI support Because testing the midi/ code of sound(4) requires a physical MIDI device, add some basic MIDI support to snd_dummy(4) so that we can test patches to midi/ easier. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54127 --- sys/dev/sound/dummy.c | 47 +++++++++++++++++++++++++++++++++ sys/modules/sound/driver/dummy/Makefile | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 74ca1d0c924c..aec76339ae17 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -40,7 +40,10 @@ #endif #include +#include + #include +#include #define DUMMY_NPCHAN 1 #define DUMMY_NRCHAN 1 @@ -66,6 +69,8 @@ struct dummy_softc { struct callout callout; struct mtx lock; bool stopped; + struct mpu401 *mpu; + mpu401_intr_t *mpu_intr; }; static bool @@ -93,6 +98,9 @@ dummy_chan_io(void *arg) struct dummy_chan *ch; int i = 0; + if (sc->mpu_intr) + (sc->mpu_intr)(sc->mpu); + if (sc->stopped) return; @@ -294,6 +302,39 @@ static kobj_method_t dummy_mixer_methods[] = { MIXER_DECLARE(dummy_mixer); +static uint8_t +dummy_mpu_read(struct mpu401 *arg, void *sc, int reg) +{ + return (0); +} + +static void +dummy_mpu_write(struct mpu401 *arg, void *sc, int reg, unsigned char b) +{ +} + +static int +dummy_mpu_uninit(struct mpu401 *arg, void *cookie) +{ + struct dummy_softc *sc = cookie; + + mtx_lock(&sc->lock); + sc->mpu_intr = NULL; + sc->mpu = NULL; + mtx_unlock(&sc->lock); + + return (0); +} + +static kobj_method_t dummy_mpu_methods[] = { + KOBJMETHOD(mpufoi_read, dummy_mpu_read), + KOBJMETHOD(mpufoi_write, dummy_mpu_write), + KOBJMETHOD(mpufoi_uninit, dummy_mpu_uninit), + KOBJMETHOD_END +}; + +static DEFINE_CLASS(dummy_mpu, dummy_mpu_methods, 0); + static void dummy_identify(driver_t *driver, device_t parent) { @@ -354,6 +395,11 @@ dummy_attach(device_t dev) */ make_dev_alias(sc->info.dsp_dev, "dsp.dummy"); + sc->mpu = mpu401_init(&dummy_mpu_class, sc, dummy_chan_io, + &sc->mpu_intr); + if (sc->mpu == NULL) + return (ENXIO); + return (0); } @@ -368,6 +414,7 @@ dummy_detach(device_t dev) mtx_unlock(&sc->lock); callout_drain(&sc->callout); err = pcm_unregister(dev); + mpu401_uninit(sc->mpu); mtx_destroy(&sc->lock); return (err); diff --git a/sys/modules/sound/driver/dummy/Makefile b/sys/modules/sound/driver/dummy/Makefile index fb4127d35073..41dec7c83b4d 100644 --- a/sys/modules/sound/driver/dummy/Makefile +++ b/sys/modules/sound/driver/dummy/Makefile @@ -1,7 +1,7 @@ .PATH: ${SRCTOP}/sys/dev/sound KMOD= snd_dummy -SRCS= bus_if.h device_if.h +SRCS= bus_if.h device_if.h mpufoi_if.h SRCS+= dummy.c .include From nobody Fri Jan 2 16:58: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 4djVJJ0bl5z6LvfR for ; Fri, 02 Jan 2026 16:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJH2RFhz42S3 for ; Fri, 02 Jan 2026 16:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+a5hoMkH8jQj2DW5ooxneGk3vAODxerVGa7ulJ2dsM=; b=xLMgiS8ZKGPK9PEz9Mfkt2pLpxopQZROxPT14upcvxjq+aNn96oAEk5HNA5XHL8WCY1iaT oVemUpJJEhUjzF/MHHcE0aUwHczukLkK+rD2EffLDW15UY7GKnCBSjvcRdyYGjKh/l++y4 hJ6Vj+Av33O5CMq4LuMmb3T+DwaFd9c6OmmRW0gWYLCXWYXrkYTpBt0CXr/MHhmA1jpzKo +ZaTgLhxuge9c+4l/PQlNJi9sSDtQbkrwYn3Y5l6BVDpT8v81jD+gh7c06EaCTSYYEinOW e//9XHUVj2VfLTnMEa8voS/4TxN0pN1j/rB0tF8Q53p6Le6nXP7Xs49l3u5o1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+a5hoMkH8jQj2DW5ooxneGk3vAODxerVGa7ulJ2dsM=; b=LycOzOlcSrW9uWredtvzaGxmC+5b1QjdAH3mOEuBDiXSOuqHN0ifGMggrmp+lxb+NMz/Si 182unbvMZe9uhHedTFg30mNxC4bZ+mB7i0bX/X5MHTPlk8aMEs3pDDteOrz9jlqCw/gGga KR8T8tliDcCm27aL7QhTdfm5bVfzmdDVL7z/VpmBQCX2kDKPAGgnE75RoDyeTQFk6txkLK HsWiwxjqOMqECBkyleN7QY7C/0aFap+CbITbUervl0zmU+7Y2M7FpbEXXurAnChy2Uz3z2 XbNSh/Mdv/yrDF7pF2weutgUir8PpoILA25voi4r/064b3SRDXLPt9lAAiMZJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373103; a=rsa-sha256; cv=none; b=rtbeSivh4h/yJQpCtMmiLxYp0/RnD5ashdAe1iTltUJ4xU/B4264yC6r16AgMujxZuXYop 7//xqUg/33M+Jm2Vh0lGoTGmdMD9mt7Og99xdMDcxO7HsJOYdtSYLb86rj2dxkev7wWOWT fHcTKc2VHU7lD5/A0XYnh5CgeDY0JlJNGp6LrgAqIL9oDA6y1I0UPILwXbyyGJq5jLB4Zw 4q3dI9E+qcBgMMIn2og3GrNV3OCKl6hId17yFUUQwPxmr0qMUhaVRtKbRmXc8STJ6qBeXS tqO27GTHM3Txr+NAvrXnQ4e/B5vGG+V8ONWw+kbFiGy0wmnBuTVH7AS19mM5OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJH1FMLzBMv for ; Fri, 02 Jan 2026 16:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 247c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: fb945a50e264 - main - sound: Update midi/midi.* LICENSE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: fb945a50e2649c9a1c3a9b38ffb84f53e37abd0a Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:23 +0000 Message-Id: <6957f92f.247c3.4f0fbec5@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fb945a50e2649c9a1c3a9b38ffb84f53e37abd0a commit fb945a50e2649c9a1c3a9b38ffb84f53e37abd0a Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:15 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Update midi/midi.* LICENSE Spsonsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 4 ++++ sys/dev/sound/midi/midi.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 0ed03dbc898b..901e098d4883 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -4,6 +4,10 @@ * Copyright (c) 2003 Mathew Kanner * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * This code is derived from software contributed to The NetBSD Foundation * by Lennart Augustsson (augustss@netbsd.org). diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h index a4e6c2801150..c012a9d96da6 100644 --- a/sys/dev/sound/midi/midi.h +++ b/sys/dev/sound/midi/midi.h @@ -3,6 +3,10 @@ * * Copyright (c) 2003 Mathew Kanner * All rights reserved. + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions From nobody Fri Jan 2 16:58: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 4djVJK2yB6z6Lvpy for ; Fri, 02 Jan 2026 16:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJJ3TtNz42dQ for ; Fri, 02 Jan 2026 16:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dY3Dy1TDOfbv0IuD8RNMd1ZYDTsQHJY9BJe6vW12JNo=; b=oOcZko6bGAKGz5pDbucI5hp+20EYv5YPRDBfbEW9elXxh7zUbMIc/GWQxlQ0/kgWJeSyLo WRHFjbrZZP/Q4FRJvB4+YnkE2kOTbuB+cUV4AWxUZVAIIHoPoDjy9F6vFPRSTbmvOaUSgY AMT2LetHltp8lFxxOk/BWGKHHNEkuEFCVav1qw/VEz0e1TSI9D9kUIYzZL3y4kuj/QHla1 H2/kk8MwQ24VFJVjtY7lqCgxiFE73pc7RrfhjjB3RQERHSg8thJP8hPg7eYOeC4ru68GLu kkKCsSYvvtlLgI4ImHw1VA/db6BAbFgZxHNuyQJwDvNp3VwH0H09ACjd5ue2zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dY3Dy1TDOfbv0IuD8RNMd1ZYDTsQHJY9BJe6vW12JNo=; b=Ank82lij8JkHlVDLruZIV5i00YZmm7BHPTYi9drNk7pzL5RVuxnicWRroc9Xq55aQOowN9 mvsQjoR74vEuoegad/7BOloJ89vUn6mkKYr4ZMTAECN0sKeFdjwBbhGkHff6GuxT66wFGW VbA53JaLNM+l1XGTuxfRbPCnQ1YJuqv/WiB+DGx7Sc4niKT+lgdStdmy4w719+mEZyIg6d L3a60XletUbBo55+/hXh4OxMbbduVugVOW844yKHsdUQB93QOu0iEu+O9SKwHAY6ha2HfJ 4GtCUhmLul0MZVtJF/IxCRJUDL72vAcvmFo7VklUlM2euarkvh63xfQrn5eTIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373104; a=rsa-sha256; cv=none; b=Fyon/YJR8U9rcuGrLjW/tO07YUmw7RIB0xsUTmGfCaeJ7UH+z+6FXwkFKSWVNjL+qX0yt3 cjrLn/x+4sxiTBgmgjqvvCHEEw+EA3VBf4BlPKJsZ7KOu2wBcVlsn9kxQVJIFG0xTo+lM5 DkNcLA1hDArw2BXuDrD3ij1f0woAUmv448thCobKTL0S1gbGIFciJwz/ydcPvxU1AKYIPv 2OFXX76aXBoygJjg/Gf+KyUCPTX41qBjDHPVvT/Y+t9Fw0TfyxsWuVrHPwYu97aYCML/hm GyXalk20LcrBciRMvTho7ADf/klVYVshamv27glZvSbF7eWr7hSSVw5ySwxfjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJJ1ry5zBSc for ; Fri, 02 Jan 2026 16:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 231b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d912ea5879cd - main - sound: Merge midi_destroy() with midi_uninit() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: d912ea5879cd6b1042671ae3986d496c63be4d49 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:24 +0000 Message-Id: <6957f930.231b1.65ffa9ab@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d912ea5879cd6b1042671ae3986d496c63be4d49 commit d912ea5879cd6b1042671ae3986d496c63be4d49 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:19 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Merge midi_destroy() with midi_uninit() Also always call MPU_UNINIT(). It does not make sense not to if we are deallocating everything. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54192 --- sys/dev/sound/midi/midi.c | 57 ++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 43 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 901e098d4883..2567f7412eb8 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -97,8 +97,6 @@ static struct cdevsw midi_cdevsw = { .d_name = "rmidi", }; -static int midi_destroy(struct snd_midi *, int); - struct unrhdr *dev_unr = NULL; struct unrhdr *chn_unr = NULL; @@ -186,21 +184,15 @@ err1: return NULL; } -/* - * midi_uninit does not call MIDI_UNINIT, as since this is the implementors - * entry point. midi_uninit if fact, does not send any methods. A call to - * midi_uninit is a defacto promise that you won't manipulate ch anymore - */ int midi_uninit(struct snd_midi *m) { - int err; - - err = EBUSY; mtx_lock(&m->lock); if (m->busy) { - if (!(m->rchan || m->wchan)) - goto err; + if (!(m->rchan || m->wchan)) { + mtx_unlock(&m->lock); + return (EBUSY); + } if (m->rchan) { wakeup(&m->rchan); @@ -211,14 +203,17 @@ midi_uninit(struct snd_midi *m) m->wchan = 0; } } - err = midi_destroy(m, 0); - if (!err) - goto exit; - -err: mtx_unlock(&m->lock); -exit: - return err; + MPU_UNINIT(m, m->cookie); + destroy_dev(m->dev); + free_unr(dev_unr, m->unit); + free_unr(chn_unr, m->channel); + free(MIDIQ_BUF(m->inq), M_MIDI); + free(MIDIQ_BUF(m->outq), M_MIDI); + mtx_destroy(&m->lock); + free(m, M_MIDI); + + return (0); } #ifdef notdef @@ -601,30 +596,6 @@ midi_poll(struct cdev *i_dev, int events, struct thread *td) return (revents); } -/* - * Single point of midi destructions. - */ -static int -midi_destroy(struct snd_midi *m, int midiuninit) -{ - mtx_assert(&m->lock, MA_OWNED); - - MIDI_DEBUG(3, printf("midi_destroy\n")); - m->dev->si_drv1 = NULL; - mtx_unlock(&m->lock); /* XXX */ - destroy_dev(m->dev); - /* XXX */ - if (midiuninit) - MPU_UNINIT(m, m->cookie); - free_unr(dev_unr, m->unit); - free_unr(chn_unr, m->channel); - free(MIDIQ_BUF(m->inq), M_MIDI); - free(MIDIQ_BUF(m->outq), M_MIDI); - mtx_destroy(&m->lock); - free(m, M_MIDI); - return 0; -} - static void midi_sysinit(void *data __unused) { From nobody Fri Jan 2 16:58: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 4djVJK73FNz6LvsR for ; Fri, 02 Jan 2026 16:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJK2vYYz42Xk for ; Fri, 02 Jan 2026 16:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1PQfazM+XK/40OpQNn2pU+cSIFukPogsGmVQtTbOo3o=; b=o6VuCGtb5zuuHtvEIJMjtvL8UN+GWOBI6PNyhaEkDbSH5Ro7LXqataYd8mpwKLxpSirq9G zqYTHmitnkRkz4wGBQ8jqZzA+7SFMNz+P4dORUW8rvgFaxn/5zYqYOHtK9Sg5g1lY7Vxfh cioIRYrMTxUVUf6PbK4iJzskVxEz8hbpbEmOSub1UY1GvV9+8+rI2W5fQl9DY/ImRlajq1 3eEYl6DQdJx1h+bkcdevEjP2f4dSr50XqoW1AENT6cR6k4eRNi/F6Q5yBinlbk067iBI7M lfgq1SUmycm6MOIN7rtO6Nb/CgsAZO31Puy9gyYyXgZLOGs1sS2ejije7e5pyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1PQfazM+XK/40OpQNn2pU+cSIFukPogsGmVQtTbOo3o=; b=O1hkxd8PKycNClxLOQ/YOSHuBbmr8PoSaRmjKX71jkyhGYm1OPt29ODv+FWSNEqk6AsDkM ZTusFGyZBrSchLwlliT5wprjV08ngCyqEDUqpyjHLjOqx3lZtYNHdJrMSIyuWIwDZIIMnp Ku1ZBnZ6EarkGzXEl/ifNSNxTOKfYSjZZmRmti1/0djNp1EpIn9hotlmtdQOmT5W2KWi78 OoP2MXcwZzLJ2676GU6Zwr4dLqNUBTCiwX59tunZP5kRGvqKTGny5Zb+k0ZR9G7s3aJqSU TvWAdXVEx3Q6i1sj1u7LNu4u3qO3bMQNiHNPM9EZKAt9fWb5ghWDtt0PH8+4gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373105; a=rsa-sha256; cv=none; b=wCqz1PhkueiQQQ4Tp0ACtWHbhy34PTF+zb/TnqN/PZ7DWew9tAYG7RqxIJcFgKorXrC3Qf p5fcEErWYuHB+DGHQ3UA45yU+dLIIqwqKOFWV4Oz2OBa6xS64YW8pCJhSH9IgsjRx8Lebw mPT9WIHmkKPe3qSTky6+rFb2JUKoYZglCeSpaNoAHcbZu+VCD1bUVNBRvyiwC95/nJFNdE xtRWhC6W+MBJ1C1kq2kupESlygtwU8AHGhHEKLHza//7cG/j/pY2G6DASQ2V5R/QBNML2Q SPo+ZBNLfQoAuh4Xb7fPflDwK3SAqCzdGiCnufxq9ioAdooVPSvLgNIROGdRUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJK2SWrzBKD for ; Fri, 02 Jan 2026 16:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d54c782fde63 - main - sound: Retire snd_midi->busy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: d54c782fde63d3b17433551da0b7ec94bc2a5ed4 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:25 +0000 Message-Id: <6957f931.228e9.4bc769d9@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d54c782fde63d3b17433551da0b7ec94bc2a5ed4 commit d54c782fde63d3b17433551da0b7ec94bc2a5ed4 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:22 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Retire snd_midi->busy Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 2567f7412eb8..aa039018e207 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -68,7 +68,6 @@ struct snd_midi { int unit; int channel; - int busy; int flags; /* File flags */ char name[MIDI_NAMELEN]; MIDIQ_HEAD(, char) inq, outq; @@ -154,7 +153,6 @@ midi_init(kobj_class_t cls, void *cookie) (outqsize && !MIDIQ_BUF(m->outq))) goto err2; - m->busy = 0; m->flags = 0; m->unit = alloc_unr(dev_unr); m->channel = alloc_unr(chn_unr); @@ -188,20 +186,13 @@ int midi_uninit(struct snd_midi *m) { mtx_lock(&m->lock); - if (m->busy) { - if (!(m->rchan || m->wchan)) { - mtx_unlock(&m->lock); - return (EBUSY); - } - - if (m->rchan) { - wakeup(&m->rchan); - m->rchan = 0; - } - if (m->wchan) { - wakeup(&m->wchan); - m->wchan = 0; - } + if (m->rchan) { + wakeup(&m->rchan); + m->rchan = 0; + } + if (m->wchan) { + wakeup(&m->wchan); + m->wchan = 0; } mtx_unlock(&m->lock); MPU_UNINIT(m, m->cookie); @@ -338,7 +329,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (retval) goto err; } - m->busy++; m->rchan = 0; m->wchan = 0; @@ -384,7 +374,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) retval = ENXIO; goto err; } - m->busy--; oldflags = m->flags; @@ -396,8 +385,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) if ((m->flags & (M_TXEN | M_RXEN)) != (oldflags & (M_RXEN | M_TXEN))) MPU_CALLBACK(m, m->cookie, m->flags); - MIDI_DEBUG(1, printf("midi_close: closed, busy = %d.\n", m->busy)); - mtx_unlock(&m->lock); retval = 0; err: return retval; @@ -450,8 +437,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; mtx_lock(&m->lock); m->rchan = 0; - if (!m->busy) - goto err1; } MIDI_DEBUG(6, printf("midi_read start\n")); /* @@ -522,8 +507,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; mtx_lock(&m->lock); m->wchan = 0; - if (!m->busy) - goto err1; } /* From nobody Fri Jan 2 16:58: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 4djVJL6qNRz6LvfZ for ; Fri, 02 Jan 2026 16:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJL3Sr2z42Vj for ; Fri, 02 Jan 2026 16:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Ba760gglGnGuAZHy0nEgJpqEG+GvPV5/sZWqaF9pCU=; b=e5cSUl5si7kc+25Kt/0Ijq8HKa8PIjvKC2h17tgX9r6ZcpAiKWBRiq+i7hOyQDPOZnRtf3 fwaZSlaF1y8qWDfW8uc8/rm2j+Uq0Wa4F3NDyjxYKHnZroxf06GEMtBzZqyo8IW90RDuNS QU8pmAZWW9i1Q3bpTRsIcTeBm8jJVeoYhyw1kErTYnSXwDu3SFM2lZMJ47EofkDyfcF5+w HTJQthSddKEVwv4vrLki7iQyMl9h6Y82s8ZHTQB+4aDAUiDaHPmvGij+54+zl68TGQ9DVC RaCiT8CLTsS5mTS4ckzJ6ZEXnZb1LGHzaDhefh3Vtv3SKgSQ1jMyRq7Ftjv70w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Ba760gglGnGuAZHy0nEgJpqEG+GvPV5/sZWqaF9pCU=; b=DN+NxjdiMu6+V3AMcEqwc7GwE3NnhhYaxTwyfRbFhdCC17rwf5CQaqPHy6phvopiBvftqG rDxTIB1xAxqptdiWOt6yF6vXJqFz0qtkAQ944EZ7mZ/gNp8V3AScKtvvgH5RzxGzKI5DfA wsncoakhs/wOmMzMu70NmN8Ij9Le8Yy0yjRQjks1dF5yBUULd7YHu8fF+ydewPU79ueOYl Svt5B95TCN/DM6vMpxNop/5VXl46Fv8G5bFsa3QhKFV7TDaV7FHPlxPDNmzJe8ZIfixQ3z cE2Iu7nMyMfWBAn8iMGV13HW/sSp1J+aOjyyy9rvQJTI216QwgKi2bqbV4/1aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373106; a=rsa-sha256; cv=none; b=hlzrw96zf1hXbpnRnWWGos0eMt4jCqR2pp7ejXF8kXvh/0MpQ7gziZc6pd1nJ8hbb2kVfu RZ1XCpuDZ5qkiXvB7d/+pPvg5+KnE8dG0bRGZo4qiieLkzA8cGlbB1bf2Jeze8A8JilhZu GZe0XCyjlQbeKnw/lDE5wsKxeceT8354fJxTPuP+fDlQllVZSh/YusiY5KG7Xaf2fdNxcg wOPqqspiVkkr+hPG6l54jir3/mAd+2H+UiOKX8gclZ2Yd+WFELTrMK2pmpFl7f9ojVjJ3d afJ7BMq1wMbqMKUUFIqJZ5MxhVrPW7YkDCnhY6bBv5GKWcRzT2Y6kcVu4kktXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJL34LlzBSd for ; Fri, 02 Jan 2026 16:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23a72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d2baf9301be3 - main - sound: Remove dead if-statement List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: d2baf9301be3093c5f53a7ce1de858a0c690cd07 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:26 +0000 Message-Id: <6957f932.23a72.2bd010b0@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d2baf9301be3093c5f53a7ce1de858a0c690cd07 commit d2baf9301be3093c5f53a7ce1de858a0c690cd07 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:24 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Remove dead if-statement No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index aa039018e207..f54b95daf280 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -432,7 +432,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; if (m != i_dev->si_drv1) retval = ENXIO; - /* if (retval && retval != ERESTART) */ if (retval) goto err0; mtx_lock(&m->lock); From nobody Fri Jan 2 16:58: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 4djVJM6t4mz6Lvfg for ; Fri, 02 Jan 2026 16:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJM46r7z42f0 for ; Fri, 02 Jan 2026 16:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8SbiTB1u5gjtbEQXQ8hsn0fGKu7eS6d2M7UgPVqLc78=; b=xOd/E3b4KX+B+CxkEhCCS8ioYLDgjg04jyUCR23CYRdFS0Gxuff7J+bPXcKaGzTWsc4oxq tgoDcRfNEvZBrblraxXv8X+pTeZf9fdnstX+KR+ONDBp2PuT2JgfOMWE3dEQwPSTGXd/F3 EIrePkJJCKQWHjfWMWHSX1bcyv5FcYcOaZD6wG2q5l3QNN/soAkrTdynC1SFbKWCZGEN7M bretleLwKFbPtAuInPW6UhTIFTEDPp1mp02D6hvnGruckmDFMcB2r439mjvoh66U0jM42Y XqzLeWFszFxXPci/bSIe9/qZoqy32+K69Nr5kW+6RDxi4Zs+n9FJEtmnTl4KDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8SbiTB1u5gjtbEQXQ8hsn0fGKu7eS6d2M7UgPVqLc78=; b=uhI/D8VRC5Fr0+G6C0qTex22IHgGCLW2SRhYDgie66ynZ9yCtrVVrbg1GqnBtEob+K15/q 5WQR5k+XFB6EQYij3JKbz6RnU3TDcjlPLMAeGz+XPkuhIKfurbqNdJ0BkEoxYeZ8wZJdLH My4hYy2oAouiYrnLjzUx6e9ec0Kbl/I0XUHhO7nszHSHNhJdwvalyTzr5crPniyTbhmr4U /n4okuAB3FJVPU/oHypl/J+CZadUMda1jIcrtZRXSO2LCj9nqtOvuM//iQZoh2yOqsTLV6 63WznwNsKsosl28KN0Q+ckLMMnSbcQ4AbWHtgvoF4hZEWDRrM9NclSeYaHoh+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373107; a=rsa-sha256; cv=none; b=PMvoHbkTzIn0JOZGSYT2EvozSTLxeEo67pzl0iL4i1D1s1//r104xT32pZyWVVykSofEZi ROKhObI1IMmGrkvFOvKDHAO9Wr1XRuIMvnY0LQxZLmjJ5j2+znqprJ+b5esVJ9GGpniYHL ymKjQawttW2TPNytzMTuZoTNIg8TDEkBYuliaCv1zLP3BsyNGkT64fHwW90qeUWGT1O2AZ TaaZS9dDGVBXCEGWSpj8eYLXqAKlUKfajTni1OX55Izy4AGMX4M+8FhVAaH5B1fvGPQqng 6pOkYRJup+v32hq7C6d8oXiFfAo0eesl0icdg0OeDAneSvEYTSQjr80z4Xxz3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJM3fZbzB3g for ; Fri, 02 Jan 2026 16:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2464d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d6121f7b508b - main - sound: Rename midi_cdevsw name to "midi" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: d6121f7b508bf889359e116da1efab08f848e129 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:27 +0000 Message-Id: <6957f933.2464d.47f82c2@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d6121f7b508bf889359e116da1efab08f848e129 commit d6121f7b508bf889359e116da1efab08f848e129 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:27 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:05 +0000 sound: Rename midi_cdevsw name to "midi" Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index f54b95daf280..c658c8001b94 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -93,7 +93,7 @@ static struct cdevsw midi_cdevsw = { .d_write = midi_write, .d_ioctl = midi_ioctl, .d_poll = midi_poll, - .d_name = "rmidi", + .d_name = "midi", }; struct unrhdr *dev_unr = NULL; @@ -109,7 +109,7 @@ SYSCTL_INT(_hw_midi, OID_AUTO, debug, CTLFLAG_RW, &midi_debug, 0, ""); #define MIDI_DEBUG(l,a) if(midi_debug>=l) a /* - * Register a new rmidi device. + * Register a new midi device. * * "cookie" is passed to the MPU calls, and is normally set to the driver's * softc. From nobody Fri Jan 2 16:58: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 4djVJP2m9gz6LvqR for ; Fri, 02 Jan 2026 16:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJN5cbsz42W3 for ; Fri, 02 Jan 2026 16:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kqQb3P9zVAG0tN0XQn2v4+3PoElmBE7DTjfXyysOkxs=; b=SaQCJ+7nxR9ErOrR5A0WMiY+uVDynlqCxumcuYAAGWQzyiCpw8N4/UaT6gWKRsNZQ3DhCs CP7fq0z3oTPtHLInJ3VGo+qivb6ehbLGVQ+7IRuFRraSGvWJVmtwpd52G9UJLW8Tx6LQpL L4U8+rXAU4DzqlFfw+guhUfNAtuPHSJ/I7zk73fMcRXPmsEerzFedew3UqEuBARLpyihX/ E0yViz787UZYX9RKl3FuTigyBS3r4SiDG9v98lN8+67TsX423FpGniyU6aKi/CPOjUrH4R fwOli+X2ihF73bm92YoR6zJaOsjFtubJDr28gwYO/UIK8l2CdYYuqa8xgCJIbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kqQb3P9zVAG0tN0XQn2v4+3PoElmBE7DTjfXyysOkxs=; b=AFjhTOUitHiCTP4xSRsMbigPy4YJJ/8EDLo7Eh6boLHbJNJSoslvqP+NoJ/a0mI9zhb3cK oYRzLDGel19/fWX1SnNVgu2haZegSwfr4yDNO05MUvnIdR+fPdA5tLnVy/m2Wc7n8/Adbv CVeKMjJrEbfH2db7E5XFj7JCrjknAbksl0Kl7f316th++uhGEc2wnzKMwRA2ErBhR5hFvi HXq9PUTTg929j3TKaUVou99oJLXrisiQuZYa28hFDw1Sto0aFUk8qEW0Ah1ZK2FDHbuTt4 MRmkc7/aRboXJ8tliSnMZkGcKoYuLvMSxxF9Wg3Fzzb7D4fIyOt6XlWIfQGPWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373108; a=rsa-sha256; cv=none; b=RIHSlnx492rEYk7r9zLPEaGdsj2A3ip2QTP08kIpDFuDuCP+Gn4XCNVQMNkYAqxCdzkD4I VMsCANOEchaR9onhHbnlXd35EkHrxO0m+f5Wt1F18D0ATWD76GJl+c70fvmADiz4Fycd61 ZB6zTyE1uRcxO/n5UYuugInVQx1o6rSmw3ecVpOna1m7NIoMYYNJPU2/PpaRAKpuzTSjbN TYGNHv48Zm59micmE9REtLTZntkGxK0RpaaSQqnmz9tQntmT7teuAtgN+GoLQyQyWxSTRO uGpnXGbytr5EwuTFRAKaJzi1Fs8tCsOvIpkCCyw3mPBUqDpfZRXYqzAOC1bbWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJN4PCFzBKF for ; Fri, 02 Jan 2026 16:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24193 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: c288595c4eac - main - sound: Retire MIDI_DEBUG List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: c288595c4eac14616f94c5b7eb84aad2eeeffc1f Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:28 +0000 Message-Id: <6957f934.24193.62c224dc@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c288595c4eac14616f94c5b7eb84aad2eeeffc1f commit c288595c4eac14616f94c5b7eb84aad2eeeffc1f Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:29 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Retire MIDI_DEBUG Better logging will be implemented. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index c658c8001b94..9b61e972fab9 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #ifdef HAVE_KERNEL_OPTION_HEADERS @@ -99,15 +98,6 @@ static struct cdevsw midi_cdevsw = { struct unrhdr *dev_unr = NULL; struct unrhdr *chn_unr = NULL; -SYSCTL_NODE(_hw, OID_AUTO, midi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, - "Midi driver"); - -int midi_debug; -/* XXX: should this be moved into debug.midi? */ -SYSCTL_INT(_hw_midi, OID_AUTO, debug, CTLFLAG_RW, &midi_debug, 0, ""); - -#define MIDI_DEBUG(l,a) if(midi_debug>=l) a - /* * Register a new midi device. * @@ -126,7 +116,6 @@ midi_init(kobj_class_t cls, void *cookie) inqsize = MPU_INQSIZE(m, cookie); outqsize = MPU_OUTQSIZE(m, cookie); - MIDI_DEBUG(1, printf("midiinit queues %d/%d.\n", inqsize, outqsize)); if (!inqsize && !outqsize) goto err1; @@ -178,7 +167,6 @@ err2: free(MIDIQ_BUF(m->outq), M_MIDI); err1: free(m, M_MIDI); - MIDI_DEBUG(1, printf("midi_init ended in error\n")); return NULL; } @@ -233,8 +221,6 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) mtx_lock(&m->lock); - MIDI_DEBUG(5, printf("midi_in: m=%p size=%d\n", m, size)); - if (!(m->flags & M_RX)) { /* We should return 0 but this may stop receiving/sending. */ mtx_unlock(&m->lock); @@ -243,14 +229,10 @@ midi_in(struct snd_midi *m, uint8_t *buf, int size) used = 0; - MIDI_DEBUG(6, printf("midi_in: len %jd avail %jd\n", - (intmax_t)MIDIQ_LEN(m->inq), - (intmax_t)MIDIQ_AVAIL(m->inq))); if (MIDIQ_AVAIL(m->inq) > size) { used = size; MIDIQ_ENQ(m->inq, buf, size); } else { - MIDI_DEBUG(4, printf("midi_in: Discarding data qu\n")); mtx_unlock(&m->lock); return 0; } @@ -273,14 +255,12 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) mtx_lock(&m->lock); - MIDI_DEBUG(2, printf("midi_out: %p\n", m)); if (!(m->flags & M_TXEN)) { mtx_unlock(&m->lock); return (0); } used = MIN(size, MIDIQ_LEN(m->outq)); - MIDI_DEBUG(3, printf("midi_out: used %d\n", used)); if (used) MIDIQ_DEQ(m->outq, buf, used); if (MIDIQ_EMPTY(m->outq)) { @@ -304,8 +284,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) struct snd_midi *m = i_dev->si_drv1; int retval; - MIDI_DEBUG(1, printf("midiopen %p %s %s\n", td, - flags & FREAD ? "M_RX" : "", flags & FWRITE ? "M_TX" : "")); if (m == NULL) return ENXIO; @@ -347,8 +325,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) MPU_CALLBACK(m, m->cookie, m->flags); - MIDI_DEBUG(2, printf("midi_open: opened.\n")); - err: mtx_unlock(&m->lock); return retval; @@ -361,9 +337,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) int retval; int oldflags; - MIDI_DEBUG(1, printf("midi_close %p %s %s\n", td, - flags & FREAD ? "M_RX" : "", flags & FWRITE ? "M_TX" : "")); - if (m == NULL) return ENXIO; @@ -403,9 +376,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) int used; char buf[MIDI_RSIZE]; - MIDI_DEBUG(5, printf("midiread: count=%lu\n", - (unsigned long)uio->uio_resid)); - retval = EIO; if (m == NULL) @@ -437,7 +407,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) mtx_lock(&m->lock); m->rchan = 0; } - MIDI_DEBUG(6, printf("midi_read start\n")); /* * At this point, it is certain that m->inq has data */ @@ -445,7 +414,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) used = MIN(MIDIQ_LEN(m->inq), uio->uio_resid); used = MIN(used, MIDI_RSIZE); - MIDI_DEBUG(6, printf("midiread: uiomove cc=%d\n", used)); MIDIQ_DEQ(m->inq, buf, used); retval = uiomove(buf, used, uio); if (retval) @@ -458,7 +426,7 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) retval = 0; err1: mtx_unlock(&m->lock); -err0: MIDI_DEBUG(4, printf("midi_read: ret %d\n", retval)); +err0: return retval; } @@ -475,7 +443,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) int used; char buf[MIDI_WSIZE]; - MIDI_DEBUG(4, printf("midi_write\n")); retval = 0; if (m == NULL) goto err0; @@ -491,7 +458,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) if (ioflag & O_NONBLOCK) goto err1; m->wchan = 1; - MIDI_DEBUG(3, printf("midi_write msleep\n")); retval = msleep(&m->wchan, &m->lock, PCATCH | PDROP, "midi TX", 0); /* @@ -514,11 +480,7 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) used = MIN(MIDIQ_AVAIL(m->outq), uio->uio_resid); used = MIN(used, MIDI_WSIZE); - MIDI_DEBUG(5, printf("midiout: resid %zd len %jd avail %jd\n", - uio->uio_resid, (intmax_t)MIDIQ_LEN(m->outq), - (intmax_t)MIDIQ_AVAIL(m->outq))); - MIDI_DEBUG(5, printf("midi_write: uiomove cc=%d\n", used)); retval = uiomove(buf, used, uio); if (retval) goto err1; From nobody Fri Jan 2 16:58: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 4djVJQ1pDvz6LvjM for ; Fri, 02 Jan 2026 16:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJP5fPXz42mN for ; Fri, 02 Jan 2026 16:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vUcdOGVxlXKzUu4uQh/f3UUVMqulVObJV1dpQ+V3pG8=; b=RTzVutFNgk2ZvUjUI96ZFUcdXI9VSB3xSDrtJe+mDeIcVBq5MnsU1VKtm6lo+9RisE3KxK k7S40K2IqrZQSFmzjydeCGuXuBvHLoyKwCe+glQwJhRuL2kT6TkuSlj0KuMHipdZfyvNXn 5y7JrBHaqCinL/Ij/AS48159qpfj9YmVLnRCtklclNZ7ZroN0mPc+3KPG9EjSDFUtHlomQ 635I9VIMZd2rLFOAfY/8rw/u1la3KRx/zpGMPCFbVwNNE4jLgO0SNigUlBPRFvYaaiwkpv ovrcvzGT1LESu1S3LwQnjXVwSe6AJT+QqC/D89zY/Labxp8ix0p0huNSqtWogQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vUcdOGVxlXKzUu4uQh/f3UUVMqulVObJV1dpQ+V3pG8=; b=g5YZZGNlPPx49AjYILB/V1rj+PSnJbq5ihfJl5MhO8vqFVSwynNfHqI8bQEhqNCtCqGDOL 9+eIj17eSPPbcsDRkrxfZi+TXRo/WoTOSKjr4Uzw6sPUmLoQ+JwdRDB8v7aMhtRTl75shp MXZLUYbzz0cTbcp7M45h9w+Ka8FKuFRiArIENvSANbswPiYEzU9C4MxxXHRF9vJ5tMXTtS 3XXo4KIVYZVZzpQVGv1AcFXVJ+bK5dQ4f2yY3+bepM6RxRJw/aZUGFPebUb9/LE2WPDSYU qMth9nkamNuu7d7Bt87u8nYzfKiVwsmcWhqxQ3TjtpxmCxMGAEr/geGie1tJKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373109; a=rsa-sha256; cv=none; b=jND32lEshOvN1f0iARM6fbXJ4s3tdu9WbvS+zAeZI4W6iCrTx0Vdm2CCFf+TJYTKTfKDCj z6WvDBj5108vorHmAxIfq8bKfVlWzagcbqo2U45eQoRv/XpGGAO2jdlAVeEZsU7mrbauQk Myvmyjy5qBg06ODbH20kYJCPTw+PCP5KkLq93BAt4KetuLTi9aZcBN3WYdzG/IECuRD/FB Jyzr89Feuo5EHfQ9pwqkIszQXx8rl/9l50Q+uCkkPuqA0JqwhjtcumBErk4fVBSsK2Twkk 8FSDJxDo5Woc0XoNBs0dHiOBjUKeWhmvb1zOrPGLdPzBxeUnAeUb1xgNsa/NhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJP4wy0zBH3 for ; Fri, 02 Jan 2026 16:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fc7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3b9e776498a7 - main - sound: Retire MIDIQ_DEBUG List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 3b9e776498a7e3e96c1a351fdd561f25803718df Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:29 +0000 Message-Id: <6957f935.fc7d.23f0ecef@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3b9e776498a7e3e96c1a351fdd561f25803718df commit 3b9e776498a7e3e96c1a351fdd561f25803718df Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:31 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Retire MIDIQ_DEBUG Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midiq.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/sys/dev/sound/midi/midiq.h b/sys/dev/sound/midi/midiq.h index 17def1805363..27958ff4c23e 100644 --- a/sys/dev/sound/midi/midiq.h +++ b/sys/dev/sound/midi/midiq.h @@ -52,38 +52,23 @@ struct name { \ #define MIDIQ_FULL(head) ((head).h == -1) #define MIDIQ_AVAIL(head) (MIDIQ_FULL(head) ? 0 : (head).s - MIDIQ_LENBASE(head)) #define MIDIQ_LEN(head) ((head).s - MIDIQ_AVAIL(head)) -#define MIDIQ_DEBUG 0 /* * No protection against overflow, underflow */ #define MIDIQ_ENQ(head, buf, size) do { \ - if(MIDIQ_DEBUG)\ - printf("#1 %p %p bytes copied %jd tran req s %d h %d t %d\n", \ - &(head).b[(head).h], (buf), \ - (intmax_t)(sizeof(*(head).b) * \ - MIN( (size), (head).s - (head).h) ), \ - (size), (head).h, (head).t); \ MIDIQ_MOVE(&(head).b[(head).h], (buf), sizeof(*(head).b) * MIN((size), (head).s - (head).h)); \ if( (head).s - (head).h < (size) ) { \ - if(MIDIQ_DEBUG) \ - printf("#2 %p %p bytes copied %jd\n", (head).b, (buf) + (head).s - (head).h, (intmax_t)sizeof(*(head).b) * ((size) - (head).s + (head).h) ); \ MIDIQ_MOVE((head).b, (buf) + (head).s - (head).h, sizeof(*(head).b) * ((size) - (head).s + (head).h) ); \ } \ (head).h+=(size); \ (head).h%=(head).s; \ if(MIDIQ_EMPTY(head)) (head).h=-1; \ - if(MIDIQ_DEBUG)\ - printf("#E h %d t %d\n", (head).h, (head).t); \ } while (0) #define MIDIQ_DEQ_I(head, buf, size, move, update) do { \ if(MIDIQ_FULL(head)) (head).h=(head).t; \ - if(MIDIQ_DEBUG)\ - printf("#1 %p %p bytes copied %jd tran req s %d h %d t %d\n", &(head).b[(head).t], (buf), (intmax_t)sizeof(*(head).b) * MIN((size), (head).s - (head).t), (size), (head).h, (head).t); \ if (move) MIDIQ_MOVE((buf), &(head).b[(head).t], sizeof(*(head).b) * MIN((size), (head).s - (head).t)); \ if( (head).s - (head).t < (size) ) { \ - if(MIDIQ_DEBUG) \ - printf("#2 %p %p bytes copied %jd\n", (head).b, (buf) + (head).s - (head).t, (intmax_t)sizeof(*(head).b) * ((size) - (head).s + (head).t) ); \ if (move) MIDIQ_MOVE((buf) + (head).s - (head).t, (head).b, sizeof(*(head).b) * ((size) - (head).s + (head).t) ); \ } \ if (update) { \ @@ -92,8 +77,6 @@ struct name { \ } else { \ if (MIDIQ_EMPTY(head)) (head).h=-1; \ } \ - if(MIDIQ_DEBUG)\ - printf("#E h %d t %d\n", (head).h, (head).t); \ } while (0) #define MIDIQ_SIZE(head) ((head).s) From nobody Fri Jan 2 16:58: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 4djVJR2232z6LvnY for ; Fri, 02 Jan 2026 16:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJQ6PY5z42Q9 for ; Fri, 02 Jan 2026 16:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2jDDZVrZPtQG26AkAdCgSVfIFYnW7A/NWVLuqMvthBk=; b=N405KxCLn+dov+hR9kmEDwteMEecymqli71Tib3vkqY5/tbWqqJm6Z0c1/2a+0ZgLqhbjQ hu9GY2e9X1l1nJpgatHCIyR57+pG26ZhAb8GK4kKBq0QMWPWcsTcGcctVtpc679A+jg9Nc 6EsQvh1n0b5nCIumPwcB1nT+plAg0MSkclwW7DKXVcPOpkQISLkeIML1JYM9nhoDNUw5JT wqV35t/5eqP/fk1RPwE8qreSbuQGQYZ/dBapKIOsRZ/UbdkvizxsMAmxiEEtFhv0AFiDSk UsQtKyk0KsKX3uIaOOiihty3Muy0W8mI24MM2p2xxPjVBQ5c05N8pQmRwxwY5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2jDDZVrZPtQG26AkAdCgSVfIFYnW7A/NWVLuqMvthBk=; b=l+bVpc/1jgfT3LyTLBJrbttWi1E1SuDGA0zZHVmLI0+s1E+mbDfqhlAh+5FAcm7VIT2Oat AeJoV3BZ26N0gbdlz0QUeojPshmmNkYcvTRdQsm3i5l8jby1CVLkdKBmZQKfugiqMhpcQz jsnzXsoC4L32/gi27GmDrFw38nxqtxnhBep0YwKZY6xjmXsV1OvbrfQdHLw/MHnNlm0xbq +4g0u7rFpKAWRZzhcMEJX75vqGl3/sILbK/ks2ny58s7oeZsYNNxByNyoqx70cWd9H2nX6 U7XbVK0RclkQIbg7ddShuB/5ET4BOJhAqBYeCMHwBuqyVaH6Zz7dCZ1MG3aoKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373110; a=rsa-sha256; cv=none; b=j/d/2bb8B667Qook6EUEpnkqvkqBQndzxXWq9okMfjtYr/Fc/Ema2IyhNmihRGBw6e4X2g 9wVYFkKlBuXqd1E5cFaA55T2j9Cs7TkYpnFLcJGCQiYIl+PHatbCN2loMujzV7bA2ff0ET ReQnfAO5k0Rf2xljV2yVa8D8Y143piEuOUGcWiWi3p061YzEcEnWP0GjbHv4t5P7jTjc/6 dduv8qScq+75Zyw1kDpi3Ig/23dK2gkb6Iq6Bg8VHF1Gc7Avbl6FYTci10CArxw+N6gMXX 03x+4vN93rtzOKS5jwx+v8IipLZo5XNqpX8Havar/gwZIjsbh/jAfEtrTvuZSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJQ5wYnzBSj for ; Fri, 02 Jan 2026 16:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24216 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b9db6c212873 - main - sound: Improve snd_midi->{in,out}q allocation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: b9db6c21287311b9e861893c065289d987a75804 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:30 +0000 Message-Id: <6957f936.24216.3c7bcf3e@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b9db6c21287311b9e861893c065289d987a75804 commit b9db6c21287311b9e861893c065289d987a75804 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:34 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Improve snd_midi->{in,out}q allocation Currently we lock and allocate the buffers with M_NOWAIT, without checking if the return value of malloc(). This is not necessary as subsequent check below will eventually check that. However, for correctness, allocate the buffers with M_WAITOK (there is no reason not to) and lock afterwards. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54131 --- sys/dev/sound/midi/midi.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 9b61e972fab9..7f968b6210f5 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -109,7 +109,8 @@ midi_init(kobj_class_t cls, void *cookie) { struct snd_midi *m; int inqsize, outqsize; - uint8_t *buf; + uint8_t *ibuf = NULL; + uint8_t *obuf = NULL; m = malloc(sizeof(*m), M_MIDI, M_WAITOK | M_ZERO); kobj_init((kobj_t)m, cls); @@ -121,26 +122,17 @@ midi_init(kobj_class_t cls, void *cookie) mtx_init(&m->lock, "raw midi", NULL, 0); - mtx_lock(&m->lock); - if (inqsize) - buf = malloc(sizeof(uint8_t) * inqsize, M_MIDI, M_NOWAIT); - else - buf = NULL; + ibuf = malloc(inqsize, M_MIDI, M_WAITOK); + if (outqsize) + obuf = malloc(outqsize, M_MIDI, M_WAITOK); - MIDIQ_INIT(m->inq, buf, inqsize); + mtx_lock(&m->lock); - if (outqsize) - buf = malloc(sizeof(uint8_t) * outqsize, M_MIDI, M_NOWAIT); - else - buf = NULL; m->hiwat = outqsize / 2; - MIDIQ_INIT(m->outq, buf, outqsize); - - if ((inqsize && !MIDIQ_BUF(m->inq)) || - (outqsize && !MIDIQ_BUF(m->outq))) - goto err2; + MIDIQ_INIT(m->inq, ibuf, inqsize); + MIDIQ_INIT(m->outq, obuf, outqsize); m->flags = 0; m->unit = alloc_unr(dev_unr); From nobody Fri Jan 2 16:58: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 4djVJT2cHpz6LvlL for ; Fri, 02 Jan 2026 16:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJT0GPpz42pw for ; Fri, 02 Jan 2026 16:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jNoVoaS/8v9vIQXHC7nvaPLD4teb3RPvJJmCPYCUWsQ=; b=RL1r/ttrU3+PH4bmvFdmE/5V+vCRNA5HWgYwTK4me23qRnBK8cmBUIaWW7UaDD2ivL5e06 zEvHcYWshOD6bZ8qd5h/HC9la9l5e5/xa6ZJh0zNzPY24jl7RppNuhOBuT9sk4IXQdw1CM cskTQvid41ZB3hZNW+M5Wg14oABqqUJ4lhqPrWhnLyVZZjlXKLYTRHz9hw+CW5We6Rc5Ez lOHYMNryc0GcF1yKVxMNCZ+jRRxfRHUMzeLsIHiTF4Z+JAtZ4qRe79v0VLpWoqqPHJc+et +7MTNZiSmCOtOyLnLd7S3M3JD8l+wzO5Ls7QzIGTe/afPdeMXVKKpVxfnuPG7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jNoVoaS/8v9vIQXHC7nvaPLD4teb3RPvJJmCPYCUWsQ=; b=hH0JzPhv9z1DEGOFfTKfE3eNeygLmjteIsR3i+wuaBGCZ13p3N4OB/3fGXnGuCgyT0DBRo xbMm8yRWnppR9+X5QtK/aspzhHVCu/PIgnH/KTm41K8bTMn+gi7z3qoParB9p/myfAMSpG wLzAKqXGDbeP7JT/VRdGBKuBiVu0Wk+KpmLPOEUPJFI/7TOaEh/P6nWjuu6mHS1k3iWHuD IQH1ZPmguIHCydVPh3JFmPYIpgQyV2CBYi7pE6FROfF7Moex6peagqQHd3NGEcQGhU4q6n Xp8JrsXCTAZF2IM5c6gSBzy7M6Ig7pPXJkgIUj13Y91yTQCX0VSrQ4pKAaE+Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373113; a=rsa-sha256; cv=none; b=JkTdoOxMawbSu9B0zf1ostQrVe/aqDDCQzY6ZuSmsXC0aAqm5gQvw/QKFVC8zYkRPZ03fJ 8IG5WVmtUAjSi/MSCC0txWSN66xxyoOiSLxNUSB4E/A7Kg10beSep45YbChhN8zhBa84Km Upd0uzXftAmveCoVYRiJStGZqVqM9YqaB9hGPXkkk1foSEGTUPh/Ee89K7ite6lfwb7gIs BKrMfvxiYYfQmTN6ZxOhvb1VD2BBxIqBL7J4CjXz28vRJvTGjnodS0tq9rXgkwF7Nl27O8 vlCYfB1VthVZTvLwbLntBOgULccgvqWWYJ61ZzIojNuNE3+ol3DpNNjGNkegzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJS6r7hzBMy for ; Fri, 02 Jan 2026 16:58:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 230c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2aa16666e2fa - main - sound: Take device type into account in sndstat List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 2aa16666e2fa5c98be8d330cd0c32c9dc3801ba7 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:32 +0000 Message-Id: <6957f938.230c4.28fbb48c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2aa16666e2fa5c98be8d330cd0c32c9dc3801ba7 commit 2aa16666e2fa5c98be8d330cd0c32c9dc3801ba7 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:46 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Take device type into account in sndstat sndstat will be extended to work with MIDI devices as well, so separate functionality based on the device type. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54141 --- sys/dev/sound/pcm/sound.c | 2 +- sys/dev/sound/sndstat.c | 84 ++++++++++++++++++++++------------------------- sys/dev/sound/sndstat.h | 7 +++- 3 files changed, 47 insertions(+), 46 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 1e4b2eebdcaa..8ce369bfce5e 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -427,7 +427,7 @@ pcm_register(device_t dev, char *str) else if (snd_unit_auto == 1) snd_unit = pcm_best_unit(snd_unit); - sndstat_register(dev, d->status); + sndstat_register(dev, SNDST_TYPE_PCM, d->status); return (dsp_make_dev(dev)); } diff --git a/sys/dev/sound/sndstat.c b/sys/dev/sound/sndstat.c index eee9e0b18108..b0ac7f7d0824 100644 --- a/sys/dev/sound/sndstat.c +++ b/sys/dev/sound/sndstat.c @@ -52,9 +52,6 @@ #include "feeder_if.h" -#define SS_TYPE_PCM 1 -#define SS_TYPE_MIDI 2 - static d_open_t sndstat_open; static void sndstat_close(void *); static d_read_t sndstat_read; @@ -75,7 +72,8 @@ struct sndstat_entry { TAILQ_ENTRY(sndstat_entry) link; device_t dev; char *str; - int type, unit; + enum sndstat_type type; + int unit; }; struct sndstat_userdev { @@ -688,22 +686,26 @@ sndstat_create_devs_nvlist(nvlist_t **nvlp) return (ENOMEM); TAILQ_FOREACH(ent, &sndstat_devlist, link) { - struct snddev_info *d; - nvlist_t *di; + if (ent->type == SNDST_TYPE_PCM) { + struct snddev_info *d; + nvlist_t *di; - d = device_get_softc(ent->dev); - if (!PCM_REGISTERED(d)) - continue; + d = device_get_softc(ent->dev); + if (!PCM_REGISTERED(d)) + continue; - err = sndstat_build_sound4_nvlist(d, &di); - if (err) - goto done; + err = sndstat_build_sound4_nvlist(d, &di); + if (err) + goto done; - nvlist_append_nvlist_array(nvl, SNDST_DSPS, di); - nvlist_destroy(di); - err = nvlist_error(nvl); - if (err) - goto done; + nvlist_append_nvlist_array(nvl, SNDST_DSPS, di); + nvlist_destroy(di); + err = nvlist_error(nvl); + if (err) + goto done; + } else if (ent->type == SNDST_TYPE_MIDI) { + /* TODO */ + } } TAILQ_FOREACH(pf, &sndstat_filelist, entry) { @@ -1154,22 +1156,14 @@ fail: /************************************************************************/ -int -sndstat_register(device_t dev, char *str) +void +sndstat_register(device_t dev, enum sndstat_type type, char *str) { struct sndstat_entry *ent; struct sndstat_entry *pre; - const char *devtype; - int type, unit; + int unit; unit = device_get_unit(dev); - devtype = device_get_name(dev); - if (!strcmp(devtype, "pcm")) - type = SS_TYPE_PCM; - else if (!strcmp(devtype, "midi")) - type = SS_TYPE_MIDI; - else - return (EINVAL); ent = malloc(sizeof *ent, M_DEVBUF, M_WAITOK | M_ZERO); ent->dev = dev; @@ -1195,8 +1189,6 @@ sndstat_register(device_t dev, char *str) TAILQ_INSERT_BEFORE(pre, ent, link); } SNDSTAT_UNLOCK(); - - return (0); } int @@ -1388,20 +1380,24 @@ sndstat_prepare(struct sndstat_file *pf_self) /* generate list of installed devices */ k = 0; TAILQ_FOREACH(ent, &sndstat_devlist, link) { - d = device_get_softc(ent->dev); - if (!PCM_REGISTERED(d)) - continue; - if (!k++) - sbuf_printf(s, "Installed devices:\n"); - sbuf_printf(s, "%s:", device_get_nameunit(ent->dev)); - sbuf_printf(s, " <%s>", device_get_desc(ent->dev)); - if (snd_verbose > 0) - sbuf_printf(s, " %s", ent->str); - /* XXX Need Giant magic entry ??? */ - PCM_ACQUIRE_QUICK(d); - sndstat_prepare_pcm(s, ent->dev, snd_verbose); - PCM_RELEASE_QUICK(d); - sbuf_printf(s, "\n"); + if (ent->type == SNDST_TYPE_PCM) { + d = device_get_softc(ent->dev); + if (!PCM_REGISTERED(d)) + continue; + if (!k++) + sbuf_printf(s, "Installed devices:\n"); + sbuf_printf(s, "%s:", device_get_nameunit(ent->dev)); + sbuf_printf(s, " <%s>", device_get_desc(ent->dev)); + if (snd_verbose > 0) + sbuf_printf(s, " %s", ent->str); + /* XXX Need Giant magic entry ??? */ + PCM_ACQUIRE_QUICK(d); + sndstat_prepare_pcm(s, ent->dev, snd_verbose); + PCM_RELEASE_QUICK(d); + sbuf_printf(s, "\n"); + } else if (ent->type == SNDST_TYPE_MIDI) { + /* TODO */ + } } if (k == 0) sbuf_printf(s, "No devices installed.\n"); diff --git a/sys/dev/sound/sndstat.h b/sys/dev/sound/sndstat.h index d6735f74af31..3ac0cf48f5a8 100644 --- a/sys/dev/sound/sndstat.h +++ b/sys/dev/sound/sndstat.h @@ -31,7 +31,12 @@ #ifndef _SNDSTAT_H_ #define _SNDSTAT_H_ -int sndstat_register(device_t dev, char *str); +enum sndstat_type { + SNDST_TYPE_PCM, + SNDST_TYPE_MIDI, +}; + +void sndstat_register(device_t dev, enum sndstat_type type, char *str); int sndstat_unregister(device_t dev); #endif /* _SNDSTAT_H_ */ From nobody Fri Jan 2 16:58: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 4djVJS340Cz6Lvqj for ; Fri, 02 Jan 2026 16:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJS03ytz42fp for ; Fri, 02 Jan 2026 16:58:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WxU0yudeuaJhnx+zwo3ajLUYUXBil5Npcj+kfnPK0o=; b=miHCvZGYwJC6WbhUpaXpAV6My4hqYY3RzXgaH+tLjP+eF/yIso7X6t2MgBa3b2IT+0+WiS 8tv8ptLoZ1eH072EPEWzWfxg8KkRwpMv3WA+kk+iiEKmDBtIZX5xySS+vyTwqkbALEEXdQ W6x9P9qiIYbdIkx87sq/dGaxQUXOGWNz3Zd5052uhEE+3W87/8zqo5YRTZWYBr2l/Cakbh NtKcqho4MAv2pcXwdkZAJ7loWNaVNaKowSoCMhpfdzIN32pe5rr7ZTwXHGq46rRdUv8ItB dP690DrOFgRWhzALQREs4yfw2/3Ui97H71iw+eYpxQJSL982qXGRSFtDT1s0aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WxU0yudeuaJhnx+zwo3ajLUYUXBil5Npcj+kfnPK0o=; b=WX7CkKOQ2Uhy9vPOcNjeTCG3iRVEKxu2GoyS+jEpZPNC9zf5LZubV8uf92eIg7yW7h1Rws xA7c+Or8CIYEktIr0t+gsw2T9Vlgrm3njWy/6H6tQYP69/J3oM/43jhkIE46dypYy0HPbu Dz22ufiZjrtxSothfPojh/LQJpExRcLR+wBETqMZ9s2fk9/k7MMae0+s9y9lO16OJzgVUl KSL1SynWgJD9v1uiPj1A8gjy3vGQLpdr6t3Bl1LeD1g8v4p8jc+O4Q3B0xCSaRPQcgskWp qeLrz+8hK1VAzP9jvklOYBpOgQqsVs1MNeZb3RkmAIauGQ+ld70IJml0W9no1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373112; a=rsa-sha256; cv=none; b=dZJLRLE7WtiFmwVw6z85AH3vn4ybCfKjc51H1DQdcKgIc9lgqImH3Ph+Iy6f3U2ubBO9u9 NTBHdZyp5+TUeGshnGwhC8X88n2P7XLYNqygrVX8pQeUbeCpK/mX8oUdxDTfwHc40RsrxX kRYf+d+cwmRxYu8iW3liR2FpLn50deUzpEEs2f5BqXCvH8kk980RIEObdmju4GKGZdtLp3 d0R+uU1aRRryd1+jAXz3sLe+QwkPeQi+DXSBOuFJyLWGp2Bj9aEDNWCu4jrCAuuPVkKiaI ycHLESJ2RX2AELQPv7GbdqKTdD2SrNeAxzKLB89HcAMhATYvU9jz0pr8Ksg8dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJR6GnXzBKJ for ; Fri, 02 Jan 2026 16:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2396c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: bafa8c951d8c - main - sound: Move sndstat out of pcm/ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: bafa8c951d8cfaec75e774af03d7ab6fadb448b9 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:31 +0000 Message-Id: <6957f937.2396c.39bd476c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=bafa8c951d8cfaec75e774af03d7ab6fadb448b9 commit bafa8c951d8cfaec75e774af03d7ab6fadb448b9 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:41 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Move sndstat out of pcm/ Needed by follow-up patches that will add sndstat support for midi/ Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54140 --- sys/dev/sound/pcm/sound.c | 1 + sys/dev/sound/pcm/sound.h | 4 ---- sys/dev/sound/{pcm => }/sndstat.c | 4 +++- sys/dev/sound/sndstat.h | 37 +++++++++++++++++++++++++++++++++++++ sys/modules/sound/sound/Makefile | 3 ++- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 29dac6b576ae..1e4b2eebdcaa 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 3ba6eb3692ee..de9af6bd5324 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -167,9 +166,6 @@ void *pcm_getdevinfo(device_t dev); int snd_setup_intr(device_t dev, struct resource *res, int flags, driver_intr_t hand, void *param, void **cookiep); -int sndstat_register(device_t dev, char *str); -int sndstat_unregister(device_t dev); - /* These are the function codes assigned to the children of sound cards. */ enum { SCF_PCM, diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/sndstat.c similarity index 99% rename from sys/dev/sound/pcm/sndstat.c rename to sys/dev/sound/sndstat.c index 8f414e07757d..eee9e0b18108 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/sndstat.c @@ -40,13 +40,15 @@ #endif #include +#include #include #include #include -#include +#include #include #include +#include #include "feeder_if.h" diff --git a/sys/dev/sound/sndstat.h b/sys/dev/sound/sndstat.h new file mode 100644 index 000000000000..d6735f74af31 --- /dev/null +++ b/sys/dev/sound/sndstat.h @@ -0,0 +1,37 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * 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 _SNDSTAT_H_ +#define _SNDSTAT_H_ + +int sndstat_register(device_t dev, char *str); +int sndstat_unregister(device_t dev); + +#endif /* _SNDSTAT_H_ */ diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile index 169b1a2730ec..4b38e614f689 100644 --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -15,8 +15,9 @@ SRCS+= feeder_eq_gen.h feeder_rate_gen.h snd_fxdiv_gen.h SRCS+= mpu_if.h mpufoi_if.h SRCS+= mpu_if.c mpufoi_if.c SRCS+= ac97.c buffer.c channel.c dsp.c -SRCS+= mixer.c sndstat.c sound.c vchan.c +SRCS+= mixer.c sound.c vchan.c SRCS+= midi.c mpu401.c +SRCS+= sndstat.c feeder_eq_gen.h: ${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk ${AWK} -f ${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > ${.TARGET} From nobody Fri Jan 2 16:58: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 4djVJV4J3Nz6Lvsk for ; Fri, 02 Jan 2026 16:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJV1CmGz42cN for ; Fri, 02 Jan 2026 16:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O1MWR9Env1y3LAfqSEheG9whVR+Xw5+mMit2m/ulhf8=; b=Ue35J1KliOAAE5Z4Fo9dyA61GCpqRSGT/lCLSBTRmuD8w2wo7QXwdrY8VNyJFLSfbvMeZH xLvENT8bueSH7m8MBCuINqEZ7i7WgY6vw0776JWaPrEFdgoqWyn3/u3BPZHneTjAUrszyX Df8ooMKG6tnSOTRrpF24UyH3O46JztFtqrhMvQTfbjnzLH48CeukLXg3qdxd75wN1j1Lmv tSZboLnTtAdRWadoDVpFtQ0BUPlWq+e3A8zYmY7xsBrDQcJjkSkc9i4HyqTTNUd4+UxBlC UWoIdzpjGiBqToe2EYxDFyG9AMAANuXLvIY9wj2lvxODMKiE/QDCwPLwgMqoQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O1MWR9Env1y3LAfqSEheG9whVR+Xw5+mMit2m/ulhf8=; b=yfBjNLfm4bCGd8CXpBOxuEmS9/VeMfKnmBnmO6jXKesS+2e3N2iLWDWNTj8y6pdP5y75DH 0uGmFPzoeaoGbuh2BgFQ7Ybl48e3sOkHaAWrn0HCRyGG8+8HPLxVhPo8V+M4CS72LMSy7m VQOeEA22x9xqwyHO75cRZVCgjs7j4ulgb0WifE/Hmut9oNiNwWyKvJcj9XVbN9nKuPS3i1 7F5kx4nsuOcqhRpY4EaBG1sPkmi9GuzKJLQ6n1snu6vpzY1BOvTAABnE9pXLCFFv7TOcKK IkGhqCTALSiHndi2euQLv1duk605MHgAQndJp4NbIOvYL3OsDLGi2qNJ1wLD5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373114; a=rsa-sha256; cv=none; b=VklgbGIOifxSwYWyDwJhdn2mOIypntGxwpzSTQtS/VBvzrXCpGqqFZT6sSckwiC7vwD1Hq x1/NR6bawsDBFbafxpTADhuL0oExHoytYWRD9aljP2QkzJjYl3EjZD2mJAYvp6+SUWy7Ht iA+WUfTwhjhRL5uIdYdbwGHGace5CNLn5uvEfFrbzQnUVHnf0cVPXWaID5FolFf/CImakq WDXqbocl9VCYgypiM+uN3I4aIjHz1toC+Nbyabc9hF9rb4MM+YdAw2HSp6YjvEbwGjopOq J8amc7H35NKWOsRW5/QmGPUwv11yUzXBOcrK0qsMuoTFMILJozguppe9LOc+xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJV0kdMzBH5 for ; Fri, 02 Jan 2026 16:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23ae5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 792251295cdf - main - sound: Do not check for NULL before free() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 792251295cdf6c3e1cbb1aa6291434539632912f Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:34 +0000 Message-Id: <6957f93a.23ae5.1c447d64@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=792251295cdf6c3e1cbb1aa6291434539632912f commit 792251295cdf6c3e1cbb1aa6291434539632912f Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:52 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Do not check for NULL before free() No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54174 --- sys/dev/sound/dummy.c | 3 +-- sys/dev/sound/fdt/audio_soc.c | 6 ++---- sys/dev/sound/midi/midi.c | 6 ++---- sys/dev/sound/pci/cmi.c | 3 +-- sys/dev/sound/pci/envy24.c | 6 ++---- sys/dev/sound/pci/envy24ht.c | 6 ++---- sys/dev/sound/pci/es137x.c | 3 +-- sys/dev/sound/pci/hdsp-pcm.c | 12 ++++-------- sys/dev/sound/pci/hdspe-pcm.c | 12 ++++-------- sys/dev/sound/pci/via8233.c | 3 +-- sys/dev/sound/pci/via82c686.c | 2 +- sys/dev/sound/pcm/buffer.c | 19 ++++++------------- sys/dev/sound/pcm/dsp.c | 3 +-- sys/dev/sound/pcm/feeder_eq.c | 3 +-- sys/dev/sound/pcm/feeder_format.c | 3 +-- sys/dev/sound/pcm/feeder_matrix.c | 3 +-- sys/dev/sound/pcm/feeder_mixer.c | 3 +-- sys/dev/sound/pcm/feeder_rate.c | 37 ++++++++++++------------------------- sys/dev/sound/pcm/feeder_volume.c | 3 +-- sys/dev/sound/usb/uaudio.c | 6 ++---- 20 files changed, 47 insertions(+), 95 deletions(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index aec76339ae17..91a198e3d9f6 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -132,8 +132,7 @@ dummy_chan_free(kobj_t obj, void *data) uint8_t *buf; buf = ch->buf->buf; - if (buf != NULL) - free(buf, M_DEVBUF); + free(buf, M_DEVBUF); return (0); } diff --git a/sys/dev/sound/fdt/audio_soc.c b/sys/dev/sound/fdt/audio_soc.c index 84867cb3d781..33269dc302fa 100644 --- a/sys/dev/sound/fdt/audio_soc.c +++ b/sys/dev/sound/fdt/audio_soc.c @@ -250,8 +250,7 @@ audio_soc_chan_free(kobj_t obj, void *data) ausoc_chan = (struct audio_soc_channel *)data; buffer = ausoc_chan->buf->buf; - if (buffer) - free(buffer, M_DEVBUF); + free(buffer, M_DEVBUF); return (0); } @@ -508,8 +507,7 @@ audio_soc_detach(device_t dev) struct audio_soc_aux_node *aux; sc = device_get_softc(dev); - if (sc->name) - free(sc->name, M_DEVBUF); + free(sc->name, M_DEVBUF); while ((aux = SLIST_FIRST(&sc->aux_devs)) != NULL) { SLIST_REMOVE_HEAD(&sc->aux_devs, link); diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 7f968b6210f5..542282d81842 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -153,10 +153,8 @@ midi_init(kobj_class_t cls, void *cookie) err2: mtx_destroy(&m->lock); - if (MIDIQ_BUF(m->inq)) - free(MIDIQ_BUF(m->inq), M_MIDI); - if (MIDIQ_BUF(m->outq)) - free(MIDIQ_BUF(m->outq), M_MIDI); + free(MIDIQ_BUF(m->inq), M_MIDI); + free(MIDIQ_BUF(m->outq), M_MIDI); err1: free(m, M_MIDI); return NULL; diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 99925d236c08..b5465fed5a8b 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -1009,8 +1009,7 @@ cmi_attach(device_t dev) if (sc->reg) bus_release_resource(dev, SYS_RES_IOPORT, sc->regid, sc->reg); mtx_destroy(&sc->lock); - if (sc) - free(sc, M_DEVBUF); + free(sc, M_DEVBUF); return ENXIO; } diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index 3adb22254b72..50864a9067fd 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -1611,10 +1611,8 @@ envy24chan_free(kobj_t obj, void *data) device_printf(sc->dev, "envy24chan_free()\n"); #endif mtx_lock(&sc->lock); - if (ch->data != NULL) { - free(ch->data, M_ENVY24); - ch->data = NULL; - } + free(ch->data, M_ENVY24); + ch->data = NULL; mtx_unlock(&sc->lock); return 0; diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c index 2396a340cd84..3aca8f92f708 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -1522,10 +1522,8 @@ envy24htchan_free(kobj_t obj, void *data) device_printf(sc->dev, "envy24htchan_free()\n"); #endif mtx_lock(&sc->lock); - if (ch->data != NULL) { - free(ch->data, M_ENVY24HT); - ch->data = NULL; - } + free(ch->data, M_ENVY24HT); + ch->data = NULL; mtx_unlock(&sc->lock); return 0; diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index 4e8c7911e95e..45b953efc3fc 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -1886,8 +1886,7 @@ bad: if (es->reg) bus_release_resource(dev, es->regtype, es->regid, es->reg); mtx_destroy(&es->lock); - if (es) - free(es, M_DEVBUF); + free(es, M_DEVBUF); return (ENXIO); } diff --git a/sys/dev/sound/pci/hdsp-pcm.c b/sys/dev/sound/pci/hdsp-pcm.c index b64cec281388..5a8f2ab57d6c 100644 --- a/sys/dev/sound/pci/hdsp-pcm.c +++ b/sys/dev/sound/pci/hdsp-pcm.c @@ -677,14 +677,10 @@ hdspchan_free(kobj_t obj, void *data) #endif mtx_lock(&sc->lock); - if (ch->data != NULL) { - free(ch->data, M_HDSP); - ch->data = NULL; - } - if (ch->caps != NULL) { - free(ch->caps, M_HDSP); - ch->caps = NULL; - } + free(ch->data, M_HDSP); + ch->data = NULL; + free(ch->caps, M_HDSP); + ch->caps = NULL; mtx_unlock(&sc->lock); return (0); diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index d78820732639..678693960e5e 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -668,14 +668,10 @@ hdspechan_free(kobj_t obj, void *data) #endif mtx_lock(&sc->lock); - if (ch->data != NULL) { - free(ch->data, M_HDSPE); - ch->data = NULL; - } - if (ch->caps != NULL) { - free(ch->caps, M_HDSPE); - ch->caps = NULL; - } + free(ch->data, M_HDSPE); + ch->data = NULL; + free(ch->caps, M_HDSPE); + ch->caps = NULL; mtx_unlock(&sc->lock); return (0); diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 6c59397756e0..90e966b864e3 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -1385,8 +1385,7 @@ bad: if (via->sgd_dmat) bus_dma_tag_destroy(via->sgd_dmat); mtx_destroy(&via->lock); - if (via) - free(via, M_DEVBUF); + free(via, M_DEVBUF); return (ENXIO); } diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index fe34583b1a25..144f0ff21fb6 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -601,7 +601,7 @@ bad: if (via->sgd_table) bus_dmamem_free(via->sgd_dmat, via->sgd_table, via->sgd_dmamap); if (via->sgd_dmat) bus_dma_tag_destroy(via->sgd_dmat); mtx_destroy(&via->lock); - if (via) free(via, M_DEVBUF); + free(via, M_DEVBUF); return ENXIO; } diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index eb2cbe667bf3..1db9e5661dc8 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -129,11 +129,8 @@ sndbuf_setup(struct snd_dbuf *b, void *buf, unsigned int size) void sndbuf_free(struct snd_dbuf *b) { - if (b->tmpbuf) - free(b->tmpbuf, M_DEVBUF); - - if (b->shadbuf) - free(b->shadbuf, M_DEVBUF); + free(b->tmpbuf, M_DEVBUF); + free(b->shadbuf, M_DEVBUF); if (b->buf) { if (b->flags & SNDBUF_F_MANAGED) { @@ -188,8 +185,7 @@ sndbuf_resize(struct snd_dbuf *b, unsigned int blkcnt, unsigned int blksz) printf("%s(): b=%p %p -> %p [%d -> %d : %d]\n", __func__, b, b->tmpbuf, tmpbuf, b->allocsize, allocsize, bufsize); - if (b->tmpbuf != NULL) - free(b->tmpbuf, M_DEVBUF); + free(b->tmpbuf, M_DEVBUF); b->tmpbuf = tmpbuf; b->allocsize = allocsize; } else if (snd_verbose > 3) @@ -225,14 +221,11 @@ sndbuf_remalloc(struct snd_dbuf *b, unsigned int blkcnt, unsigned int blksz) tmpbuf = malloc(allocsize, M_DEVBUF, M_WAITOK); shadbuf = malloc(allocsize, M_DEVBUF, M_WAITOK); CHN_LOCK(b->channel); - if (b->buf != NULL) - free(b->buf, M_DEVBUF); + free(b->buf, M_DEVBUF); b->buf = buf; - if (b->tmpbuf != NULL) - free(b->tmpbuf, M_DEVBUF); + free(b->tmpbuf, M_DEVBUF); b->tmpbuf = tmpbuf; - if (b->shadbuf != NULL) - free(b->shadbuf, M_DEVBUF); + free(b->shadbuf, M_DEVBUF); b->shadbuf = shadbuf; if (snd_verbose > 3) printf("%s(): b=%p %d -> %d [%d]\n", diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 62db4592f206..c1e836691ac7 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2582,8 +2582,7 @@ dsp_oss_syncgroup(struct pcm_channel *wrch, struct pcm_channel *rdch, oss_syncgr out: if (ret != 0) { - if (smrd != NULL) - free(smrd, M_DEVBUF); + free(smrd, M_DEVBUF); if ((sg != NULL) && SLIST_EMPTY(&sg->members)) { sg_ids[2] = sg->id; SLIST_REMOVE(&snd_pcm_syncgroups, sg, pcmchan_syncgroup, link); diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 08e789f6a5ad..4cf9d4f6695f 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -353,8 +353,7 @@ feed_eq_free(struct pcm_feeder *f) struct feed_eq_info *info; info = f->data; - if (info != NULL) - free(info, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 3226aebf9580..0747b54cbbae 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -90,8 +90,7 @@ feed_format_free(struct pcm_feeder *f) struct feed_format_info *info; info = f->data; - if (info != NULL) - free(info, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 198fe86d994f..cba537c84efd 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -317,8 +317,7 @@ feed_matrix_free(struct pcm_feeder *f) struct feed_matrix_info *info; info = f->data; - if (info != NULL) - free(info, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 74ab633bf3c7..8c58e1c8ef33 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -100,8 +100,7 @@ feed_mixer_free(struct pcm_feeder *f) struct feed_mixer_info *info; info = f->data; - if (info != NULL) - free(info, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 63d7fe11003a..aee164840c4a 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -714,10 +714,8 @@ z_resampler_reset(struct z_info *info) info->z_size = 1; info->z_coeff = NULL; info->z_dcoeff = NULL; - if (info->z_pcoeff != NULL) { - free(info->z_pcoeff, M_DEVBUF); - info->z_pcoeff = NULL; - } + free(info->z_pcoeff, M_DEVBUF); + info->z_pcoeff = NULL; info->z_scale = Z_ONE; info->z_dx = Z_FULL_ONE; info->z_dy = Z_FULL_ONE; @@ -1029,10 +1027,8 @@ z_resampler_build_polyphase(struct z_info *info) int32_t alpha, c, i, z, idx; /* Let this be here first. */ - if (info->z_pcoeff != NULL) { - free(info->z_pcoeff, M_DEVBUF); - info->z_pcoeff = NULL; - } + free(info->z_pcoeff, M_DEVBUF); + info->z_pcoeff = NULL; if (feeder_rate_polyphase_max < 1) return (ENOTSUP); @@ -1154,10 +1150,8 @@ z_resampler_setup(struct pcm_feeder *f) * adaptive mode. */ z_setup_adaptive_sinc: - if (info->z_pcoeff != NULL) { - free(info->z_pcoeff, M_DEVBUF); - info->z_pcoeff = NULL; - } + free(info->z_pcoeff, M_DEVBUF); + info->z_pcoeff = NULL; if (adaptive == 0) { info->z_dy = z_scale << Z_DRIFT_SHIFT; @@ -1333,8 +1327,7 @@ z_setup_adaptive_sinc: if (info->z_delay == NULL || info->z_alloc < i || i <= (info->z_alloc >> 1)) { - if (info->z_delay != NULL) - free(info->z_delay, M_DEVBUF); + free(info->z_delay, M_DEVBUF); info->z_delay = malloc(i, M_DEVBUF, M_NOWAIT | M_ZERO); if (info->z_delay == NULL) return (ENOMEM); @@ -1517,10 +1510,8 @@ z_resampler_init(struct pcm_feeder *f) ret = z_resampler_setup(f); if (ret != 0) { - if (info->z_pcoeff != NULL) - free(info->z_pcoeff, M_DEVBUF); - if (info->z_delay != NULL) - free(info->z_delay, M_DEVBUF); + free(info->z_pcoeff, M_DEVBUF); + free(info->z_delay, M_DEVBUF); free(info, M_DEVBUF); f->data = NULL; } @@ -1534,13 +1525,9 @@ z_resampler_free(struct pcm_feeder *f) struct z_info *info; info = f->data; - if (info != NULL) { - if (info->z_pcoeff != NULL) - free(info->z_pcoeff, M_DEVBUF); - if (info->z_delay != NULL) - free(info->z_delay, M_DEVBUF); - free(info, M_DEVBUF); - } + free(info->z_pcoeff, M_DEVBUF); + free(info->z_delay, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 3e9e3484fba8..fc4ed1bbb0a5 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -193,8 +193,7 @@ feed_volume_free(struct pcm_feeder *f) struct feed_volume_info *info; info = f->data; - if (info != NULL) - free(info, M_DEVBUF); + free(info, M_DEVBUF); f->data = NULL; diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 65c1327ee0f2..86fb5228a990 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -2704,10 +2704,8 @@ error: int uaudio_chan_free(struct uaudio_chan *ch) { - if (ch->buf != NULL) { - free(ch->buf, M_DEVBUF); - ch->buf = NULL; - } + free(ch->buf, M_DEVBUF); + ch->buf = NULL; usbd_transfer_unsetup(ch->xfer, UAUDIO_NCHANBUFS + 1); ch->num_alt = 0; From nobody Fri Jan 2 16:58: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 4djVJW58R2z6LvlQ for ; Fri, 02 Jan 2026 16:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJW2K7Cz42nR for ; Fri, 02 Jan 2026 16:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dMFL7x1kV+fyZRnu35ftxm6UZa/7Ch4MOFnk+QIbW2E=; b=cuoQwB9vRjjJMZvwbDMPriRSu9/epBThHiJkNnRFoL01fRfLdD1nj/3Hn0txojA6376cQE 4lEm91gp2xiApTj7IDtJM1AdlfI1RS3A8O/8Nt8/yi8gjj6SQY3daKVBDD7sacRPohlWX5 GdZ1xJpBiX5+mkRiGWR0FOEwvhrImPBW7lSVYZdwtWqdUQaGEtBd1GpPwrzKr7caKDgYo7 YrVm00Xg4cX5nlwNBGe8fiOVg2pHkZywTkSd1eBKycMaU0jFhaTsWNSb9i2S7JcocfBLkt W0BEyjP/5RcXBphFieSaPHdeS4vMpG/18y3eqW29FFlVIZmEkkdWJNekNeeCvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dMFL7x1kV+fyZRnu35ftxm6UZa/7Ch4MOFnk+QIbW2E=; b=f/cnfOvzFnYc31RNBKatVS+NXY+HyN+lejJdBfjSiDIGyV0xVp6ul38u+XzdGydKArg0ca LNZ4igrf44+0oUyyvwD8qEXD9q6/IzIlQ83tYoCKtnzVmLhYZSB5YqV8O1qY07o647bkYR N/YcfwREQqF28YSMapdAmRouCBOkiZX2NOgt+ANOibFplXyKFJhKNQpdAyAQqqQF4LQ+GG cJW6jlyUtK1p24xXzs0KJXUkhtLLjnn5pc2B0P9D2W44n4gxgDMsid7NEZtsHJFCgyYehp NpEJNeSy1WE0lfUSwqllpHH3x53idQgUgsqL0O7KSTxDJ5AujxPRhW4xfDfhPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373115; a=rsa-sha256; cv=none; b=Qlrz/599wBkT30VOxVgA/AZBCjuyWa3lNSppSE/XRjddEMwMJXYwTrie6bZaPHhZn2Z6BR mV0j4d/z1VlcZhl3eVYYDnC84HF4EsFMp0Sy4mwaaxvqYaZu9Lm5oJwtnUNaIl8yWzTxRq 2J6HkSsEGj64t3KOnQliEYHiW3s87KqCuproqXnmjdUYFE7GhdemsAyhb0mT8mJTykDlyR BuksODjoZIA11Gx3R8N4LDJxK+cwns276vkaaDmczToMzZ+REbAwXg8WMbt4bTHkm8qwrC 4IlI0yzhZ6NNcKzWMftbADitM4245H2kas+G8Sh+wyb4L8F4E8x24HV0KbAgXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJW1czbzBSl for ; Fri, 02 Jan 2026 16:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22957 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 4a2d1532e841 - main - sound: Get rid of unused midi/midi.c defines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 4a2d1532e84135a50ba8414ceaafc0c3a1bfe94b Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:35 +0000 Message-Id: <6957f93b.22957.74268d0b@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4a2d1532e84135a50ba8414ceaafc0c3a1bfe94b commit 4a2d1532e84135a50ba8414ceaafc0c3a1bfe94b Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:55 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Get rid of unused midi/midi.c defines No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 542282d81842..e0a782bc9a22 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -185,19 +185,6 @@ midi_uninit(struct snd_midi *m) return (0); } -#ifdef notdef -static int midi_lengths[] = {2, 2, 2, 2, 1, 1, 2, 0}; - -#endif /* notdef */ -/* Number of bytes in a MIDI command */ -#define MIDI_LENGTH(d) (midi_lengths[((d) >> 4) & 7]) -#define MIDI_ACK 0xfe -#define MIDI_IS_STATUS(d) ((d) >= 0x80) -#define MIDI_IS_COMMON(d) ((d) >= 0xf0) - -#define MIDI_SYSEX_START 0xF0 -#define MIDI_SYSEX_END 0xF7 - /* * midi_in: process all data until the queue is full, then discards the rest. * Since midi_in is a state machine, data discards can cause it to get out of From nobody Fri Jan 2 16:58: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 4djVJX5zshz6Lvqy for ; Fri, 02 Jan 2026 16:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJX2rYCz431m for ; Fri, 02 Jan 2026 16:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DSDbGNN/QcIMXmmW3yi7DYNs3NK7P6nvl8TVtwjYn9M=; b=Cy8fSkCkT2wXz/x5iPTK4f3z1P9qHtS+gNXM3gQkBFfscf2LpZ1Z8IseHM8TJz/pQPkdDL jbBNmuTbUrwZ1NPnwGF5YAkT8N6Y0XMebIsKixB4ukf5TIOpW5+R1ImM8bAlF6xH6hmjlb ReuZ2FvB5kfoFIiH14AaI36kVnWHGvilI4AaVDdVKfxRLaINB3VlZJjrDDutCmh88TZjKs QfUjpF44YeagZqy3C2/xCycO/eettqpOug6Hvez0FqSnqFNY5pCGwqatfMbR3/lJMZsb+9 wvee3uOcar48EfnNk3ppSQRhsUST9tub7ZgKy0nADzWnPH5ShVXgtpfWIYvQCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DSDbGNN/QcIMXmmW3yi7DYNs3NK7P6nvl8TVtwjYn9M=; b=nX6+SzzGMOsN5ZYIiET+rqK1XWXVg+hzIPZ1Pv+z5RLWKwI77c/A+wA74Pux+wTBWraCdy pu56vPnuQaghNxAcw0sOYZBubU6LJtuMo1dDCMq65fK81o+8CTgKw40j6G2Pi+Jf1LubM1 mdiS9rVMkwQybi4qqpvbPjLXO+kXZxwWIchGq8G1xn417IpXtkMHzrGS2DYTPci96UURbR QtyJVwNHieNCVvyJbRKTXbh9XuGaGhyVyD7qp5YIblxB/3UWrRjspQXxxvbw/d7rpKy+Gm we3JYMdvl5x05LZuGivoazJIpWSainlGyGskzugutbNNcNLnykey8PLe+GqtXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373116; a=rsa-sha256; cv=none; b=x1jiu0rUZC4+udNtTmBkWDTVccrZPSbrXs38j29EyrG6yomNurRSaVrx0ACKhfMuv0oU0D XLMBIUddE9HkFG2KoIQaeJvIu4uJkD0ByLAqxRGrixORWaMMwL3txt+q4yDE13RiMXETRZ JUj9S2j5Z73nWY2h80Lwcw+J1LVdRzS43ADb9/4EuiwY4RDt2bobpWhD73j7FKCJZ+v4cB uFN9fc5jBclrI4ZvsB09OhFrMw2eyk+EAyQ2Zl7Em99ERxQgikUeSTjfPI8lQjFH1tj+Hf PfVgqXNDk84ymen8Q2eBzvjECiWSRJYQJ2V9n+JH6s6z3Lrx9T628J3rvaKxqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJX2LlszBQJ for ; Fri, 02 Jan 2026 16:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2295b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e3b57ceffef0 - main - sound: Retire mpu_callbackp() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: e3b57ceffef0158a72a7a5aedfa9df88b3a8a88b Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:36 +0000 Message-Id: <6957f93c.2295b.31c31f60@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e3b57ceffef0158a72a7a5aedfa9df88b3a8a88b commit e3b57ceffef0158a72a7a5aedfa9df88b3a8a88b Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:58 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Retire mpu_callbackp() It is the exact same as mpu_callback(). No functional changed intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 2 +- sys/dev/sound/midi/mpu401.c | 8 -------- sys/dev/sound/midi/mpu_if.m | 6 ------ 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index e0a782bc9a22..bde3c5447705 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -242,7 +242,7 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) MIDIQ_DEQ(m->outq, buf, used); if (MIDIQ_EMPTY(m->outq)) { m->flags &= ~M_TXEN; - MPU_CALLBACKP(m, m->cookie, m->flags); + MPU_CALLBACK(m, m->cookie, m->flags); } if (used && MIDIQ_AVAIL(m->outq) > m->hiwat) { if (m->wchan) { diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 21141a0c8e3c..107a53119cdb 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -76,7 +76,6 @@ static int mpu401_muninit(struct snd_midi *, void *); static int mpu401_minqsize(struct snd_midi *, void *); static int mpu401_moutqsize(struct snd_midi *, void *); static void mpu401_mcallback(struct snd_midi *, void *, int); -static void mpu401_mcallbackp(struct snd_midi *, void *, int); static kobj_method_t mpu401_methods[] = { KOBJMETHOD(mpu_init, mpu401_minit), @@ -84,7 +83,6 @@ static kobj_method_t mpu401_methods[] = { KOBJMETHOD(mpu_inqsize, mpu401_minqsize), KOBJMETHOD(mpu_outqsize, mpu401_moutqsize), KOBJMETHOD(mpu_callback, mpu401_mcallback), - KOBJMETHOD(mpu_callbackp, mpu401_mcallbackp), KOBJMETHOD_END }; @@ -235,9 +233,3 @@ mpu401_mcallback(struct snd_midi *sm, void *arg, int flags) } m->flags = flags; } - -static void -mpu401_mcallbackp(struct snd_midi *sm, void *arg, int flags) -{ - mpu401_mcallback(sm, arg, flags); -} diff --git a/sys/dev/sound/midi/mpu_if.m b/sys/dev/sound/midi/mpu_if.m index 835d887f703a..07371a0dd726 100644 --- a/sys/dev/sound/midi/mpu_if.m +++ b/sys/dev/sound/midi/mpu_if.m @@ -44,12 +44,6 @@ METHOD int init { void *_cookie; }; -METHOD void callbackp { - struct snd_midi *_kobj; - void *_cookie; - int _flags; -}; - METHOD void callback { struct snd_midi *_kobj; void *_cookie; From nobody Fri Jan 2 16:58: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 4djVJY53rJz6Lvns for ; Fri, 02 Jan 2026 16:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJY3qtcz434F for ; Fri, 02 Jan 2026 16:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ZC6Y33wjwlCt03IWxel1a961XUa20doqujLLsdKw+U=; b=uMZQKVPyLpnlPDwYyJ9474XGlxf5albcZaFtVxcUmbox0t4V/T93HbMP1lkwQXOaM68JKO MqOgPfAVwnn1ZfNvZV35PwDDERK4NjfPcum7MJQ0AYGYR7RaAFUtO2t2com4CpviPaQDTQ IMPjaULlieY/DHZyW7auUZr9OS2YwNKbvXIJsTkFsXBRLmRJFaBKxnnWKTt+n8Y5vR1A6Y OdR3YH0l0ogrdqWVDYlPyj3NQwob6WEo9Oyyojl4sK5v2qe4GS3SND57CpImbX6BOq/K13 r60oouhS+lYIwOdAWrwJIzU5kg9TVLLL9Q2dii7J2rL7EWr+afcT+WCDblxUMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ZC6Y33wjwlCt03IWxel1a961XUa20doqujLLsdKw+U=; b=RH7e0NJ5vc5YxSbMQDrTg1L1MQF3JQsB1r38T6phYfZKmfPIsQKqlpcWZY1iDTWr/hlLQ4 5krahbzfuM8OkQLvwyZYJQpljWhcLVUxcZAcTCE50xF9GJkljfmmgjOSgHnkuOZrazLJnS RfMYi/AIPQUwy2Lk+2JLnocnesSimqCKrc6O8ATOEl5vM8UR1m+MOFP4RxG/Kwu1dgF7Ie cQ0Be1QXyVBgWl9YEdCRFTgEktspDje/+j2jzNgFKkPdPHkCULaiJOKJnE0g8FM4g0gSGq gb0GGYu1SVygx/W5u1BfwJrIMv3iL5NtcxeQmoWMxxeMSZJQE/D7xgUlY417qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373117; a=rsa-sha256; cv=none; b=MDu/98eMj+uJVXvNdAqiYsr3YObVWN8zdsMHB13UEUQDLhuqGg/iJ+yWLxSpvRxdCJGWCh 3ygr7SzofftApA1NJjMpQtxFGnccaDgS8f+IaXiTsSle5DqE0eCUHixVedF/GmQl4PPits antrM3E0GvsZbxlqKn4yTnuuniRm8sVK20lK7VY12XuMyZsHkP94lexEfrqK1sL9Nyzxed w8kqJ/ZDhhxxNBjyNAHzNZlMn7SPTbfBQmax3I0I6vg6OrFWWAgsZT1w3AqSH//DzT6woQ hm5epb9e0arwpRHCIX8NbRqlltm3W0Lespfn41o4iUhzP2kIPEMDPBEflqUpIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJY2qcHzBKK for ; Fri, 02 Jan 2026 16:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24a18 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3094c5e388df - main - sound: Make mpu_if definitions static List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 3094c5e388df296f1b84579f70a5583ddc3bc26a Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:37 +0000 Message-Id: <6957f93d.24a18.4fe65319@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3094c5e388df296f1b84579f70a5583ddc3bc26a commit 3094c5e388df296f1b84579f70a5583ddc3bc26a Author: Christos Margiolis AuthorDate: 2026-01-02 16:57:00 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Make mpu_if definitions static No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/mpu401.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 107a53119cdb..500e15c79497 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -203,7 +203,7 @@ mpu401_minit(struct snd_midi *sm, void *arg) return 1; } -int +static int mpu401_muninit(struct snd_midi *sm, void *arg) { struct mpu401 *m = arg; @@ -211,13 +211,13 @@ mpu401_muninit(struct snd_midi *sm, void *arg) return MPUFOI_UNINIT(m, m->cookie); } -int +static int mpu401_minqsize(struct snd_midi *sm, void *arg) { return 128; } -int +static int mpu401_moutqsize(struct snd_midi *sm, void *arg) { return 128; From nobody Fri Jan 2 16:58:38 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 4djVJZ734dz6Lvlb for ; Fri, 02 Jan 2026 16:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJZ44pLz434P for ; Fri, 02 Jan 2026 16:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMSuajuZ7T0drQK/tTgOoeZvG15ribkm0UiyzgUq0Co=; b=v+/62xNZhal8VzDTRNqBc+nfZ7OQzBn5ZdTu5VZzWYmFeTsulOdTNvG+VNcaOd7hyIxZJi rlmKEN3Cbxzj3cAqb+dKU1R0Zic4jD+f94iSMHOUCPkdNlaLVOogrcxc5+UZJF8A8ynv7F RRVZmDZJP5FEdyVTyWbnQ72823pb28qcXDfx4Ug6s6Mv+sTX5my/VnpAScU4NkuT8QjIlb UZESLizlXBMNM/mGNC8oncO9bVy1jYalsMTvfJA+jN109tiFgM+LQqcePymhHfIZy6hLFK aIqIt5D44figGXHYfjxrKTUoRrMfiYK/ejQJxyScASv0fJ/yNXuNDqy6KhQa0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CMSuajuZ7T0drQK/tTgOoeZvG15ribkm0UiyzgUq0Co=; b=ttHSFRdThkFv2KT1lgAZQsFxQ/EGTErsYCz5w1wU7Kqew95IgFaiRbUeKQNJhDElpljKo3 Er5Vf1m8sO7xNXx7FCcxGmGTfzLsgfgFGILOBrlrYc52FjwF122VSZINxyC7jcmhud0a2O IlLJuLGXlP5NRdhzBX6oGUGGCLyaSQsTCDr6l0Pyubsubf4YNKiBScF2EfXX6+KlDoQ6Pv D1LGgqhdjemTtSrFkShF/QXzRlke0wswG3Rr4KQRHUHfPYyJTMdvuEkQEZZux1OxWrzIbl 9sfo8nBz1BKwk6notcGHEm4eeyjlQAqwLeyMmwndnuPStu2bqhcNM74WRLMuAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373118; a=rsa-sha256; cv=none; b=lm+EYlDU3ZImZxTbAHkyhaNFxM5MQWp5M1dJjlr+eP7tRiON1FrtsgoQZ9DPSxf2XnTJi3 GLaWlhdT5W0C59aYf8HTofX7X02P6A7PDNh40Q56pPgUgqj4qPABlTLUnQ9qP3SeJv/FkF QiHsTn/pyRB5d4gruSYhyDMtGpd81fhKDGIiK5XvuwRUgJ2aIlJGC4mo08FMtcslAK3aVH 3yyw/aLeHcBm9bNzFl86njBs8TfKnedDld+gALUgHf5JlsUH85dvwChReKEe+RJMAfLNcz B0JzN+Fnfg07o8VnUIBASRTMV6JUBk3+Gu9ny3XU+OToixGeFQXQA7s4GuN1eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJZ3bYtzBH8 for ; Fri, 02 Jan 2026 16:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25101 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3f8a85a085c7 - main - sound: Get rid of unused MIDIQ 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f8a85a085c710f50b8bcd4efe915268882129d2 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:38 +0000 Message-Id: <6957f93e.25101.70be8125@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3f8a85a085c710f50b8bcd4efe915268882129d2 commit 3f8a85a085c710f50b8bcd4efe915268882129d2 Author: Christos Margiolis AuthorDate: 2026-01-02 16:57:03 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Get rid of unused MIDIQ macros No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midiq.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/sound/midi/midiq.h b/sys/dev/sound/midi/midiq.h index 27958ff4c23e..80825974283e 100644 --- a/sys/dev/sound/midi/midiq.h +++ b/sys/dev/sound/midi/midiq.h @@ -83,7 +83,5 @@ struct name { \ #define MIDIQ_CLEAR(head) ((head).h = (head).t = 0) #define MIDIQ_BUF(head) ((head).b) #define MIDIQ_DEQ(head, buf, size) MIDIQ_DEQ_I(head, buf, size, 1, 1) -#define MIDIQ_PEEK(head, buf, size) MIDIQ_DEQ_I(head, buf, size, 1, 0) -#define MIDIQ_POP(head, size) MIDIQ_DEQ_I(head, &head, size, 0, 1) #endif From nobody Fri Jan 2 16:58: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 4djVJc1Z5Xz6LvpN for ; Fri, 02 Jan 2026 16:58: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJb5H1zz42pC for ; Fri, 02 Jan 2026 16:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ByKp05yvDADXnTrMMQ/bXKRkkuZ86Vehf7cK/2VFCmU=; b=hcbCdBcRCMWgqfzT2666khMg84JH0SxVW/yuNR1FYL/ji2fIkRP19Y5MOCN20G5yGwa4Bu CdTLygo5HgPv+JNjZDgJegQiaC1rpW6rr66BJYc/+AAxPJ9LIsv/HPQN4YzEqRPXGVsZbN u5YsPDawMQSZJn2BDPbPxkLZUW5/sVuAClBFz3Eo+pDCI+m0QjdsxQ0gAIa14qWHFMVS0F DEfW5cxSaUH7vz7JPHXXY+JzAbbAvfF5aJzgiK9sPISvygUe6Wx7Axp4dk8irZeWmh4KRc EZnJ+U659UtcRnOFZiXIrQOqmxJFydoXl2b3piKGZyNcjAs1u5ahXUnDwyXqlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ByKp05yvDADXnTrMMQ/bXKRkkuZ86Vehf7cK/2VFCmU=; b=TUFFW5O5PHek06+hFYN3WrGNzNX+Tm+nWfqtzlW80Ti0Ukhg0l1bkj+x2imzwIKbmHCuSs 0vndQrJ2pISmHQpb88erdxhSHN+VFzkG8VzpXI2QC7lQhnQgX/oNFouwEg6eguU8DB7MN3 tyYsDcQV5pG5mzLbT1zYBNfcx42WU72qLE3HZulZrnr0OJmmZRk8GD3W3FgB8UZIipBx23 J+fuEgz4S0Sxpb+ZJJ87Iq/5jnIvfu0zSdMkLohBWTk3kiSJoMmtrLmTcP2KPdg/p+tMII DT6ypxRt4fX/vgoKJP9+3U6QcfFv/LJJqe9U7XMPqTSCMY9q5oxfjP4Ht3sCHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373119; a=rsa-sha256; cv=none; b=oqVB5i+BOqejCmNTHU1ZY6b+rEBVrQU15cz8FCDGTC/gPnZMh5ZE5uDlL9/FGMKzuA2Zgg AhnfNtmMGZ/w8BHn7TnJ1GxWMwnsvaBnFP+XHI8cUumpfFG5B54vbZcYxw8GkWNXQp5LU7 4hp5srUb4SrNIM2r9QFdFKyIVLBKKppe8w0WXE5ZNTrlX96SI51xutjpzzNh6F/C3pJZ6d Kb3cW6bznrXpSXmoKmxzYtWi3uhMTDwelJn94c8JBl+BN65bembuA4qjylhZH5dnzyGkhc fmGl12S7xbyhnMk7pv++rTCtCcQDg07Oq0HsYcaqiQchJVwQDx7JQIp8Ufj6Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJb4KzJzBN2 for ; Fri, 02 Jan 2026 16:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 247c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: fd1312d3629c - main - sound: Allocate mpu401 with M_WAITOK List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: fd1312d3629cda9691c67af6154946cd55467076 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:39 +0000 Message-Id: <6957f93f.247c7.330441a7@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fd1312d3629cda9691c67af6154946cd55467076 commit fd1312d3629cda9691c67af6154946cd55467076 Author: Christos Margiolis AuthorDate: 2026-01-02 16:57:06 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +0000 sound: Allocate mpu401 with M_WAITOK Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/mpu401.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 500e15c79497..d3fb6b214d3e 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -142,10 +142,7 @@ mpu401_init(kobj_class_t cls, void *cookie, driver_intr_t softintr, struct mpu401 *m; *cb = NULL; - m = malloc(sizeof(*m), M_MIDI, M_NOWAIT | M_ZERO); - - if (!m) - return NULL; + m = malloc(sizeof(*m), M_MIDI, M_WAITOK | M_ZERO); kobj_init((kobj_t)m, cls); From nobody Fri Jan 2 16:58: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 4djVJd3vKvz6Lw0H for ; Fri, 02 Jan 2026 16:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJc66Vpz42tL for ; Fri, 02 Jan 2026 16:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uJ2WFYbOjBumabQWDOlw0qYDdfp3VLZhw0m/21Q6vTs=; b=AXXW90m5vc2BwtYXwfQzzG8cR/UBO88zOucvmCbM6uMw1JNv3v6CVXOulK7UdsP1YgjdaN EUnrwX9SinjKwopj7HSuiVvTWVoP/EhKOQeSX2tLT3r+kUhypdyxr7jWuYjkSMZu0p+Ktv w7IBuEkZih45PFnRSaBM3VwHoIexqU4XVyn9uUepqYTqRopH5oUNQuiJZdl1iYYOppIUom +BE+i3DpxedkEbrqsgIp9PxW9cMG3WvUL3kZXUjE/tf+M/qPOXY59cltRSnpTR7IFThOWa KPIZPnagIl6LKglbKyw0AYUyNsjBzi/U09ZeQI+UHneHtYSKsvRM9fs1czdadw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uJ2WFYbOjBumabQWDOlw0qYDdfp3VLZhw0m/21Q6vTs=; b=hntRZeiY12ckTyJLcZOXjxBKifij3CH7tZkih2nttzg+bkASeREbahmck8LSYHtBkvUXxY T67oVFlXi3trGWI/S3rwM9v1//1Xv8rBrsza/5sedQxdsl3I2YMSELt2wJTSiS2DE5oWeU orzmj4rztaUTYl4L73s2PtrNwKW6U7gkWPpUiQFaHxAf1Lv6eOUkGRMaRoqPtWZw8NEbre HNUq+eZERdS4JHN3hW61LOiJnzi4DvVzI9PMf05oLXTwGUeL24QlWDHBh2sP7P9v16CmLp ebbR0JCXbKL8T9yatx7nyJmJDKIJyJjArhKY0UxBcMeM5TV7ZzpcW4L7O2FM3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373120; a=rsa-sha256; cv=none; b=olBpKlqJdjvOeTWqEOhPyIGem9tIAbe/IH7K60Nrlh0neiPYs2ZeKNtpTQ9uphk6PUeCmQ tQ0cs6n8w9albBAA0xU26AooEiqpdPbkXUryZAUlTORNSRKM8tg+PLL0oUk7DPOSysv3BB LKBW6mHHmzWPGxzSBTyZKbSf8dtVHGVh+ZVrrGjez3uLIN9cbMjL6/FKr61x6we0hUrSsX oK7bsvP8HzrXP0R7DUuY4PbdPyVlaDSI2RW26ZnuXrYURamOxvgHqTY4fH8U3MLb3kpxFT Esm5ANPZuAZfNlNpXYHb7vXSiAxSxcgGpoLDAroARH/Add8OJrbRZ0LzoUPUZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJc57F6zBQL for ; Fri, 02 Jan 2026 16:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: a9c3bb39bc91 - main - sound: Retire unused snd_midi->name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: a9c3bb39bc9181b8762e67c40d00886474e9ae06 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:40 +0000 Message-Id: <6957f940.228ed.621c4769@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a9c3bb39bc9181b8762e67c40d00886474e9ae06 commit a9c3bb39bc9181b8762e67c40d00886474e9ae06 Author: Christos Margiolis AuthorDate: 2026-01-02 16:57:08 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:07 +0000 sound: Retire unused snd_midi->name No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/midi/midi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index bde3c5447705..c86f5fb41b14 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -68,7 +68,6 @@ struct snd_midi { int channel; int flags; /* File flags */ - char name[MIDI_NAMELEN]; MIDIQ_HEAD(, char) inq, outq; int rchan, wchan; struct selinfo rsel, wsel; From nobody Fri Jan 2 17:20: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 4djVpL3kGdz6Lxrg for ; Fri, 02 Jan 2026 17:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVpL1DsMz3GMm for ; Fri, 02 Jan 2026 17:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WnDHfat/TnE7bJc1quwdyrhLiOBl39Km79WWD6J9Afk=; b=tWWLJE1kV+E4d5hG7h/3ZK0TZIv0oUFk7JUsJjVFMSyffCpkO7a41q6KiLKaOaffQnxR7H LO1Nq+uOruOLCDwZjYT5XI3R9h+f6Kt1wxV4kNTqRVJU6mLrkfDhcnrgRGj0Nso/gRnE5d ti1oDvIa2fujNj2fKexSJTZX2XpKZ+AoxB8Gl3wsg8HNwZqbS35+c468NCjRKVDRTlVYeZ +/hw1c1JH/GJ2yFGDLlJKIrPzstrnqqj1Ba/Vd4qWSWNceT4I6ILtf1EXPoBOPnXL3eVtB E/xdPgQ2a59A8BfenB6DAt5PayF1GHHl7fyo61Uxpl5I0jhXTiAoHbEuZnMWQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WnDHfat/TnE7bJc1quwdyrhLiOBl39Km79WWD6J9Afk=; b=GjHFaMD26tlk6OQw2ZPvkyOa3Te63afMpoDytV5rI+jjZMVQTHeOywI9SxDEBGUxzUt69q bEOXzFTVRa4wM43MjPAHagF//uX/CCVlCEw9WYGQI75WvUyJif0VEwC46E0jc/wmNJ5EgI 9RXFqDT/ANoPQ4c4Ow4HEkuOZGC3dOAHvfN2hcp1KqFvhzTP3jgn9LnwD+ogyjlbju/psc 06JBKPJFxwQwseS7NDIkwHyaWomcXgEXEaFSuY0grHgugx2hPjnHo0aD4e/UOrUvYlKW3d 40sp3pbafwn+rZ3JS5+ANMqlvbIeHkMG9AbDQYVn2lHg8mso8eiJNaF07SHHQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767374458; a=rsa-sha256; cv=none; b=LibT2sYy2sUxNgEk2971usLvOi0xT0a/LfporfqlyfhFeWU4cTamx2MhAxo9u26v24BcP5 qKa/r0ll5RMvgSDhFH6X4vyFsfj6w5q6h6YfVB5R3jLmMseOrsYkQw6YAZMsX6nvaY99Wu uURVqUWvJyU5OfNqCooxgIdFGQdCFX1BCuOs4Aq4sD+oZ5Im5eADF6eARrw6dhiJqFUILO X+y3UTflNPqYDSREf4bWy+TwkhiA6JytbM1UMvdaTVjpJSyQnPDJaSI8CoGa0YukmNTMUv GGsuWJ/a+Njcaid8IlNQF2e2IE1ShuBU+o8i3fYt+fS9JpSFMvA58TIQbW05oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVpL0cTLzBVj for ; Fri, 02 Jan 2026 17:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27998 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 17:20:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: c234740c9d34 - main - snd_uaudio: Do not use pcm_channel->lock to protect uaudio_chan List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: c234740c9d34c2b953c6010f6a01b0aca9648c08 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 17:20:58 +0000 Message-Id: <6957fe7a.27998.5f730eec@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c234740c9d34c2b953c6010f6a01b0aca9648c08 commit c234740c9d34c2b953c6010f6a01b0aca9648c08 Author: Christos Margiolis AuthorDate: 2026-01-02 17:20:36 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 17:20:36 +0000 snd_uaudio: Do not use pcm_channel->lock to protect uaudio_chan This is a layering violation, but it also makes the control flow confusing; snd_uaudio(4) should have its own lock to protect its structures. Fixes: 5cc34a83e1 ("Revert "sound: Merge chn_intr() with chn_intr_locked()"") Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54102 --- sys/dev/sound/usb/uaudio.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 86fb5228a990..0987ca12d933 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -232,7 +232,7 @@ struct uaudio_chan { struct pcmchan_caps pcm_cap; /* capabilities */ struct uaudio_chan_alt usb_alt[CHAN_MAX_ALT]; struct snd_dbuf *pcm_buf; - struct mtx *pcm_mtx; /* lock protecting this structure */ + struct mtx lock; /* lock protecting this structure */ struct uaudio_softc *priv_sc; struct pcm_channel *pcm_ch; struct usb_xfer *xfer[UAUDIO_NCHANBUFS + 1]; @@ -1390,9 +1390,9 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, /* Unsetup prior USB transfers, if any. */ usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); chan->cur_alt = CHAN_MAX_ALT; - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); /* * The first alternate setting is typically used for @@ -1415,9 +1415,9 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, return; } - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); next_alt = chan->set_alt; - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); chan_alt = chan->usb_alt + next_alt; @@ -1474,7 +1474,7 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, } } if (usbd_transfer_setup(sc->sc_udev, &chan_alt->iface_index, chan->xfer, - chan_alt->usb_cfg, UAUDIO_NCHANBUFS + 1, chan, chan->pcm_mtx)) { + chan_alt->usb_cfg, UAUDIO_NCHANBUFS + 1, chan, &chan->lock)) { DPRINTF("could not allocate USB transfers!\n"); goto error; } @@ -1527,18 +1527,18 @@ uaudio_configure_msg_sub(struct uaudio_softc *sc, #error "Please update code below!" #endif - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); chan->cur_alt = next_alt; usbd_transfer_start(chan->xfer[0]); usbd_transfer_start(chan->xfer[1]); - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); return; error: usbd_transfer_unsetup(chan->xfer, UAUDIO_NCHANBUFS + 1); - mtx_lock(chan->pcm_mtx); + mtx_lock(&chan->lock); chan->cur_alt = CHAN_MAX_ALT; - mtx_unlock(chan->pcm_mtx); + mtx_unlock(&chan->lock); } static void @@ -2664,7 +2664,7 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b, /* store mutex and PCM channel */ ch->pcm_ch = c; - ch->pcm_mtx = &c->lock; + mtx_init(&ch->lock, "uaudio_chan lock", NULL, MTX_DEF); /* compute worst case buffer */ @@ -2690,10 +2690,6 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b, ch->pcm_buf = b; ch->max_buf = buf_size; - if (ch->pcm_mtx == NULL) { - DPRINTF("ERROR: PCM channels does not have a mutex!\n"); - goto error; - } return (ch); error: @@ -2707,6 +2703,7 @@ uaudio_chan_free(struct uaudio_chan *ch) free(ch->buf, M_DEVBUF); ch->buf = NULL; usbd_transfer_unsetup(ch->xfer, UAUDIO_NCHANBUFS + 1); + mtx_destroy(&ch->lock); ch->num_alt = 0; From nobody Fri Jan 2 17:20: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 4djVpM3Qklz6Lxtx for ; Fri, 02 Jan 2026 17:20: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVpM1fJmz3GMq for ; Fri, 02 Jan 2026 17:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y4M5fqhf08AJjwq8mwAM7UQRpscb8N2gOhKCSE5PcyQ=; b=cMRLeULh7GabLSJiVL4G8ockzETZ9WzbUtygtinBb8T+zHEJ83QcPSr06H/vKltiIvq/ee WxD2rDB8ivY66okwllhvJsBIhmgvfJtF9Vgr28MlDjaIL35fk/gTvtpXWppane7UEp1zl2 MOC4V+AEcL5t5n0szoKP+zCY0vk8KOeOTRTeDG80WcuIxP2sZZfmosxcbG9ypYDpxlMi5G tK5pOe989uHjS63gcVANJqiQbJ0Y1Cs/hv7HWtkCxrNIdCMhtQ30WwjqosCobMIdNyeZmo mD/PdTUr3I/os6r0UU1+DpZzrEuFPo6gzd95kABLU5cNQWxhdcCnToVydETldw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767374459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y4M5fqhf08AJjwq8mwAM7UQRpscb8N2gOhKCSE5PcyQ=; b=idNGzoZymZNlUop3WXM8jcJb5nqbkmLmzlYlpbJGgX/CfXczfresX6jBun0ROxfpyjLLXX k8Wm0b6ChVj6DFl9luFPtbH5lM3bwWK/FuF4Q7UMbWIY8Yw7FQppXO2L2iADd4rVhYcI6J 31cgX/zD7I5gxZTa3DnTX4hqSO2sWNd9JZb5d8lPyEINjqXBfK5vtepcos23WTELHzKzZf JHk2uyr0dfsIWvKKq4flCktXjR1EOsw/iuz2KN6llWS3crmBNbPyVNdrBt/bY84tRLPrZs KyzLH866OX9JOiRcYYDFrMLZaRvbYgqXkQC7r5kxqR6dkWZ/2cO2eKcwx/xvyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767374459; a=rsa-sha256; cv=none; b=ozeCHhk2mi1egEhK+zCLmmEl09CXOe6KPjSq3DTv6tRPZn07DQpae/i6s9kNaTzaWTlrSq UQ3yrbkNSFYr0Cd8L7EgMEsQA8z1GFL8//SWv1xyboKvuULDJItQFt2nOhOXTQ9h9ps4Di hyHODZDZLoatmpBe1MD4dD1ZxMJdKe5cSWhD77FpPbzRP7tqadTPQ82ECZbQRkQrhHDU/6 HCTA2hDODPnJzhBNLbHQRNVZqKewbLQDaQQw+wNcwiHdcuwvthru8UP89GnM0362pbo5ej RGrMs/bwWClRZlffh7vZ84MeR/PT1ePii5ePtoSZLs8BPRni6IOgFgAOzWhYGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVpM13RFzBW4 for ; Fri, 02 Jan 2026 17:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27212 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 17:20:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 0794365d5d3c - main - sound: Merge chn_intr() with chn_intr_locked() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0794365d5d3cc93940b873553382288a2a2c88c4 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 17:20:59 +0000 Message-Id: <6957fe7b.27212.60e2349c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0794365d5d3cc93940b873553382288a2a2c88c4 commit 0794365d5d3cc93940b873553382288a2a2c88c4 Author: Christos Margiolis AuthorDate: 2026-01-02 17:20:41 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 17:20:41 +0000 sound: Merge chn_intr() with chn_intr_locked() There is no scenario where chn_intr() is called with the channel lock already held. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D53854 --- sys/dev/sound/pcm/channel.c | 20 ++------------------ sys/dev/sound/pcm/channel.h | 1 - 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 7c3f0e3dc9f0..011dc1427c2e 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -581,30 +581,14 @@ chn_read(struct pcm_channel *c, struct uio *buf) } void -chn_intr_locked(struct pcm_channel *c) +chn_intr(struct pcm_channel *c) { - - CHN_LOCKASSERT(c); - + CHN_LOCK(c); c->interrupts++; - if (c->direction == PCMDIR_PLAY) chn_wrintr(c); else chn_rdintr(c); -} - -void -chn_intr(struct pcm_channel *c) -{ - - if (CHN_LOCKOWNED(c)) { - chn_intr_locked(c); - return; - } - - CHN_LOCK(c); - chn_intr_locked(c); CHN_UNLOCK(c); } diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 0b17c4a130a7..6415f5c88984 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -298,7 +298,6 @@ int chn_oss_setorder(struct pcm_channel *, unsigned long long *); int chn_oss_getmask(struct pcm_channel *, uint32_t *); void chn_resetbuf(struct pcm_channel *c); -void chn_intr_locked(struct pcm_channel *c); void chn_intr(struct pcm_channel *c); int chn_abort(struct pcm_channel *c); From nobody Fri Jan 2 17:46: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 4djWNP6nFvz6M10F for ; Fri, 02 Jan 2026 17:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djWNP67kKz3Ksm for ; Fri, 02 Jan 2026 17:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767376021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rBv2dhup/T3/gJBYAcqLlEYFa8qhyQeHX56UxL8Eh30=; b=RCR0N9S5Kr62AC++LbW76dWvMTkkExAaGBjxcZRWxEJcwx8Ax2qUUtePzhJI55S8SgdWY8 pT91iP3x73ufv3iCvnFZPZaWd7JSaIMuGNuh9kVfWxRLH4JSHIsp6oXKO1vp3QblQBh/vl KGjr8GA155gRiecbnSDTQeygL0V0b6jWMo4HuEgsBOzy94Ko6veOtNJmB0y2HRIDjww/+n nejCgAzKNlF0JyZ3vq/8e8cE3HLVbyO251a+itcdKmq617Jc5TlYFVLfkWDiPAJ4y/gwNz 27I9yNgo+GeI4hJVylaV1tYuQTJIpBY/cv7SJkihG4/3uI1nwAaLs0BwdM3JNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767376021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rBv2dhup/T3/gJBYAcqLlEYFa8qhyQeHX56UxL8Eh30=; b=VGML//VAkYK1G8UeY3nO009OuXPlBzDu2OuibA2EUTNsxXTC6TWFaF6AfO1wob2jJK7Dsg V8E4hcmWeNst+P1ZtQ7B86J006NHbpxaKz6koExMSbCbVhBxuDDvaeguNteAMDjGsSR1/n eP8IHsIMjFc5GqDy6c28PR8FpDwFiatxMzc9dbHBTtAdfsNXhWNSTxqyqFXIBSlDvyzh34 b81Amo4dPXNjxMoDv5CGmtlBeMunZYCwOlwA79yD3jogfjVfFRiGka82+kRHHSKLYd5nIc En4ctarxFQQWOQO8f1G+1fwmvyXEyaiS8zPbqS7BLI1DBLoP2Z7owqc8Ms9QcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767376021; a=rsa-sha256; cv=none; b=Q17jJBy0+UNF9H1VFsU8lAAm4dsh0x97hHGvrQ8Ey+Kz3bpNSyUfjhEzVb+bDfcIhChDIa F99LXhYzW2jDckilr7bEBOk6/G/anmZbsRyvJPCj3qGQqlqi4nu27tnRsXcF9dst6F5yAY oA/TuX26OzrwTEjc0K3W6bgPDj7PtSjP6hxHUx8J6k0MOExspB2gXp/yrCqb5mv3D/KraF eKjS1Isg9tiQzagwYILyeId6rrG1srTHlz1JqRhyx0sje+VmpRA4PEemgAf66ktX/Xb9h1 8eVK2uyQuWlnC65edOVCfMqgAk0O0FItwEkYrhWfvlr3o69jjMLPM80zkt9p+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djWNP5lLfzC0n for ; Fri, 02 Jan 2026 17:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 279de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 17:46:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 8c7a7d7df508 - main - sys/conf/files: Fix sndstat path List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 8c7a7d7df508faa75515d4f0b8ef58c30ad4ccc9 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 17:46:56 +0000 Message-Id: <69580490.279de.57b02f06@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8c7a7d7df508faa75515d4f0b8ef58c30ad4ccc9 commit 8c7a7d7df508faa75515d4f0b8ef58c30ad4ccc9 Author: Christos Margiolis AuthorDate: 2026-01-02 17:46:48 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 17:46:48 +0000 sys/conf/files: Fix sndstat path Reported by: CI Fixes: bafa8c951d8c ("sound: Move sndstat out of pcm/") Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/conf/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index 474f337e569a..8deb2bd400c0 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3199,7 +3199,6 @@ dev/sound/pcm/feeder_volume.c optional sound \ dependency "snd_fxdiv_gen.h" dev/sound/pcm/mixer.c optional sound dev/sound/pcm/mixer_if.m optional sound -dev/sound/pcm/sndstat.c optional sound dev/sound/pcm/sound.c optional sound dev/sound/pcm/vchan.c optional sound dev/sound/usb/uaudio.c optional snd_uaudio usb @@ -3208,6 +3207,7 @@ dev/sound/midi/midi.c optional sound dev/sound/midi/mpu401.c optional sound dev/sound/midi/mpu_if.m optional sound dev/sound/midi/mpufoi_if.m optional sound +dev/sound/sndstat.c optional sound dev/spibus/acpi_spibus.c optional acpi spibus dev/spibus/ofw_spibus.c optional fdt spibus dev/spibus/spibus.c optional spibus \ From nobody Fri Jan 2 19:22: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 4djYV10hdvz6M7Dm for ; Fri, 02 Jan 2026 19:22: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djYV04Lszz3Xw1 for ; Fri, 02 Jan 2026 19:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767381720; h=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=2noZ3JFPai9GTrEAsVUqeL2clXREKJgXIR2Uf8N67p4=; b=GMFB21FotR7+anbTxF3j7okeGoHgCqxfl7da+E0qy+L+bvDquhice19XvhoPcA+jDzcVGx QdvsACWGIem+Jk7cDXp2jau9MsAAerHLDDOrIDJDGNFVIn4+20C+ESz9cP6zRqQMt8xeP8 ytB+mJA97Oikn+rvyv6GbzjvqqcvHbfrBjfqCHTzkcUg3Mk2lPTO1e8eaXK75uDNhEGMnV vUSvHQVEQtDEHfFrh2vDv6DZQbjLiAFOe1fwkyvx7MH0KNjrg5RJzN023bwgoIf7IHH2v7 U0XzaP0YAi8+VUtTIcz28590Mpo9JASlgpbWv5igEQzx5X1XcaB9JkbI5tCbfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767381720; h=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=2noZ3JFPai9GTrEAsVUqeL2clXREKJgXIR2Uf8N67p4=; b=ffXHbQ2fWoOM5da99CczbJu0bL8X5rQo17J9BZVKlZ3D8KlkIoVJzJrjARywHuArUxwrN7 HecEnKKADjOQu1pk4vXK/i/ebHFSP5FTIdKb2+8Rr7aZh+EgP6SwKYFuyX8ZnC5VAYMOei FySWtKN9vqG8JHxfttY8YAFKGyu7mSgNUqs1TPv+lAcnKAVwwUUB8FeRCEYyDCzFKvA+Vv SFPr4/+hC8Nr+OzkDWH5tGbJURQ71/9hhGq08xHrdJiuzj+hjGU969gktePbAxswHG07wb 6rRCLjTeySvm//URAn98gyeMWJPCOtYdISCjCSuXjM30ndeloyOFG/sSaB5nXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767381720; a=rsa-sha256; cv=none; b=VJeoIXqFPgZZTNVPTuFaUfLsMyVQDy0p6+fTkjntcQ8/wvv1q2ANcTLXL3NY2FRRRt3zce QllwFQ3LIuVDgxjf8vQX80PmKBvBVCKXcDsqdxUWx/OhNk/4AYr9mm39V20A15n09/Eoo8 8it+OmU37YxohCkRKUdNML73ANR7UJRL3Dmz3/FqfYp2oJjpf1CoIc+dXuBwO8P/+D0jn7 UN6WhuEv9jjj4P7SIdKDO2+Br5Ac2qFLm9p9E9vFkjJTgXZQujPX2GU5ZNXNaPn7MII4R0 9aNuzr/UTBm1LVmmnZnE+jj6AjZKWuKk9lzz5eJ5ojvOR5fakrK1Y7u8IRpvng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djYV03wdJzX74 for ; Fri, 02 Jan 2026 19:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 397c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 19:22:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Johannes Totz From: Warner Losh Subject: git: b52347f5b938 - main - jdec_dimm(4): add a reference to smbmsg(8) to jedec_dimm(4) and smbus(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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b52347f5b93822ee970b6cf4b5d893d60c3ceee8 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 19:22:00 +0000 Message-Id: <69581ad8.397c6.791ebc36@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b52347f5b93822ee970b6cf4b5d893d60c3ceee8 commit b52347f5b93822ee970b6cf4b5d893d60c3ceee8 Author: Johannes Totz AuthorDate: 2026-01-02 15:03:24 +0000 Commit: Warner Losh CommitDate: 2026-01-02 19:20:45 +0000 jdec_dimm(4): add a reference to smbmsg(8) to jedec_dimm(4) and smbus(4) Add a cross reference to smbmsg(8) which is useful for discovering local devices and difficult to find otherwise. PR: 247749 Reviewed by: pauamma@gundo.com Differential Review: https://reviews.freebsd.org/D40839 --- share/man/man4/jedec_dimm.4 | 6 +++++- share/man/man4/smbus.4 | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/share/man/man4/jedec_dimm.4 b/share/man/man4/jedec_dimm.4 index 30e89b0afd0c..db11931ee183 100644 --- a/share/man/man4/jedec_dimm.4 +++ b/share/man/man4/jedec_dimm.4 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 25, 2023 +.Dd January 2, 2026 .Dt JEDEC_DIMM 4 .Os .Sh NAME @@ -167,6 +167,10 @@ dev.jedec_dimm.6.serial: 0c4c46ad dev.jedec_dimm.6.temp: 43.1C dev.jedec_dimm.6.type: DDR4 .Ed +.Pp +You can use +.Xr smbmsg 8 +to probe for devices. .Sh COMPATIBILITY .Nm implements a superset of the functionality of the now-deleted diff --git a/share/man/man4/smbus.4 b/share/man/man4/smbus.4 index 250017defd36..c02cb4b3b176 100644 --- a/share/man/man4/smbus.4 +++ b/share/man/man4/smbus.4 @@ -60,7 +60,8 @@ between the internal SMB devices and external ACCESS bus devices. .Sh SEE ALSO .Xr iicbus 4 , .Xr iicsmb 4 , -.Xr smb 4 +.Xr smb 4 , +.Xr smbmsg 8 .Rs .%T The SMBus specification .%U http://www.smbus.org/specs/ From nobody Fri Jan 2 20:23: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 4djZrv1X3dz6MCCc for ; Fri, 02 Jan 2026 20:23: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djZrv0dn2z3jm3 for ; Fri, 02 Jan 2026 20:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767385407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hF86FyCzKxoatzUidsYaBOMXu1SKwhGi/3/L7Sx/2oQ=; b=R4i7lLCrTcMax4sqsreBZ53An8s/969MZyzi5wh8+w7FZS52md3alTgc13vKvHTyvEDtip uIg0Lkc0yTHSLhJNroBs1ToRt9Blj5tlYVh8V6VeLZpPX7adxtH4a6TKRrn1NzXgOoa6c9 axOR0v8bur5EI6zpDm7LlvFVr6G4BpflcGY6WCmVdpaDmV8EjPPVW8rwuXYajQzrij8nOy aZtOCnthv8W651eFcXREUFVxwuxSuFikiha0Nw6SDPOG9xHsHXTa7aEIQUoftbIfKu6fLQ p9VegI6eVcw6BsBqNGX5XhsEovOfPU6DtqNyXRgpoxbCSHUapPpqVVAAEo+PBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767385407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hF86FyCzKxoatzUidsYaBOMXu1SKwhGi/3/L7Sx/2oQ=; b=kUbu+7t029utgX1ozroTk6d/MAndjpbNM2sasxb6QSZlLLrmJ1AEuhzaXxuomTE3xoIqS1 7Bg5kt8bqeINXrYo2ajcRisuGihAs1ydkdPBIgXYaD+pPPChun4DcO4Ho5aKgDNcUZytfp VCSiLLqPahHvz904EQH2ty/lqUtCn4nDAFUrMcrzRzOO9yVsY/iBBZIoF1OBycM/75adut J4ufZABLb+O6SxcDEPpBGTpYRd9D006VaNvqH0aHEuzVWDR7TyQMkpPQqq6J80cMOC6/6v qJNobWu9Buq855l3W8Y8DCd4Bg5+GNoj1FoXQaqY0jHp4Z2jrDLcXdm1QJ9lYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767385407; a=rsa-sha256; cv=none; b=PS3im8DGXR0oqcftvYuNsMP0LYHliXzoOTNJWWwMi+G7+YpvJEs4B4mqfK75zus+a2WjeN fprWg+l2Uww3xPXrSa9Bg4x42ZY7+HxzreIXcvCfaNkBE2JKbfFs5YwsUz2heHkXRaCpGs p9+X8LRB4hweMqI5XKngQNxOq2P6UBUpohS2XP9LMAAuiLVUv/MdlorM0iEO6sWECwWPBh 7lxKUVgnvfucCHKUhBxxMZYlcQ6zYjBp4oaeiMI+N49ky0y8xbLlcNe92kwf5Q0dqbZXAu +H+CMBHiznyzTBQjftYgNDpD9pNlfUGeKeyqAZIU8iEDTLcKQ7FV8yefkGIvwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djZrv03S7zYnX for ; Fri, 02 Jan 2026 20:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fc68 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:23:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a6afa194f382 - main - Makefile.inc1: Indicate that no-clean builds are on 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6afa194f382e4f81277fdc7e81e229d3c8caf5f Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:23:26 +0000 Message-Id: <6958293e.3fc68.4a377a20@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a6afa194f382e4f81277fdc7e81e229d3c8caf5f commit a6afa194f382e4f81277fdc7e81e229d3c8caf5f Author: Ed Maste AuthorDate: 2026-01-02 20:16:00 +0000 Commit: Ed Maste CommitDate: 2026-01-02 20:16:00 +0000 Makefile.inc1: Indicate that no-clean builds are on by default PR: 292130 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 8966f96de9b9..a6181b78125b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2,7 +2,7 @@ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir -# -DNO_CLEAN do not clean at all +# -DNO_CLEAN do not clean at all (enabled by default) # -DDB_FROM_SRC use the user/group databases in src/etc instead of # the system database when installing. # -DNO_SHARE do not go into share subdir From nobody Fri Jan 2 20:32:57 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 4djb3s6XT9z6MD5R for ; Fri, 02 Jan 2026 20:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djb3s5vsvz3mHq for ; Fri, 02 Jan 2026 20:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767385977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8V4l5Y1S1gQiiaXiLIedMyhkkrvHd/h+cyGbwDFkbfw=; b=sBwBODCIEvE8YOJqy5T12Ovx1F+6mK3A1kzHo+1bOPNBG+DML7LfOqTEKHHDuAYVleTRt3 gFayTDiUvFV3XSSKi4Ya1uPZoyJK2S4wq5CZ8od/wcZFF73dVP5Go0NJCuPtXSxOvuLxBQ Ij+QFiWmwTdVROu1qyyBMUia11ieG4yu1Jcpl4lPY7AdBuANW4dpraVlDvLMdE/2IX7lUC GpbVmdpaoJ5/HxAPLihH+1Md+WLonxxWvMS0J6SQjhJpYmcbGr5eYzFbQH0I5VvYaPW5id 2+Ph5c0N1KVkWOUjwwlBrEZXswQR8F97p9GXxCK8xWioRoJ8sbvz9s70NVz5aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767385977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8V4l5Y1S1gQiiaXiLIedMyhkkrvHd/h+cyGbwDFkbfw=; b=VPa7CHq+AuWpd3KOFnZ+1+KV1Ertzwm8w5W7NdadGPmqNorSKp5ksl8/8qvxemFEYo6a3r R6TyEk2MGxM0FMdrpvtJcBEXCDYHbj79mPpT/JtdPmjJEIkRldF5rV//jfLE2geIgbCCpG 0hTEa31XpcGVf7XC4McnhepBTujRf2cYCJNuju6Ch9dMCrljQWjkjt9KXm/H94Dm70zLq4 kJ0fiic4JZbRLh0LOyQJLI45l2VOsmNjyg4ZvJ3ExF5yZ/YhwDuj6k92j7nsehdc1HaDXd aUI/H8w7M5YrVWqNakTVORW94dFCUNvh/m3DwlnYgQwkA7kFBsQKKRByXHFUgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767385977; a=rsa-sha256; cv=none; b=xo8zUZMjPSDM/mB9bsR/h5VE32GSN3jG+ivooy1kZrq9M6b2pniO/FLZHp3yZV3j7Cl+Me Rvr+1XJhvkxYbmf+zMFMKcTRAMMMjMZUfbeIAbxqP5M7CjVM9vW2Oe8vaejujfYCBmEBNs vpPhpoWUMXIqpP+8TTpEr/qzoYsjLM0ryeKInkcefqJ4fUNjBCJ8Rdk+P6L8AXlz1hqoWA KMvlA/lueTvO8ZqDfXDu9yTvRfNM0o894CU6hR4xT6tibY8lKUitP5g9GeIuBuOmJ0Wvuh pGG7PyrTiiylHEnsPlpg3d4AXxf0aF1jZX6y0BoYjt9ktN6a+EDr6m2cZI2lSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djb3s5SjMzZmk for ; Fri, 02 Jan 2026 20:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8c34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:32:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 62a7fdc13ab4 - main - bsd.sys.mk: suppress another gcc warning for libc++ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62a7fdc13ab45b48977424ef77bbc0f11f601e39 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:32:57 +0000 Message-Id: <69582b79.8c34.5ec67205@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=62a7fdc13ab45b48977424ef77bbc0f11f601e39 commit 62a7fdc13ab45b48977424ef77bbc0f11f601e39 Author: Dimitry Andric AuthorDate: 2026-01-02 20:29:05 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:32:36 +0000 bsd.sys.mk: suppress another gcc warning for libc++ Similar to base 63d1c3c43690, suppress -Wc++20-extensions for gcc. Otherwise libc++ headers will lead to many -Werror warnings, due to our use of -Wsystem-headers, which is not officially supported upstream. MFC after: 3 days --- share/mk/bsd.sys.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index c5f2c2bb783f..2757033f39b3 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -244,7 +244,8 @@ CWARNFLAGS+= -Wno-error=overflow .if ${COMPILER_VERSION} >= 120100 # These warnings are raised by headers in libc++ so are disabled # globally for all C++ -CXXWARNFLAGS+= -Wno-literal-suffix \ +CXXWARNFLAGS+= -Wno-literal-suffix \ + -Wno-c++20-extensions \ -Wno-error=unknown-pragmas .endif From nobody Sat Jan 3 02:53: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 4djlVh3n2nz6MkmK for ; Sat, 03 Jan 2026 02:53: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djlVh3Jbvz3vMn for ; Sat, 03 Jan 2026 02:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767408796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/PTDWIFJfH8atv0gTvA8u4ivrPAQhpo7K7Ny7d6HDlI=; b=yvMzVbykeeLZ6bOZnCSKCq6rgSnMNs1a4CCdiut/+QQjJtjWivet1RHbXZbUUdr63sdog0 e9BpK1H1eJSOi+8IUfAK4qVLlr84r14DDNEwCPqkBC737EGKINbhoPXOtnFZlX3oD/IHp+ adfk8sjbzR8RgmxhfyeAZi/mDIsXXRoud7FDB4ROB1sydKQV9D4H/OMDDSsx9TQuzD7eT/ 5x28W8I+S/IT0xh+zkVeQlexxbaTIgI/vKdcghh8Ohw0Obs+ZWfRBA28K5auwoD+3PX0ti 23UTtlSTbIVxODGsaZWeT4/RZaT/PumlkvT2PGkUvxSiOmUMzKzGwg09ZFa/uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767408796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/PTDWIFJfH8atv0gTvA8u4ivrPAQhpo7K7Ny7d6HDlI=; b=luqSi6ufLM2To9nUURZ0UXwV4XmO8Hz0ACFEI0z8Yywe5rVpVc6VtfSTliAQYIPQAG77EZ pqNi3LettZy+bYCNKQGi8rfml7R9SvdwlDWvcuwBcaB3/B+oz+51XVHghWjv/iJ6qrliSN DClGND6WcJ4MeIVAxYzE3VDhKcGpUy+qp0gnw+34dTSchs35r7pi3GCbF961chq6xRNJuh XuRWrvH0rI5HYbip9GvBhtZtDrKYiI1lZOFBUj9VbhH1iwiPCZqJ5iP1TfqPiETG8UN22O RXDmREYvwgdsS+Bgyow2N9jsf/PTyrsrlRZE4bsVNGFDgaRI2egnQwVBWi+KTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767408796; a=rsa-sha256; cv=none; b=k27Ns4UeYY5zENgFv3jyp6sRXCHpsUCOQQ+y3o+FS2OjKWxAMEpcOb34o8XmLNeSSyz/YX 2JqfRganIJKZbonFq/oBq8fK3T893A1Ya/kr3EwAD8vUg8mj/0hGHFQS7pXglyh2lqRDNr zZiuLrPHzQhNI97DaDlUesGO9qT9LgGUxlwSJpsktA8lPGFUdUED0Fh974ITJ6tSFVPYLf nrGfWu/24JXqyqREbQcpksVHFSsbT2CCVFj7iNlNeehL7TLqEa80Nea7DjUsngAViTmLTj HIbV/6BaY5T5eL5xbvi8DU9ezyWt/JfAFEDupb7dNzf97siOfLLG9RprXbvjzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djlVh1WSgzm76 for ; Sat, 03 Jan 2026 02:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4623e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 02:53:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 3e6e4e4a0d42 - main - hwpstate: add CPPC support for pstate driver on AMD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e6e4e4a0d42fa24f3b2a1c087e9ad25f9594081 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 02:53:16 +0000 Message-Id: <6958849c.4623e.7b53a822@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=3e6e4e4a0d42fa24f3b2a1c087e9ad25f9594081 commit 3e6e4e4a0d42fa24f3b2a1c087e9ad25f9594081 Author: ShengYi Hung AuthorDate: 2025-07-08 11:45:26 +0000 Commit: ShengYi Hung CommitDate: 2026-01-03 02:52:51 +0000 hwpstate: add CPPC support for pstate driver on AMD Implement CPPC interface for AMD Pstate Driver. This feature is only enabled when the CPUID shows it support CPPC. The CPPC is implemneted by the following steps: 1. Write MSR to enable it. 2. Read capability registert which indicates binary value of levels about lowest, best energy efficient, guarantee, and max performance. 3. Write request register with epp in energy balanced mode. And let CPU and firmware to enter autonomous mode. Also, create a sysctl handler to allow userspace to change epp value. In intel's hwpstate, The epp value can be in package level and core level. However, in AMD's one, there is only core level. Thus, to sync with the intel's code, we implement package level control in software and provide another sysctl (machdep.hwpstate_pkg_ctrl) to control it. Reviewed by: olce, khng Approved by: lwhsu (mentor) MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49587 --- sys/x86/cpufreq/hwpstate_amd.c | 361 ++++++++++++++++++++++++++++++++++++++--- sys/x86/include/specialreg.h | 1 + 2 files changed, 337 insertions(+), 25 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index fc948dc90a15..4395e43a219f 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -8,6 +8,7 @@ * Copyright (c) 2009 Michael Reifenberger * Copyright (c) 2009 Norikatsu Shigemura * Copyright (c) 2008-2009 Gen Otsuji + * Copyright (c) 2025 ShengYi Hung * * This code is depending on kern_cpu.c, est.c, powernow.c, p4tcc.c, smist.c * in various parts. The authors of these files are Nate Lawson, @@ -55,6 +56,7 @@ #include #include #include +#include #include #include @@ -74,6 +76,15 @@ #define MSR_AMD_10H_11H_STATUS 0xc0010063 #define MSR_AMD_10H_11H_CONFIG 0xc0010064 +#define MSR_AMD_CPPC_CAPS_1 0xc00102b0 +#define MSR_AMD_CPPC_ENABLE 0xc00102b1 +#define MSR_AMD_CPPC_CAPS_2 0xc00102b2 +#define MSR_AMD_CPPC_REQUEST 0xc00102b3 +#define MSR_AMD_CPPC_STATUS 0xc00102b4 + +#define MSR_AMD_PWR_ACC 0xc001007a +#define MSR_AMD_PWR_ACC_MX 0xc001007b + #define AMD_10H_11H_MAX_STATES 16 /* for MSR_AMD_10H_11H_LIMIT C001_0061 */ @@ -92,6 +103,23 @@ #define AMD_1AH_CUR_FID(msr) ((msr) & 0xFFF) +#define AMD_CPPC_CAPS_1_HIGH_PERF_BITS 0xff000000 +#define AMD_CPPC_CAPS_1_NOMINAL_PERF_BITS 0x00ff0000 +#define AMD_CPPC_CAPS_1_LOW_NONLIN_PERF_BITS 0x0000ff00 +#define AMD_CPPC_CAPS_1_LOW_PERF_BITS 0x000000ff + +#define AMD_CPPC_REQUEST_ENERGY_PERF_BITS 0xff000000 +#define AMD_CPPC_REQUEST_DES_PERF_BITS 0x00ff0000 +#define AMD_CPPC_REQUEST_MIN_PERF_BITS 0x0000ff00 +#define AMD_CPPC_REQUEST_MAX_PERF_BITS 0x000000ff + +#define HWP_AMD_CLASSNAME "hwpstate_amd" + +#define BITS_VALUE(bits, num) (((num) & (bits)) >> (ffsll((bits)) - 1)) +#define BITS_WITH_VALUE(bits, val) ((uintmax_t)(val) << (ffsll((bits)) - 1)) +#define SET_BITS_VALUE(var, bits, val) \ + ((var) = (var) & ~(bits) | BITS_WITH_VALUE((bits), (val))) + #define HWPSTATE_DEBUG(dev, msg...) \ do { \ if (hwpstate_verbose) \ @@ -106,10 +134,16 @@ struct hwpstate_setting { int pstate_id; /* P-State id */ }; +enum hwpstate_flags { + PSTATE_CPPC = 1, +}; + struct hwpstate_softc { device_t dev; - struct hwpstate_setting hwpstate_settings[AMD_10H_11H_MAX_STATES]; + struct hwpstate_setting hwpstate_settings[AMD_10H_11H_MAX_STATES]; int cfnum; + uint32_t flags; + uint64_t req; }; static void hwpstate_identify(driver_t *driver, device_t parent); @@ -140,6 +174,11 @@ SYSCTL_BOOL(_debug, OID_AUTO, hwpstate_pstate_limit, CTLFLAG_RWTUN, "If enabled (1), limit administrative control of P-states to the value in " "CurPstateLimit"); +static bool hwpstate_pkg_ctrl_enable = true; +SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_pkg_ctrl, CTLFLAG_RDTUN, + &hwpstate_pkg_ctrl_enable, 0, + "Set 1 (default) to enable package-level control, 0 to disable"); + static device_method_t hwpstate_methods[] = { /* Device interface */ DEVMETHOD(device_identify, hwpstate_identify), @@ -159,8 +198,154 @@ static device_method_t hwpstate_methods[] = { {0, 0} }; +static int +amdhwp_dump_sysctl_handler(SYSCTL_HANDLER_ARGS) +{ + device_t dev; + struct pcpu *pc; + struct sbuf *sb; + struct hwpstate_softc *sc; + uint64_t data; + int ret; + + sc = (struct hwpstate_softc *)arg1; + dev = sc->dev; + + pc = cpu_get_pcpu(dev); + if (pc == NULL) + return (ENXIO); + + sb = sbuf_new(NULL, NULL, 1024, SBUF_FIXEDLEN | SBUF_INCLUDENUL); + sbuf_putc(sb, '\n'); + thread_lock(curthread); + sched_bind(curthread, pc->pc_cpuid); + thread_unlock(curthread); + + rdmsr_safe(MSR_AMD_CPPC_ENABLE, &data); + sbuf_printf(sb, "CPU%d: HWP %sabled\n", pc->pc_cpuid, + ((data & 1) ? "En" : "Dis")); + + if (data == 0) { + ret = 0; + goto out; + } + + rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &data); + sbuf_printf(sb, "\tHighest Performance: %03ju\n", + BITS_VALUE(AMD_CPPC_CAPS_1_HIGH_PERF_BITS, data)); + sbuf_printf(sb, "\tGuaranteed Performance: %03ju\n", + BITS_VALUE(AMD_CPPC_CAPS_1_NOMINAL_PERF_BITS, data)); + sbuf_printf(sb, "\tEfficient Performance: %03ju\n", + BITS_VALUE(AMD_CPPC_CAPS_1_LOW_NONLIN_PERF_BITS, data)); + sbuf_printf(sb, "\tLowest Performance: %03ju\n", + BITS_VALUE(AMD_CPPC_CAPS_1_LOW_PERF_BITS, data)); + sbuf_putc(sb, '\n'); + + rdmsr_safe(MSR_AMD_CPPC_REQUEST, &data); + +#define pkg_print(name, offset) \ + do { \ + sbuf_printf(sb, "\t%s: %03u\n", name, \ + (unsigned)(data >> offset) & 0xff); \ + } while (0) + + pkg_print("Requested Efficiency Performance Preference", 24); + pkg_print("Requested Desired Performance", 16); + pkg_print("Requested Maximum Performance", 8); + pkg_print("Requested Minimum Performance", 0); +#undef pkg_print + + sbuf_putc(sb, '\n'); + +out: + thread_lock(curthread); + sched_unbind(curthread); + thread_unlock(curthread); + + ret = sbuf_finish(sb); + if (ret == 0) + ret = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb)); + sbuf_delete(sb); + + return (ret); +} + +static bool +sysctl_epp_select_per_core(const device_t hwp_device, uint32_t val) +{ + struct hwpstate_softc *sc; + bool success = true; + int ret, cpuid; + + cpuid = cpu_get_pcpu(hwp_device)->pc_cpuid; + thread_lock(curthread); + sched_bind(curthread, cpuid); + thread_unlock(curthread); + sc = device_get_softc(hwp_device); + if (BITS_VALUE(AMD_CPPC_REQUEST_ENERGY_PERF_BITS, sc->req) == val) + goto end; + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_ENERGY_PERF_BITS, val); + ret = wrmsr_safe(MSR_AMD_CPPC_REQUEST, sc->req); + if (ret != 0) { + success = false; + device_printf(hwp_device, "Failed to set EPP to %u", val); + goto end; + } + +end: + thread_lock(curthread); + sched_unbind(curthread); + thread_unlock(curthread); + + return (success); +} + +static int +sysctl_epp_select(SYSCTL_HANDLER_ARGS) +{ + device_t dev, hwp_dev; + struct hwpstate_softc *sc; + const uint32_t max_energy_perf = + BITS_VALUE(AMD_CPPC_REQUEST_ENERGY_PERF_BITS, (uint64_t)-1); + devclass_t dc; + uint32_t val; + int ret = 0; + int cpu; + + dev = oidp->oid_arg1; + sc = device_get_softc(dev); + + if (!(sc->flags & PSTATE_CPPC)) + return (ENODEV); + + val = BITS_VALUE(AMD_CPPC_REQUEST_ENERGY_PERF_BITS, sc->req) * 100 / + max_energy_perf; + ret = sysctl_handle_int(oidp, &val, 0, req); + if (ret != 0 || req->newptr == NULL) + goto end; + if (val > 100) { + ret = EINVAL; + goto end; + } + val = (val * max_energy_perf) / 100; + + if (hwpstate_pkg_ctrl_enable) { + dc = devclass_find(HWP_AMD_CLASSNAME); + KASSERT(dc != NULL, + (HWP_AMD_CLASSNAME ": devclass cannot be null")); + CPU_FOREACH(cpu) { + hwp_dev = devclass_get_device(dc, cpu); + sysctl_epp_select_per_core(hwp_dev, val); + } + } else + sysctl_epp_select_per_core(dev, val); + +end: + return (ret); +} + static driver_t hwpstate_driver = { - "hwpstate", + HWP_AMD_CLASSNAME, hwpstate_methods, sizeof(struct hwpstate_softc), }; @@ -269,6 +454,8 @@ hwpstate_set(device_t dev, const struct cf_setting *cf) if (cf == NULL) return (EINVAL); sc = device_get_softc(dev); + if (sc->flags & PSTATE_CPPC) + return (EOPNOTSUPP); set = sc->hwpstate_settings; for (i = 0; i < sc->cfnum; i++) if (CPUFREQ_CMP(cf->freq, set[i].freq)) @@ -284,21 +471,38 @@ hwpstate_get(device_t dev, struct cf_setting *cf) { struct hwpstate_softc *sc; struct hwpstate_setting set; + struct pcpu *pc; uint64_t msr; + uint64_t rate; + int ret; sc = device_get_softc(dev); if (cf == NULL) return (EINVAL); - msr = rdmsr(MSR_AMD_10H_11H_STATUS); - if (msr >= sc->cfnum) - return (EINVAL); - set = sc->hwpstate_settings[msr]; - cf->freq = set.freq; - cf->volts = set.volts; - cf->power = set.power; - cf->lat = set.lat; - cf->dev = dev; + if (sc->flags & PSTATE_CPPC) { + pc = cpu_get_pcpu(dev); + if (pc == NULL) + return (ENXIO); + + memset(cf, CPUFREQ_VAL_UNKNOWN, sizeof(*cf)); + cf->dev = dev; + if ((ret = cpu_est_clockrate(pc->pc_cpuid, &rate))) + return (ret); + cf->freq = rate / 1000000; + } else { + msr = rdmsr(MSR_AMD_10H_11H_STATUS); + if (msr >= sc->cfnum) + return (EINVAL); + set = sc->hwpstate_settings[msr]; + + cf->freq = set.freq; + cf->volts = set.volts; + cf->power = set.power; + cf->lat = set.lat; + cf->dev = dev; + } + return (0); } @@ -312,6 +516,9 @@ hwpstate_settings(device_t dev, struct cf_setting *sets, int *count) if (sets == NULL || count == NULL) return (EINVAL); sc = device_get_softc(dev); + if (sc->flags & PSTATE_CPPC) + return (EOPNOTSUPP); + if (*count < sc->cfnum) return (E2BIG); for (i = 0; i < sc->cfnum; i++, sets++) { @@ -330,19 +537,24 @@ hwpstate_settings(device_t dev, struct cf_setting *sets, int *count) static int hwpstate_type(device_t dev, int *type) { + struct hwpstate_softc *sc; if (type == NULL) return (EINVAL); + sc = device_get_softc(dev); *type = CPUFREQ_TYPE_ABSOLUTE; + *type |= sc->flags & PSTATE_CPPC ? + CPUFREQ_FLAG_INFO_ONLY | CPUFREQ_FLAG_UNCACHED : + 0; return (0); } static void hwpstate_identify(driver_t *driver, device_t parent) { - - if (device_find_child(parent, "hwpstate", DEVICE_UNIT_ANY) != NULL) + if (device_find_child(parent, HWP_AMD_CLASSNAME, DEVICE_UNIT_ANY) != + NULL) return; if ((cpu_vendor_id != CPU_VENDOR_AMD || CPUID_TO_FAMILY(cpu_id) < 0x10) && @@ -357,14 +569,82 @@ hwpstate_identify(driver_t *driver, device_t parent) return; } - if (resource_disabled("hwpstate", 0)) + if (resource_disabled(HWP_AMD_CLASSNAME, 0)) return; - if (BUS_ADD_CHILD(parent, 10, "hwpstate", device_get_unit(parent)) - == NULL) + if (BUS_ADD_CHILD(parent, 10, HWP_AMD_CLASSNAME, + device_get_unit(parent)) == NULL) device_printf(parent, "hwpstate: add child failed\n"); } +static int +amd_set_autonomous_hwp(struct hwpstate_softc *sc) +{ + struct pcpu *pc; + device_t dev; + uint64_t caps; + int ret; + + dev = sc->dev; + pc = cpu_get_pcpu(dev); + if (pc == NULL) + return (ENXIO); + + thread_lock(curthread); + sched_bind(curthread, pc->pc_cpuid); + thread_unlock(curthread); + + ret = wrmsr_safe(MSR_AMD_CPPC_ENABLE, 1); + if (ret != 0) { + device_printf(dev, "Failed to enable cppc for cpu%d (%d)\n", + pc->pc_cpuid, ret); + goto out; + } + + ret = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &sc->req); + if (ret != 0) { + device_printf(dev, + "Failed to read CPPC request MSR for cpu%d (%d)\n", + pc->pc_cpuid, ret); + goto out; + } + + ret = rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &caps); + if (ret != 0) { + device_printf(dev, + "Failed to read HWP capabilities MSR for cpu%d (%d)\n", + pc->pc_cpuid, ret); + goto out; + } + + /* + * In Intel's reference manual, the default value of EPP is 0x80u which + * is the balanced mode. For consistency, we set the same value in AMD's + * CPPC driver. + */ + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_ENERGY_PERF_BITS, 0x80); + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_MIN_PERF_BITS, + BITS_VALUE(AMD_CPPC_CAPS_1_LOW_PERF_BITS, caps)); + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_MAX_PERF_BITS, + BITS_VALUE(AMD_CPPC_CAPS_1_HIGH_PERF_BITS, caps)); + /* enable autonomous mode by setting desired performance to 0 */ + SET_BITS_VALUE(sc->req, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); + + ret = wrmsr_safe(MSR_AMD_CPPC_REQUEST, sc->req); + if (ret) { + device_printf(dev, + "Failed to setup autonomous HWP for cpu%d\n", + pc->pc_cpuid); + goto out; + } +out: + thread_lock(curthread); + sched_unbind(curthread); + thread_unlock(curthread); + + return (ret); +} + static int hwpstate_probe(device_t dev) { @@ -373,15 +653,25 @@ hwpstate_probe(device_t dev) uint64_t msr; int error, type; - /* - * Only hwpstate0. - * It goes well with acpi_throttle. - */ - if (device_get_unit(dev) != 0) - return (ENXIO); - sc = device_get_softc(dev); + + if (amd_extended_feature_extensions & AMDFEID_CPPC) { + sc->flags |= PSTATE_CPPC; + device_set_desc(dev, + "AMD Collaborative Processor Performance Control (CPPC)"); + } else { + /* + * No CPPC support. Only keep hwpstate0, it goes well with + * acpi_throttle. + */ + if (device_get_unit(dev) != 0) + return (ENXIO); + device_set_desc(dev, "Cool`n'Quiet 2.0"); + } + sc->dev = dev; + if (sc->flags & PSTATE_CPPC) + return (0); /* * Check if acpi_perf has INFO only flag. @@ -433,14 +723,32 @@ hwpstate_probe(device_t dev) if (error) return (error); - device_set_desc(dev, "Cool`n'Quiet 2.0"); return (0); } static int hwpstate_attach(device_t dev) { + struct hwpstate_softc *sc; + int res; + sc = device_get_softc(dev); + if (sc->flags & PSTATE_CPPC) { + if ((res = amd_set_autonomous_hwp(sc))) + return res; + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_STATIC_CHILDREN(_debug), OID_AUTO, + device_get_nameunit(dev), + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_SKIP | CTLFLAG_MPSAFE, + sc, 0, amdhwp_dump_sysctl_handler, "A", ""); + + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "epp", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, dev, 0, + sysctl_epp_select, "I", + "Efficiency/Performance Preference " + "(range from 0, most performant, through 100, most efficient)"); + } return (cpufreq_register(dev)); } @@ -584,8 +892,11 @@ out: static int hwpstate_detach(device_t dev) { + struct hwpstate_softc *sc; - hwpstate_goto_pstate(dev, 0); + sc = device_get_softc(dev); + if (!(sc->flags & PSTATE_CPPC)) + hwpstate_goto_pstate(dev, 0); return (cpufreq_unregister(dev)); } diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index e9dde5c3b46a..3e5f598cd82a 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -418,6 +418,7 @@ #define AMDPM_HW_PSTATE 0x00000080 #define AMDPM_TSC_INVARIANT 0x00000100 #define AMDPM_CPB 0x00000200 +#define AMDPM_PWR_REPORT 0x00001000 /* * AMD extended function 8000_0008h ebx info (amd_extended_feature_extensions) From nobody Sat Jan 3 02:57: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 4djlbV4dQrz6MklB for ; Sat, 03 Jan 2026 02:57: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djlbV44L1z3wY9 for ; Sat, 03 Jan 2026 02:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767409046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fAbFGC9sIGT4UIZH+ex0ovy51MRr2mT3FxEK6AGkevU=; b=ZtZXCNtoF/inx+S1wFwXQpEWG5Y/9Uw2duMyR3r5QZdbp8DLNlQ+FzN7JtWRE1oIyeaCsl GdePgZ0lFenObFI0gF5ihoX3xpyKP1ucfAMQHGf3D8wmaHZ4glT9QzSfk1sVkcoC3esHAh 3Z2kw3jamtGZVS36Rv8ch+UDR/BBw8QMDwB1tGzgB7EqBRGvhhF71ao8YuQsnu6Q+eqlwQ ifzwOWNV+WsU1A42XpazLPTu8Wq+vbcaVnMRtwGYRUEsGLqQYLGn47+StELbCkSzjniMvl nNSwLE/prF3Jto0AbPBzwIpKWf1Cl29NFITB319JGTxc2WreDGUF5XtQ5ukqNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767409046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fAbFGC9sIGT4UIZH+ex0ovy51MRr2mT3FxEK6AGkevU=; b=rUPPbZogeDTjc7wT+pWw65tyFGswNHyj/g7zPcO8JVOeHbjv6xPy/ij8kWq9Q2Kqdlz/rO xsHN3wOglTg8WLkaSWt8noG8DIC3kvp7DRlfGh9ou0AJ1KJVpj5FPTiNdGrtqNAYrGi85G M4o/PHUWWkQS1ZwfIof9xd9xo2d+MWvyCOY6d3VfO3M+mU9xHmukTCIzDg4HtPglVrsOMs asoJT4PpXaEI93Mow2vGdmZeQCKyreshMQUYxnhYfccDoeMyU88EM52bwS34VhVLdOmKi9 0Em55WKCMWPtsaJCrHbpzLHxePuI1dbMIqWGlp2qeqyDSqMirSAieShwwTwN7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767409046; a=rsa-sha256; cv=none; b=c5xbH1GOUhxlyhR8+5NoPKubht+fk0VHZfU+C41PDVghP++fFvVqSjfn+orlCDjIdLjb5u 5SFjF4trGM8XmFwexJ9r55NS79H3PGG82Pp4P0gVB5kp4/4gVcT3RcDrMzIaTTmNqhVNTS wePn2T17sQ5YNE/Tgw61krMafCgBSLR455X8kNzgm/4yAP3YI4ueITh/rMWPcEDlgFKkdU 7PSHhxNgJlJHgKklU4zBoB2nPewrUNO8a8qa1UaRaXWl90obpbvKn3SgpFB9eUAYognlLG VCDFezarAGo+DS/rPWZT9x/6AkBdSTv2GBrOB2CzKYEg3UQWF3IaXpSnaZzAjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djlbV3MWnzmZQ for ; Sat, 03 Jan 2026 02:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46e51 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 02:57:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 2e92aeede85c - main - bridge: Allow BRDGSIFVLANSET without IFBRF_VLANFILTER List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e92aeede85c8986bd6f4dde65d2ac2449eccf51 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 02:57:26 +0000 Message-Id: <69588596.46e51.576d9e8f@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2e92aeede85c8986bd6f4dde65d2ac2449eccf51 commit 2e92aeede85c8986bd6f4dde65d2ac2449eccf51 Author: Lexi Winter AuthorDate: 2026-01-03 01:13:22 +0000 Commit: Lexi Winter CommitDate: 2026-01-03 02:57:16 +0000 bridge: Allow BRDGSIFVLANSET without IFBRF_VLANFILTER Currently, we disallow BRDGSIFVLANSET when IFBRF_VLANFILTER is disabled. There's no particular reason to do this, and it causes some undesirable behaviour such as not being able to remove the tagged config on a member after disabling vlanfilter on the bridge. Remove the restriction so BRDGSIFVLANSET is always accepted. PR: 292019 MFC after: 1 week Reviewed by: zlei, p.mousavizadeh_protonmail.com Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D54435 --- sys/net/if_bridge.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 9a468a8eb462..5bdd8613245e 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1990,9 +1990,6 @@ bridge_ioctl_sifvlanset(struct bridge_softc *sc, void *arg) struct ifbif_vlan_req *req = arg; struct bridge_iflist *bif; - if ((sc->sc_flags & IFBRF_VLANFILTER) == 0) - return (EXTERROR(EINVAL, "VLAN filtering not enabled")); - bif = bridge_lookup_member(sc, req->bv_ifname); if (bif == NULL) return (EXTERROR(ENOENT, "Interface is not a bridge member")); From nobody Sat Jan 3 03:35: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 4djmRx2q31z6Mnqv for ; Sat, 03 Jan 2026 03:35:57 +0000 (UTC) (envelope-from list@zhmds.com) Received: from 6.84.215.35.bc.googleusercontent.com (6.84.215.35.bc.googleusercontent.com [35.215.84.6]) (using TLSv1.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 4djmRv4y6Pz4284 for ; Sat, 03 Jan 2026 03:35:55 +0000 (UTC) (envelope-from list@zhmds.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=zhmds.com header.s=dkim header.b=KHjZqfJE; dmarc=none; spf=pass (mx1.freebsd.org: domain of list@zhmds.com designates 35.215.84.6 as permitted sender) smtp.mailfrom=list@zhmds.com DKIM-Signature: a=rsa-sha256; b=KHjZqfJEbqKG8L4lUkcEioZHrEgAchvcVv43Yc6LGn1uJq4DoWDRxUCB3QUcSRRfomoiOjGJp+oBPGb2lFEFe71gufCuA7VN8ocHVCyKrE8UgB3OS+wBkzrXeGCgV1/Pi8Yq4NnHeNVXLCoZjowJY1quHosAsJuV9Kz4AlpPgIs=; s=dkim; d=zhmds.com; v=1; bh=0HTpWHg2I5ZDnRV8z6AfMwP0OC4kw9eUovx+GFFW89U=; h=from : reply-to : subject : date : to : cc : resent-date : resent-from : resent-sender : resent-to : resent-cc : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; Message-ID: <86092967.57091.1767411346885@ins-8ycdqo8koza18zc0jsowu.us-west2-b.internal> Received: from 162.158.167.132 (EHLO localhost) ([162.158.167.132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256) by ins-8ycdqo8koza18zc0jsowu (Ju-Mail SMTP Server) with ESMTPA ID 5a7b7b73 for ; Sat, 03 Jan 2026 03:35:45 +0000 (UTC) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Date: Sat, 03 Jan 2026 11:35:45 +0800 From: list@zhmds.com To: dev-commits-src-main@freebsd.org Subject: Final Chance: Genuine Windows Keys for ONLY $0.99! Limited Stock, Gone Forever!dev-commits-src-main Reply-To: jiang182838@gmail.com Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=UTF-8 X-Spamd-Bar: - X-Spamd-Result: default: False [-1.50 / 15.00]; SUBJECT_HAS_CURRENCY(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:35.0.0.0/8]; R_DKIM_ALLOW(-0.20)[zhmds.com:s=dkim]; MIME_HTML_ONLY(0.20)[]; ONCE_RECEIVED(0.20)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:~]; REPLYTO_DN_EQ_FROM_DN(0.00)[]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; SUBJECT_HAS_EXCLAIM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[zhmds.com]; REPLYTO_DOM_NEQ_TO_DOM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MISSING_XM_UA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[35.215.84.6:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_DN_NONE(0.00)[]; DKIM_TRACE(0.00)[zhmds.com:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_NO_DN(0.00)[]; ASN(0.00)[asn:15169, ipnet:35.215.64.0/18, country:US]; FREEMAIL_REPLYTO(0.00)[gmail.com]; RCVD_COUNT_ONE(0.00)[1]; HAS_REPLYTO(0.00)[jiang182838@gmail.com] X-Rspamd-Queue-Id: 4djmRv4y6Pz4284

 

3D"Microsoft

Best 50%= Off Deals on Microsoft Office & Windows Keys

Activate = your Windows or Office instantly with genuine keys. Safe, fast, and guarant= eed!

Windows S= erver Products

Windows 11 Pro – 1 PC= License Key

$12.99 0.99$

View Deal

Windows 10 Pro – 1 PC= License Key

$12.99 $0.99

View Deal

Windows 11 Home – 1 P= C License Key

$16.02 $0.99

View Deal

Win 10 Home - 1 PC

$18.15 $0.99

View Deal

Windows E= nterprise Products

Win 11 Enterprise LTSC 2024= - 1 PC

$69.99 $34.99

View Deal

Win 10 Enterprise 2021 LTSC= - 1 PC

$25.61 $22.25

View Deal

Win 10 Enterprise 2019 LTSC= - 1 PC

$38.27 $19.10

View Deal

Win Server 2025 Remote Desk= top - 50 Device CALs

$59.99 $20.99

View Deal

Office Pr= oducts

Office 2021 Pro Plus - 1 PC=

$49.99 $29.99

View Deal

Office 2019 Pro Plus - 1 PC=

$60.66 $24.26

View Deal

Office 2016 Pro Plus - 1 PC=

$51.20 $26.48

View Deal

Office 365 New Account - 1 = Year

$12.50 $5.80

View Deal

Microsoft= Access

Access 2024 - 1 PC

$67.87 $34.75

View Deal

Access 2021 - 1 PC

$44.71 $22.35

View Deal

Access 2016 - 1 PC

$40.99 $20.49

View Deal

Visio Pro 2021 - 1 PC

$20.46 $9.23

View Deal

Windows H= ome Products

Win 10 Home - 1 PC

$9.22 $4.61

View Deal

Win 11 Home - 1 PC

$10.50 $5.50

View Deal

Win 10 Pro - 1 PC

$18.35 $18.35

View Deal

Win 11 Pro - 1 PC

$10.50 $5.50

View Deal
   
© 2025 OfficeKeyDeals | Genuine Activation= Keys | 50% Off Sale
From nobody Sat Jan 3 06:11: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 4djqv957Vqz6MyN1 for ; Sat, 03 Jan 2026 06:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djqv93mGQz4KbR for ; Sat, 03 Jan 2026 06:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767420677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uAzCS4cyn8OhFmfMH2Kw2wnctpizZKhbG3yohTA1Xco=; b=ft2Q2VO9rnyVXrK6UNJ7yxFY1nQvDQMwNT5iU0jBWMMQsr5RyXNh1sfOcFgGcjChrRptZ/ AJLApKdh7/3H2hep86pfYU/rnqiR+BZNS/61ZOjvD2RYpsZh6CVd8t7v1PWIfs6+ZKT2bu R/IayzNamrnMmlpGFrl4AWvgQvX4dE2oE1rPuA56r9M1kyPpJh9sKpreSc1JmOul2qV9oM Jv5Nxc6yTOnRULQtersz0PwAwOcLP97bXjD4CcPqUzt/CfJEoivITkgvBbLj7ysoSBHtaS fHbW05MAn+6T2HATSua9U5NeTFNi7kPkWiCyIbceyjw7qtVDr5MHO8ksKUewhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767420677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uAzCS4cyn8OhFmfMH2Kw2wnctpizZKhbG3yohTA1Xco=; b=QKoV+d3GAHujjzq5ZUP7TH/bv2nJv2cMT4IDHhMSmI99d2F5PS/5yPrR8S/7MUgtbMEY2d vV9JSVqO7RUcpwAa5FuxYtS0yYMi1RbRUTlC2jnwCpm4ODNwpkTGDzpbosr5VnYySeczim iJJZTEoRxOvFrK2Ft3yCgBlhlHnUNvmioMb2ZcMkRL/9OUJRwPksK1TmujX8cezqFk8KWL 068K+jgeF7oaZGqv3Oxg1ISfZTxSm9z2zSZJRpWaB4LuQ33M9pkU4FIxnUdRoL4hv9c2id a3FmmFgeFGk0iOX4uvPAt3Itj31QQzLWYCN0I+Vb3gDEis8cHUExmvj0MeAoWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767420677; a=rsa-sha256; cv=none; b=FiHwC5gdJ36z3Pdik8gHYdnu3fUVBoF4nOWLsN0hbinHzLm9vMXUXgzWN8qBdFFRLYAev/ oLZ5/OG47m9stpg0/CJxqCPw6H41qLeV5/nvMRIdkRJYEbETij2y3DSCAb9zHWgFT+A14/ Ate5phVmLvHJRS81KzlcP+Rb7Zw0mnXYdj0UxbQ5aUQDADjoshRo/H6XCMKHXHQLuWRnmF z9LLUALHcNQsX5iEATl+R6CLg4P4R7i1IpfDeEqjuaGD7kp5xWo7oLK5bw9Bl1OtCgqWV+ +2GUTEuP6ttvR781Pebg+HvrQdqaA55ixQg79fh1yRZwpXFWVk8y9RRLsk2s7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djqv936wvzs5V for ; Sat, 03 Jan 2026 06:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32dae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 06:11:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 3642ba2a9840 - main - hwpstate_amd: Fix compile error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3642ba2a9840734d83dd77ca4c1aa0ecb3bfe879 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 06:11:17 +0000 Message-Id: <6958b305.32dae.2c56e54e@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=3642ba2a9840734d83dd77ca4c1aa0ecb3bfe879 commit 3642ba2a9840734d83dd77ca4c1aa0ecb3bfe879 Author: ShengYi Hung AuthorDate: 2026-01-03 05:07:15 +0000 Commit: ShengYi Hung CommitDate: 2026-01-03 06:09:48 +0000 hwpstate_amd: Fix compile error Add parentheses between OR and AND operator to pass the compiler check. Approved by: lwhsu (mentor) Fixes: 3e6e4e4a0d42 ("hwpstate: add CPPC support for pstate driver on AMD") MFC aftert: 2 weeks Differential Revision: https://reviews.freebsd.org/D54465 --- sys/x86/cpufreq/hwpstate_amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 4395e43a219f..ce0e0f6dd47a 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -118,7 +118,7 @@ #define BITS_VALUE(bits, num) (((num) & (bits)) >> (ffsll((bits)) - 1)) #define BITS_WITH_VALUE(bits, val) ((uintmax_t)(val) << (ffsll((bits)) - 1)) #define SET_BITS_VALUE(var, bits, val) \ - ((var) = (var) & ~(bits) | BITS_WITH_VALUE((bits), (val))) + ((var) = ((var) & ~(bits)) | BITS_WITH_VALUE((bits), (val))) #define HWPSTATE_DEBUG(dev, msg...) \ do { \ From nobody Sat Jan 3 09:10: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 4djvt741b5z6LxJJ for ; Sat, 03 Jan 2026 09:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djvt73Rvkz3JSY for ; Sat, 03 Jan 2026 09:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pygJJMg/nIlaU2SGs9OHxu1MfIcKLwSo2+1bbEaZ+vA=; b=G7ZQhM8q+Rw6ftS3PVdy0zy+iZXhFWS5ZR4xhNCarbY9RTT/0k14MDCmdtqmMcYO91THNi f1muKQpk95qZl1b05mk3t8HjMq9gsGwhGrICtdAx7OCFRG1KlY9muPvGceo8DWKLtYOG6e q02+mPqOE2AUUL12guNLDYyUeVBOU7bdWthiAxZLBoqxxfrngtLiVXKducTY7iJ+QD3qPc z0Ok1stl723JE8w1nNoIHmjwisFzrFJSjlT51wbaI6qS3DpTe5wzff8lovygHkyAgG0ZtH nDwFs3m7DkC28AcPowz++Y4epNnO5bPd/2I/K52KklHn+8ijoY7hePBdab8lJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pygJJMg/nIlaU2SGs9OHxu1MfIcKLwSo2+1bbEaZ+vA=; b=mV6z2DSBrvxga9DvaPCOir0xZd1Ik1j431vge8zG6X5beQGNz/is21sdRuUR4p7wLV45JI qo6v4bqDrYqwRUNQQlMvotpzUOWRHgKT3t8ybR7JjReicop0KvA+2LVG5jYI8wYubuq31E tg3TCllRPzDLn0CcUnS53Cfyc/VzKSX4oq/vwv+TFp1MLLkALQbf/+oQU2GBjtMaRHScCs 5PsPxQeSL30cMQmIpbtLMABjj93PMy2zcOTGVze0/LyaHzyqXtm8/rLw3AILTP9BGJ2+6R ztJ2f72Ec0fwzL+hP5TWFbsP8fD+OOO5I978TduxY9lJil8VDYSYNiOEIPzEfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767431439; a=rsa-sha256; cv=none; b=gOAqA4hvYCB994wax5zQT7qbImm3KtctVVlBvRELtVkyUixTbkGz7pxS4b3QihXgaqPlVr HDqO1oXMJZqM3k1iVf29k8gisYwJy4TrZYjLeRzDKUVIWkI4SvqPRi5OHklDBREvKvmqtR 6IF+6SdyZ4hfb7LKLFd1edjnrLJB4TCUiIzcaGqgFgF3or7bKy2AE0wkXCMim7BlHN5kb8 epIqLI6uIfIiNtezEm7qU4PzswfIiMpPgNZ0BDYpixwAE1nZ9vsDlPNOS/Veax28Ps/OGQ KVRS+mQAC8EFS65ixEzO2zYItgb76DQWCX7qUl4pgrRpHh+GNieGrDdIXIjUCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djvt72sV5zxQw for ; Sat, 03 Jan 2026 09:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 98dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 09:10:39 +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: f86148d2777d - main - linuxkpi: Correct kstrtobool List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: f86148d2777d4d7985ed8f4ae957c41c44bd2484 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 09:10:39 +0000 Message-Id: <6958dd0f.98dc.3f85f227@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f86148d2777d4d7985ed8f4ae957c41c44bd2484 commit f86148d2777d4d7985ed8f4ae957c41c44bd2484 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:09:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 09:10:22 +0000 linuxkpi: Correct kstrtobool Implement the exact same logic as in Linux: * Accept 'e', 't', 'y', '1', "on" for true. * Accept 'd', 'f', 'n', '0', "of" for false. * Disregard any characters beyond that. * Check that the string is not null, but don't check the result pointer. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: bz, emaste Differential Revision: https://reviews.freebsd.org/D54451 --- sys/compat/linuxkpi/common/include/linux/kstrtox.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kstrtox.h b/sys/compat/linuxkpi/common/include/linux/kstrtox.h index 6a145c409038..05bf94dd375d 100644 --- a/sys/compat/linuxkpi/common/include/linux/kstrtox.h +++ b/sys/compat/linuxkpi/common/include/linux/kstrtox.h @@ -249,22 +249,16 @@ kstrtoull(const char *cp, unsigned int base, unsigned long long *res) static inline int kstrtobool(const char *s, bool *res) { - size_t len; - - if (s == NULL || (len = strlen(s)) == 0 || res == NULL) + if (s == NULL || *s == '\0') return (-EINVAL); - /* skip newline character, if any */ - if (s[len - 1] == '\n') - len--; - - if (len == 1 && strchr("yY1", s[0]) != NULL) + if (strchr("eEtTyY1", s[0]) != NULL) *res = true; - else if (len == 1 && strchr("nN0", s[0]) != NULL) + else if (strchr("dDfFnN0", s[0]) != NULL) *res = false; - else if (strncasecmp("on", s, len) == 0) + else if (strncasecmp("on", s, 2) == 0) *res = true; - else if (strncasecmp("off", s, len) == 0) + else if (strncasecmp("of", s, 2) == 0) *res = false; else return (-EINVAL); From nobody Sat Jan 3 09:10: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 4djvt85X8Bz6LxCq for ; Sat, 03 Jan 2026 09:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djvt83ty0z3Jgf for ; Sat, 03 Jan 2026 09:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qzvfDxAR0hgkbJeKIH1YA1FElGb/F9iK1rPcCgNUh8Q=; b=jPJYRWZUiyYnaBiSfzbPP5kWHtNcV1vkc/iuCxEKYUtE+LsBWbLdmvgb4VmvChvcV9lH0u QpgoWXd4ky6oEcIJuw6il3MHlbRrAfDGjMGbyblcdhN4pW577dSchfuQFpUwkbohuBIuAG TNh6dbWsXe7P16q1u+/9ATZBMCzrWSrT/IoRUoymCXVGMQBDEASLOdaq1QKINWda0klFeu zAv4cDYSLYKtQ0Xm65O5t9y9ejPMetd/jHsbksUMX2GIqVKf+zHbUy6Ile/xX+gSOvQS0x ey3rLQmMp80VpHJIcoYoDm4aPtwznnGb/hA/6RMIT4S6FQwZ1WNYOwSYC9qZpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qzvfDxAR0hgkbJeKIH1YA1FElGb/F9iK1rPcCgNUh8Q=; b=wUplWjNEoqRqzbZkYqCTV5xUo198mosI8Gp8CNiRHwdlhLlInx/KCNR175orJyugHXNtyW hHfgYPBJIJUf6dggWfx4SEnYug7BiwSmaKHfWPKZkxznywLmq7vVMod0njINuS3Ji0PgpE 5W4qIHJ+H4gk9gRvaU7gYG9GNO8gaKzcnuA7ozkxSLy+j8Anr43er97SwtBFZdadTZsg+5 9rdl4DHIjDOn13VUZ8dSVXcofiC9pXpv6EKzik2ME5IDeU3kqOldDvgWvd2xHH2zOjVFDT IIWPdUzArry9RPsuz2Z08tmp1kLjl23n693EhDs6Y5LNja8qrwYb8v6yrCibWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767431440; a=rsa-sha256; cv=none; b=oMHr5zsaQZ/iLOChHKWAF/nVHPmtJQYp22hndD2M+xKvS/v1hyJJT1fC/0qecoSJNFQFYP M49l8S/RNDVymAwXHIBqlGhy9hZlcVZAcKqnwg8HlQbFcyFvqvLrZ6q6xDE36rAx1VumcA BG3IiIVw4+1Lm4RLJFBXgXA0ZctIDsCZs8yRE8zrk95a+H/UgNQQsONW3ZrIFZhKcuJ/Ol 1SNP7djNQ/N7LELHzGNwyamx4cN7QJgdUvJCcgVydn5ccA+GuwDl1eAQevfQ8hpoenltGc rIIPqYPxr0IPdeEex4I8nj082S9oMjvYsDRsw3uan0pBN58SWsg4sA5IYMI3dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djvt83TQ7zwtR for ; Sat, 03 Jan 2026 09:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b4b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 09:10:40 +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: 27894e20f140 - main - libgeom: Fix segfault in 32-on-64 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: 27894e20f140ee2729c14b589035870c8185b87d Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 09:10:40 +0000 Message-Id: <6958dd10.b4b9.2aebecda@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=27894e20f140ee2729c14b589035870c8185b87d commit 27894e20f140ee2729c14b589035870c8185b87d Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:09:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 09:10:23 +0000 libgeom: Fix segfault in 32-on-64 case We were using strtoul() to parse object identifiers, which are kernel pointers. This works fine as long as the kernel and userland match, but in a 32-bit libgeom on a 64-bit kernel this will return ULONG_MAX for all objects, resulting in memory corruption when we later pick the wrong object while resolving consumer-producer references. MFC after: 1 week PR: 292127 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54452 --- lib/libgeom/geom_xml2tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 2d2c43e29e77..161425d9fadf 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -76,10 +76,10 @@ StartElement(void *userData, const char *name, const char **attr) ref = NULL; for (i = 0; attr[i] != NULL; i += 2) { if (!strcmp(attr[i], "id")) { - id = (void *)strtoul(attr[i + 1], NULL, 0); + id = (void *)strtoumax(attr[i + 1], NULL, 0); mt->nident++; } else if (!strcmp(attr[i], "ref")) { - ref = (void *)strtoul(attr[i + 1], NULL, 0); + ref = (void *)strtoumax(attr[i + 1], NULL, 0); } else printf("%*.*s[%s = %s]\n", mt->level + 1, mt->level + 1, "", From nobody Sat Jan 3 09:10: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 4djvt96xtsz6Lx4f for ; Sat, 03 Jan 2026 09:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djvt94sDRz3Jr0 for ; Sat, 03 Jan 2026 09:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fIgOfCSm2MGeor5MlWcp4YDI83gXc42+ezrLMrlA8w=; b=f2TZworgZnFdvcZyFv/uYRf5GQW+HPJpNh51As5PeXtgJijOBiY+7JOE0E/l0eDbhZ2Ewf BeCunidVJyh63bC0jIivo3D4JnwoCwtgTUaf7c4523WSPaB46lN3b6yQW0oGfuMQPjBLUh ZY9bymt/Ue7X3RqPtSoPjX3nxSmK4m9vkE47uNhytRdBMCeEvHb8AwcdZ+rnzQcHgy0Cb5 ik3dWyZvR6aiqqu3ymFujb0a8+f9LM38EcH0/DHsW/3EuJxOPGAIU0yjxBidPePscz24J4 CttvdNN2K1YCW89GKqYdExhTnu04u9WeqtEKxLUpuElXVq/vUlVjiMDJoXdM/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fIgOfCSm2MGeor5MlWcp4YDI83gXc42+ezrLMrlA8w=; b=nIG9LSJT7KLASJ1/scaIYW9VJRa8Z7//vXtLtOtkridlhAX5P5kp9mHWoiTvqMEENn7DIH u4U3BRJKOCKufqJCJObrelEFMzRJ4qqunJzypdBnM+3MiW7XEtRJhOsV125miCJFPrlsmU MaEMg4gxyWLp7ngvMPJdQ4S4+tCJklcguBwp9z4331k6sPfP/HhWi4iy3jRVH/H/o0WxsZ +mQCKR4csQtQdybZOacqAMrJzozduzzV7xjm8WgZSAvYEUidneE+2ofa3vc+kzEtLkKkDX bRbQ3ihBRoSsR707saoZomozTjdrNB0X4G9pVwSGPCKr1N4A0uKvLTflYg3DpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767431441; a=rsa-sha256; cv=none; b=uncqOQUji9mduqWFgRBs385vP6f20Ti6JSp9VSztW8m/vzOf8hS4OAycDBRHJUg7dOroO4 Rv+7PZkQz2JCdh8FJSHqbqTIV1ofoo+jVi6VdvDfe0ofa7eiYSb3gS0f8NDfn6zGu5YZvl 0uCeBNtkF5ITtT1P0ldOynTDwdSkOjnHigTGvVRfJRDbfM1rlz3YFE0vAzCFHoodX5Ej22 xDEmDRXzSwvASjYBhpjcF8lftelP21Yu9Z0blF7CSgt6VQkQTac5KlZT3WiMLwEU1sDGmF dJcQQpnUmlYx+i2VeUOr2GEjUU0Abd1hAc8GvRCSyquph51iHT9FHAfa+8zsag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djvt94LSXzxcS for ; Sat, 03 Jan 2026 09:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id cb3f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 09:10:41 +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: fad6707e2589 - main - libgeom: Clean up xml2tree code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fad6707e2589d8557ceb6b6bf11f22323b265f01 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 09:10:41 +0000 Message-Id: <6958dd11.cb3f.2c02d76a@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fad6707e2589d8557ceb6b6bf11f22323b265f01 commit fad6707e2589d8557ceb6b6bf11f22323b265f01 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:09:58 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 09:10:23 +0000 libgeom: Clean up xml2tree code MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54453 --- lib/libgeom/geom_xml2tree.c | 100 ++++++++++++++++++++++---------------------- lib/libgeom/libgeom.h | 2 +- 2 files changed, 52 insertions(+), 50 deletions(-) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 161425d9fadf..81f7de1be263 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -29,21 +29,24 @@ * SUCH DAMAGE. */ -#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 @@ -75,17 +78,14 @@ StartElement(void *userData, const char *name, const char **attr) id = NULL; ref = NULL; for (i = 0; attr[i] != NULL; i += 2) { - if (!strcmp(attr[i], "id")) { + if (strcmp(attr[i], "id") == 0) { id = (void *)strtoumax(attr[i + 1], NULL, 0); mt->nident++; - } else if (!strcmp(attr[i], "ref")) { + } else if (strcmp(attr[i], "ref") == 0) { ref = (void *)strtoumax(attr[i + 1], NULL, 0); - } else - printf("%*.*s[%s = %s]\n", - mt->level + 1, mt->level + 1, "", - attr[i], attr[i + 1]); + } } - if (!strcmp(name, "class") && mt->class == NULL) { + if (strcmp(name, "class") == 0 && mt->class == NULL) { mt->class = calloc(1, sizeof *mt->class); if (mt->class == NULL) { mt->error = errno; @@ -100,7 +100,7 @@ StartElement(void *userData, const char *name, const char **attr) LIST_INIT(&mt->class->lg_config); return; } - if (!strcmp(name, "geom") && mt->geom == NULL) { + if (strcmp(name, "geom") == 0 && mt->geom == NULL) { mt->geom = calloc(1, sizeof *mt->geom); if (mt->geom == NULL) { mt->error = errno; @@ -116,11 +116,11 @@ StartElement(void *userData, const char *name, const char **attr) LIST_INIT(&mt->geom->lg_config); return; } - if (!strcmp(name, "class") && mt->geom != NULL) { + if (strcmp(name, "class") == 0 && mt->geom != NULL) { mt->geom->lg_class = ref; return; } - if (!strcmp(name, "consumer") && mt->consumer == NULL) { + if (strcmp(name, "consumer") == 0 && mt->consumer == NULL) { mt->consumer = calloc(1, sizeof *mt->consumer); if (mt->consumer == NULL) { mt->error = errno; @@ -135,15 +135,15 @@ StartElement(void *userData, const char *name, const char **attr) LIST_INIT(&mt->consumer->lg_config); return; } - if (!strcmp(name, "geom") && mt->consumer != NULL) { + if (strcmp(name, "geom") == 0 && mt->consumer != NULL) { mt->consumer->lg_geom = ref; return; } - if (!strcmp(name, "provider") && mt->consumer != NULL) { + if (strcmp(name, "provider") == 0 && mt->consumer != NULL) { mt->consumer->lg_provider = ref; return; } - if (!strcmp(name, "provider") && mt->provider == NULL) { + if (strcmp(name, "provider") == 0 && mt->provider == NULL) { mt->provider = calloc(1, sizeof *mt->provider); if (mt->provider == NULL) { mt->error = errno; @@ -159,11 +159,11 @@ StartElement(void *userData, const char *name, const char **attr) LIST_INIT(&mt->provider->lg_config); return; } - if (!strcmp(name, "geom") && mt->provider != NULL) { + if (strcmp(name, "geom") == 0 && mt->provider != NULL) { mt->provider->lg_geom = ref; return; } - if (!strcmp(name, "config")) { + if (strcmp(name, "config") == 0) { if (mt->provider != NULL) { mt->config = &mt->provider->lg_config; return; @@ -210,7 +210,7 @@ EndElement(void *userData, const char *name) p = NULL; } - if (!strcmp(name, "name")) { + if (strcmp(name, "name") == 0) { if (mt->provider != NULL) { mt->provider->lg_name = p; return; @@ -222,47 +222,47 @@ EndElement(void *userData, const char *name) return; } } - if (!strcmp(name, "rank") && mt->geom != NULL) { + if (strcmp(name, "rank") == 0 && mt->geom != NULL) { mt->geom->lg_rank = strtoul(p, NULL, 0); free(p); return; } - if (!strcmp(name, "mode") && mt->provider != NULL) { + if (strcmp(name, "mode") == 0 && mt->provider != NULL) { mt->provider->lg_mode = p; return; } - if (!strcmp(name, "mode") && mt->consumer != NULL) { + if (strcmp(name, "mode") == 0 && mt->consumer != NULL) { mt->consumer->lg_mode = p; return; } - if (!strcmp(name, "mediasize") && mt->provider != NULL) { + if (strcmp(name, "mediasize") == 0 && mt->provider != NULL) { mt->provider->lg_mediasize = strtoumax(p, NULL, 0); free(p); return; } - if (!strcmp(name, "sectorsize") && mt->provider != NULL) { + if (strcmp(name, "sectorsize") == 0 && mt->provider != NULL) { mt->provider->lg_sectorsize = strtoul(p, NULL, 0); free(p); return; } - if (!strcmp(name, "stripesize") && mt->provider != NULL) { + if (strcmp(name, "stripesize") == 0 && mt->provider != NULL) { mt->provider->lg_stripesize = strtoumax(p, NULL, 0); free(p); return; } - if (!strcmp(name, "stripeoffset") && mt->provider != NULL) { + if (strcmp(name, "stripeoffset") == 0 && mt->provider != NULL) { mt->provider->lg_stripeoffset = strtoumax(p, NULL, 0); free(p); return; } - if (!strcmp(name, "config")) { + if (strcmp(name, "config") == 0) { mt->config = NULL; free(p); return; } - if (mt->config != NULL || (!strcmp(name, "wither") && + if (mt->config != NULL || (strcmp(name, "wither") == 0 && (mt->provider != NULL || mt->geom != NULL))) { if (mt->config != NULL) c = mt->config; @@ -301,28 +301,28 @@ EndElement(void *userData, const char *name) free(p); } - if (!strcmp(name, "consumer") && mt->consumer != NULL) { + if (strcmp(name, "consumer") == 0 && mt->consumer != NULL) { mt->consumer = NULL; return; } - if (!strcmp(name, "provider") && mt->provider != NULL) { + if (strcmp(name, "provider") == 0 && mt->provider != NULL) { mt->provider = NULL; return; } - if (!strcmp(name, "geom") && mt->consumer != NULL) { + if (strcmp(name, "geom") == 0 && mt->consumer != NULL) { return; } - if (!strcmp(name, "geom") && mt->provider != NULL) { + if (strcmp(name, "geom") == 0 && mt->provider != NULL) { return; } - if (!strcmp(name, "geom") && mt->geom != NULL) { + if (strcmp(name, "geom") == 0 && mt->geom != NULL) { mt->geom = NULL; return; } - if (!strcmp(name, "class") && mt->geom != NULL) { + if (strcmp(name, "class") == 0 && mt->geom != NULL) { return; } - if (!strcmp(name, "class") && mt->class != NULL) { + if (strcmp(name, "class") == 0 && mt->class != NULL) { mt->class = NULL; return; } @@ -347,7 +347,7 @@ CharData(void *userData , const XML_Char *s , int len) } struct gident * -geom_lookupid(struct gmesh *gmp, const void *id) +geom_lookupid(const struct gmesh *gmp, const void *id) { struct gident *gip; @@ -413,6 +413,7 @@ geom_xml2tree(struct gmesh *gmp, char *p) return (ENOMEM); i = 0; /* Collect all identifiers */ + /* XXX we should check for duplicate identifiers */ LIST_FOREACH(cl, &gmp->lg_class, lg_class) { gmp->lg_ident[i].lg_id = cl->lg_id; gmp->lg_ident[i].lg_ptr = cl; @@ -441,8 +442,9 @@ geom_xml2tree(struct gmesh *gmp, char *p) LIST_FOREACH(cl, &gmp->lg_class, lg_class) { LIST_FOREACH(ge, &cl->lg_geom, lg_geom) { ge->lg_class = geom_lookupidptr(gmp, ge->lg_class); - LIST_FOREACH(pr, &ge->lg_provider, lg_provider) + LIST_FOREACH(pr, &ge->lg_provider, lg_provider) { pr->lg_geom = geom_lookupidptr(gmp, pr->lg_geom); + } LIST_FOREACH(co, &ge->lg_consumer, lg_consumer) { co->lg_geom = geom_lookupidptr(gmp, co->lg_geom); if (co->lg_provider != NULL) { @@ -522,22 +524,22 @@ geom_deletetree(struct gmesh *gmp) break; LIST_REMOVE(cl, lg_class); delete_config(&cl->lg_config); - if (cl->lg_name) free(cl->lg_name); + free(cl->lg_name); for (;;) { ge = LIST_FIRST(&cl->lg_geom); if (ge == NULL) break; LIST_REMOVE(ge, lg_geom); delete_config(&ge->lg_config); - if (ge->lg_name) free(ge->lg_name); + free(ge->lg_name); for (;;) { pr = LIST_FIRST(&ge->lg_provider); if (pr == NULL) break; LIST_REMOVE(pr, lg_provider); delete_config(&pr->lg_config); - if (pr->lg_name) free(pr->lg_name); - if (pr->lg_mode) free(pr->lg_mode); + free(pr->lg_name); + free(pr->lg_mode); free(pr); } for (;;) { @@ -546,7 +548,7 @@ geom_deletetree(struct gmesh *gmp) break; LIST_REMOVE(co, lg_consumer); delete_config(&co->lg_config); - if (co->lg_mode) free(co->lg_mode); + free(co->lg_mode); free(co); } free(ge); diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h index 950508fd3637..2116645bd496 100644 --- a/lib/libgeom/libgeom.h +++ b/lib/libgeom/libgeom.h @@ -133,7 +133,7 @@ struct gprovider { struct gconf lg_config; }; -struct gident * geom_lookupid(struct gmesh *, const void *); +struct gident *geom_lookupid(const struct gmesh *, const void *); int geom_xml2tree(struct gmesh *, char *); int geom_gettree(struct gmesh *); int geom_gettree_geom(struct gmesh *, const char *, const char *, int); From nobody Sat Jan 3 09:10: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 4djvtD4sg0z6LxD8 for ; Sat, 03 Jan 2026 09:10: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djvtC2wmrz3Jy7 for ; Sat, 03 Jan 2026 09:10:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zWY+jUFaHUu8rwnWUesz8F8di6K8nRcoP8hRfdYdqtk=; b=Xa9ZTl3hTnfQHoxQf+MhVlthCPWLAW4hi036ZGYSAx6QEa5gXGhFMCbgH9qzoNFZyT1VqM EYXk9Eha6NFnptmiM+Sw6+S8v7e+hHGt8NXd+xX2iUPqL0WyeidsYGMIF51VO5ox3zzAYy vhypMd7tdyZnKULnYwFZhROTqnzFhb3evKwKdiOYrZzlWtMCob8vcZf1GMhri+PqLJ6N2g N382vbGTgoGEc7OTeGpCU+BnrXUVL8xwzP5sw4LYcLT7jz03TjcLILVnSe16HTU9/lmqFR b2DOKujHoiGuS8jbRvBgvV7NQHkPaA36/z7QI+MO0ybAeozcdY0VLILacah/Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767431443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zWY+jUFaHUu8rwnWUesz8F8di6K8nRcoP8hRfdYdqtk=; b=PCdGCCZIqr86Vdr/KmqyOMId9RcG57HbbcaH40ZQLPYWiVLnke+mdgeV7FuPZJoMJcDX+8 D8s/eHBeL4YItr3kJyVAUVLy/z3TUL73ohGIAc0Xmx8Gxg3eNVYe6pGdC3L1aRLtUDIhcj pL+yGHDU2gRD6d5+Wrxagu2f952C+HjDDFgHNd3friqjGm9+DTr9zWj/bxtUe6J5JONNcF akP+z7pyrC5vELSYDriTBs8NkqF1y7fXMT3xBN2nzVKAU4PaDHs95I8Vc2c5AUllGuR4eo C5zds/JU/Q6xSCPQUGv5LCDUAd4hwg7Kn4DeTPFa10j2zRI2YYw+aRyO8s9MbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767431443; a=rsa-sha256; cv=none; b=VPTd6BBCQ6pxaBCePBX1kCAuqjzFi4iMErR/Be9x2GkjUnD8Y4INeEzYupQMRwQNKLlJ/M 8xMss5bpu3FxbNfoZHD1AwGLHSNCdHot41r0G/HdSx4bXG1q89eFqT9+76/qITutf9Xi/7 sw87ARtPirw868V6LxYRWxxcgu41gWCvGE5arQb1ZE7zRcubJ5gA8eWkV8qf1grRO5p0RL zNyq/7F0GiuVVw/szCg0zouniV5Vs+XrbLvPkKH96ow5xtwX/JYpeG8nvDMFkdPL0J4PXP vHJNli1FK4tepAsHaZXxvbOjYAo7j0HTBpqBsD5maK2b5Jei1xw3gNAhoW2aPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djvtB5BBZzy1Y for ; Sat, 03 Jan 2026 09:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 96fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 09:10:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4b0d5d1d6a7c - main - libgeom: Improve type safety of xml2tree code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b0d5d1d6a7c9773e38882feb4747a76b37a645c Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 09:10:42 +0000 Message-Id: <6958dd12.96fc.47b0ebd2@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4b0d5d1d6a7c9773e38882feb4747a76b37a645c commit 4b0d5d1d6a7c9773e38882feb4747a76b37a645c Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 09:10:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 09:10:23 +0000 libgeom: Improve type safety of xml2tree code When resolving references, assert that the type of the object we find is what we expect. This will help prevent memory corruption if two objects of different types somehow end up with the same identifier. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54454 --- lib/libgeom/geom_xml2tree.c | 54 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 81f7de1be263..03210947d431 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -358,14 +359,47 @@ geom_lookupid(const struct gmesh *gmp, const void *id) } static void * -geom_lookupidptr(struct gmesh *gmp, const void *id) +geom_lookup_class(const struct gmesh *gmp, const void *id) { struct gident *gip; - gip = geom_lookupid(gmp, id); - if (gip) - return (gip->lg_ptr); - return (NULL); + if ((gip = geom_lookupid(gmp, id)) == NULL) + return (NULL); + assert(gip->lg_what == ISCLASS); + return (gip->lg_ptr); +} + +static void * +geom_lookup_geom(const struct gmesh *gmp, const void *id) +{ + struct gident *gip; + + if ((gip = geom_lookupid(gmp, id)) == NULL) + return (NULL); + assert(gip->lg_what == ISGEOM); + return (gip->lg_ptr); +} + +static void * +geom_lookup_provider(const struct gmesh *gmp, const void *id) +{ + struct gident *gip; + + if ((gip = geom_lookupid(gmp, id)) == NULL) + return (NULL); + assert(gip->lg_what == ISPROVIDER); + return (gip->lg_ptr); +} + +static void * __unused +geom_lookup_consumer(const struct gmesh *gmp, const void *id) +{ + struct gident *gip; + + if ((gip = geom_lookupid(gmp, id)) == NULL) + return (NULL); + assert(gip->lg_what == ISCONSUMER); + return (gip->lg_ptr); } int @@ -441,15 +475,15 @@ geom_xml2tree(struct gmesh *gmp, char *p) /* Substitute all identifiers */ LIST_FOREACH(cl, &gmp->lg_class, lg_class) { LIST_FOREACH(ge, &cl->lg_geom, lg_geom) { - ge->lg_class = geom_lookupidptr(gmp, ge->lg_class); + ge->lg_class = geom_lookup_class(gmp, ge->lg_class); LIST_FOREACH(pr, &ge->lg_provider, lg_provider) { - pr->lg_geom = geom_lookupidptr(gmp, pr->lg_geom); + pr->lg_geom = geom_lookup_geom(gmp, pr->lg_geom); } LIST_FOREACH(co, &ge->lg_consumer, lg_consumer) { - co->lg_geom = geom_lookupidptr(gmp, co->lg_geom); + co->lg_geom = geom_lookup_geom(gmp, co->lg_geom); if (co->lg_provider != NULL) { - co->lg_provider = geom_lookupidptr(gmp, - co->lg_provider); + co->lg_provider = geom_lookup_provider(gmp, + co->lg_provider); if (co->lg_provider != NULL) { LIST_INSERT_HEAD( &co->lg_provider->lg_consumers, From nobody Sat Jan 3 17:50: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 4dk7QG6h6Qz6MbR8 for ; Sat, 03 Jan 2026 17:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dk7QG653wz49fx for ; Sat, 03 Jan 2026 17:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767462646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=87A8suQPCyfCt+lfDJomV3zg1GsFOEo4HKMwXGMEQcw=; b=cC8Q4pbmKPJmq/p8hfa12n4ihVhyZYUN8S2rpOtwM4pcwSv26k/dG0j/qpRslrAkSV95d5 Hm/1yAhkPcK44a4YMmjf8T4GjTdScgEnniv1Oe/gislTtHW0KajNSnvRoe8RNd01OBkXn6 rGx8X+kYc4sCFvUr8A1ag5mmB2Neuze0+nFe492cSbSXEqUtt6ljwG4Qhws9mWKr9aQlGo tbmrLUzJNp9dvu7fiWY+bRDNHWr6+VyynbBCA4W3S/m2/hLNtpPtpkiI3wfX0QyVOobORn qVhh3sSj1ssLFTxHkVSv3J6/hl2ZwreSjWDwQgWyfCKdyji2FO8JVV8cbqoGYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767462646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=87A8suQPCyfCt+lfDJomV3zg1GsFOEo4HKMwXGMEQcw=; b=Ti78huqG3q1fW8ExeKh5uHAhp4Al+4MhzlNDIV/CdUzYar0TiZQF5oQmFmzO5rDh6a+DnW FrfPMf9mSysqpoOiPjJuviHB1WR4Q7mO/uUcvbhRf5JOjP7qeN/x2JVGjqnISkBnk+ergX NSWEcmsurTWzo4B3HS4EVJN6lC2bn0MXZYMRvMDBUXN/I5/uVT2UMTB4pWozcuAZ8z80hs cg0aUmgHFHqG4FrJja9C3+TMrMbupGOqqN6+EMFC1Auh2fXas7OXS1ozu0beEpueYYbpxO wgt7J8yBUSjHPOWduPOnEfUe8C2vfd89/XYrLSWqV0DnA7O4V091ALdZipliQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767462646; a=rsa-sha256; cv=none; b=FWPUdlhFRyrqqvtWR+HvWcaZm3zPyMLNeO27cVRTospnY94NgcbJqDjaqpa7LXMiUSmAKl L1ecXpcjmurdHcSzEbGEIuh/qNP+lbMTV37BADAGnBkI3yaKg+52sZ/wHNfLuvgk7Ej4Rc ektistHg8oE49KqgR9ZGfgtVFfGVEpMDs+tE1zDo5Ll4C6moukEdDwhAA83SuXT0mQANRM CgOelSfma9h9axmb6G3y3eQbIv1YGzv8PI1iUM2WaC6J4IhGrN/t8sYU9xfomEELaNBleA mqZxmtnJhnasm1LU5BbNNvK+gG/RrROz0zDpnXdmTrox27AxyFeSE730pFyizA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dk7QG5WMZz1DCN for ; Sat, 03 Jan 2026 17:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27d43 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 17:50:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8ac77ea6a3c6 - main - cam: Minor comment 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ac77ea6a3c6ce99d39e1dd4e19adb444b2b4d5a Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 17:50:46 +0000 Message-Id: <695956f6.27d43.4a1197f9@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8ac77ea6a3c6ce99d39e1dd4e19adb444b2b4d5a commit 8ac77ea6a3c6ce99d39e1dd4e19adb444b2b4d5a Author: Warner Losh AuthorDate: 2026-01-03 17:50:04 +0000 Commit: Warner Losh CommitDate: 2026-01-03 17:50:45 +0000 cam: Minor comment cleanup Some minor comment cleanup, add a comment about an unused value, etc. No functional change. Sponsored by: Netflix --- sys/cam/cam_ccb.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index bb23c6bed26f..cedb3a9ad61c 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -160,12 +160,14 @@ typedef enum { /* Path statistics (error counts, etc.) */ XPT_GDEV_STATS = 0x0c, /* Device statistics (error counts, etc.) */ + + /* 0x0d unused */ XPT_DEV_ADVINFO = 0x0e, /* Get/Set Device advanced information */ XPT_ASYNC = 0x0f | XPT_FC_QUEUED | XPT_FC_USER_CCB | XPT_FC_XPT_ONLY, /* Asynchronous event */ -/* SCSI Control Functions: 0x10->0x1F */ +/* SCSI, NVME, and ATA Control Functions: 0x10->0x1F */ XPT_ABORT = 0x10, /* Abort the specified CCB */ XPT_RESET_BUS = 0x11 | XPT_FC_XPT_ONLY, @@ -199,14 +201,10 @@ typedef enum { XPT_GET_SIM_KNOB_OLD = 0x18, /* Compat only */ XPT_SET_SIM_KNOB = 0x19, - /* - * Set SIM specific knob values. - */ + /* Set SIM specific knob values. */ XPT_GET_SIM_KNOB = 0x1a, - /* - * Get SIM specific knob values. - */ + /* Get SIM specific knob values. */ XPT_SMP_IO = 0x1b | XPT_FC_DEV_QUEUED, /* Serial Management Protocol */ @@ -250,8 +248,11 @@ typedef enum { XPT_REPROBE_LUN = 0x38 | XPT_FC_QUEUED | XPT_FC_USER_CCB, /* Query device capacity and notify GEOM */ +/* More common commands: 0x40-0x7f */ XPT_MMC_SET_TRAN_SETTINGS = 0x40 | XPT_FC_DEV_QUEUED, + /* Queued MMC/SD set transmit settings */ XPT_MMC_GET_TRAN_SETTINGS = 0x41 | XPT_FC_DEV_QUEUED, + /* Queued MMC/SD get transmit settings */ /* Vendor Unique codes: 0x80->0x8F */ XPT_VUNIQUE = 0x80 From nobody Sat Jan 3 18:48:57 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 4dk8jP6Czqz6MgHL for ; Sat, 03 Jan 2026 18:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dk8jP34wHz3KGh for ; Sat, 03 Jan 2026 18:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767466137; h=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=z7HE/GjcCx5COrecG/uaitgMOufi1gqAc/zMG+n2Q7c=; b=IvQGvoXevA+DXW9SdfWbMOyoG4umCfirV10Tou7ixfYx50jYxRXHtNiiEOtKJcX8MVdEH/ N8sAdai82nWFjY7Tlp5s2UdvuFs/BZoI716YTk4fYFCQiSsIcRKmBGDHRGJsZWkP2aRAfh kYZoELkhWA/iOG+E1Whajd0/TtMUjjARowX7gw4VQgy5XVSB9D9VLwOgZRldlGW2gzerXx 56g8VXKGpoXf94frAnnOCUgl3jdFQ0/YpdZ47vhpgdIyWzoYbmCiUVofPfCcM+QyilGvLb T/Edu2Do82GOsHIWu3RggYV0a4InkRm2J17q4IT12JLhyVPRP5OEO8slCRO8DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767466137; h=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=z7HE/GjcCx5COrecG/uaitgMOufi1gqAc/zMG+n2Q7c=; b=Swjk1n7VK2e0UIzOF/nzS6v9ea/sI4zc5tJjhooPp8iHhK7bbAjT6Fjgka4PNqrrGgeEt8 UQmYtCMYQeyAKgDgqDaHn8mAl1xESu8h8fAZai52qCnv2JAHcb1ANn0l+G8vicciah/Ncw E1T3WDO+qyXPJcHtCmPKneQWVJxXHN6OwzXLV8C6sqspCw2MnNtz6x7KCJ+/Z8PflL5Zpj zI8pzyRgW0J+e+aW65dEz7EA0h2mGH3zjtxs9UG/O14g/ipMxtFXq6AQcF0nHF/G33Wtzs ZLwIkE2iJuhIhq5g9mTxB4ZcY1DyiEQxsKtWNJZ3SEuba2eZQj57s/8IPXvl0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767466137; a=rsa-sha256; cv=none; b=DDDbKpeE1J8aks6Vk0vO4laYIwzN2wpfw1XlJy+brc2KqQoqTPKXK3+RX/1UywPhOvi3vR crj8NEGIDxBJ8V1v/+k1M4CXT8Kw0PcKMdY2mEL5ewVY3YS8pO8WAEx42omaSGoF2MzS47 IO11T6tvuu4jiVXOZFUNH/FdAMfCejlOAhBfdBOYSKq4l7FCwswMhvfzv2dyOlRI2031Nz 2fRx7agxcxlb+c/TQE2akdD12sG5WDUw8It1YUdsqYlRh1TKpOarrpGEHAY8W+w59UcWdR i/OG9TtxSpxmkPF6Zafo9zeHzPjF0zEt8u9mxl1ux4M8q8Tg6bK4XSzWw7V64A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dk8jP1mF5z1FYH for ; Sat, 03 Jan 2026 18:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 341cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 18:48:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 2a7c4685b769 - main - asmc: improve asmc_dumpall to read actual SMC key count List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 2a7c4685b7693bfa15e2bd4d5e82905a368b0030 Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 18:48:57 +0000 Message-Id: <69596499.341cb.1bdb76bc@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=2a7c4685b7693bfa15e2bd4d5e82905a368b0030 commit 2a7c4685b7693bfa15e2bd4d5e82905a368b0030 Author: Abdelkader Boudih AuthorDate: 2026-01-03 18:33:11 +0000 Commit: Adrian Chadd CommitDate: 2026-01-03 18:35:53 +0000 asmc: improve asmc_dumpall to read actual SMC key count The asmc_dumpall debug function previously used a hardcoded loop limit of 0x100 (256) keys with a "XXX magic number" comment. This change improves asmc_dumpall to: * Read the actual number of keys from the ASMC_NKEYS SMC key * Print the key count being dumped for better debugging output * Loop only up to the actual key count (e.g., 297 on Mac Mini 5,1) This provides more accurate debug output and removes the magic number. Tested on Mac Mini 5,1 (FreeBSD 16.0-CURRENT): * Rebuild kernel with DEBUG enabled in asmc driver * Boot with new kernel * Verify dmesg shows "asmc_dumpall: dumping 297 keys" (or actual count) * Verify all 297 keys are dumped Differential Revision: https://reviews.freebsd.org/D54436 Reviewed by: markj, adrian --- sys/dev/asmc/asmc.c | 25 +++++++++++++++++-------- sys/dev/asmc/asmcvar.h | 1 + 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index d99c1d56e67c..bdb8ca7831c4 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -823,10 +823,16 @@ asmc_resume(device_t dev) #ifdef DEBUG void asmc_dumpall(device_t dev) { + struct asmc_softc *sc = device_get_softc(dev); int i; - /* XXX magic number */ - for (i=0; i < 0x100; i++) + if (sc->sc_nkeys == 0) { + device_printf(dev, "asmc_dumpall: key count not available\n"); + return; + } + + device_printf(dev, "asmc_dumpall: dumping %d keys\n", sc->sc_nkeys); + for (i = 0; i < sc->sc_nkeys; i++) asmc_key_dump(dev, i); } #endif @@ -914,12 +920,15 @@ nosms: sc->sc_nfan = ASMC_MAXFANS; } - if (bootverbose) { - /* - * The number of keys is a 32 bit buffer - */ - asmc_key_read(dev, ASMC_NKEYS, buf, 4); - device_printf(dev, "number of keys: %d\n", ntohl(*(uint32_t*)buf)); + /* + * Read and cache the number of SMC keys (32 bit buffer) + */ + if (asmc_key_read(dev, ASMC_NKEYS, buf, 4) == 0) { + sc->sc_nkeys = be32dec(buf); + if (bootverbose) + device_printf(dev, "number of keys: %d\n", sc->sc_nkeys); + } else { + sc->sc_nkeys = 0; } #ifdef DEBUG diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index d40dc1e7c8ff..b6d8686d9670 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -33,6 +33,7 @@ struct asmc_softc { device_t sc_dev; struct mtx sc_mtx; int sc_nfan; + int sc_nkeys; int16_t sms_rest_x; int16_t sms_rest_y; int16_t sms_rest_z; From nobody Sat Jan 3 20:37: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 4dkC6k5tQrz6MndV for ; Sat, 03 Jan 2026 20:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkC6k48yYz3f9r for ; Sat, 03 Jan 2026 20:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767472654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b1lo1mQoVAjUqpQl4IMtR2rROXwc3QIeQlwFem74B2Y=; b=q13VdmDzLycbPsmGqeMbr8eWMGWORU1tzcjmkB+Ot3bxOaR5rBLms/YOObAau5Ivda8tP8 G1x+tbJjlCwEPBBU5YvsieBQa0HkuVx6XXGCzwunJrrzmT8ATWAz8ZAGofznvIOhotGq/O YBs5GCFCWXtvJo8P1kgfSHW4JX8qbCObJtIdGz0jNfb3m2zwTx2qbOml8xFvZAOSfmViHK 2DWzNPQP7j35a0vlAL5ZI/++nCK68atKHzxcXB2DjoSf5nelgr177+r9vn7HveBbH58lkq tNmkxTgoK6AWZh96xmZB8IM6anvGzSnFDaGVvEoQQO3qOxDMhrP7qX5PRtdUrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767472654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b1lo1mQoVAjUqpQl4IMtR2rROXwc3QIeQlwFem74B2Y=; b=iPzRip3HyRJFXkZGZkDk+/xaxE53c53lw7Jb6ahyAKD30hdaC1YjpPcyShc2UY7mat2T+M vhf8s6Cn0UFLi6B6CLcyPnOyxf/SPLRQAtU8cW7okZx98kwEnb+RVZ60dxnnJZopjwCpPw uW42A6OhX70VCdrVwH71TGielYWOWfY9rcbIwWjCX79AIdtruunKp0uo3hRedpbpJOGlkI w/VqbdiLdN3minsJwQTdrgI9bWwpKx9OJ14ftksWJ/pC5/4ehoyRsyxXN05Z33kabuAeX/ Le/1BC67N+e5UyYEbvCjPbH7njTkCSnu/Bc/wGUOHeMtPqCYUPxSPfOp2CPb0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767472654; a=rsa-sha256; cv=none; b=DH+gx8h687vTTkJe4VCyoUG8Mo/RLG7MGOWye3KCvsGWwOi5hdma+V0EXkkRyT4PIzlanh ALBK5IA/py8jW2XXPk3rcBm1wu3yD38KL9HWlAXQU90qGvKLn2EkMD7dSecuuelWxvHPLu Jvnp6veVCrxE0jBu9CtCFe35+MKxf3orhLjH3e3ZGH7jprqeWr13yzfxehI5hyp56HmPV+ +Yijj7iEHorKZ6fWyme4DPBevzFmKM0EsvXOw67l9lPDYQfwhvxnFuOIB26on9A3G+kEmT gvC/HZvSf9NzoSXilGffI7rw91KUa1PU/4MIow92o1YhIaAoHqt8ZNitlVtlzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkC6k2zyrz1JY8 for ; Sat, 03 Jan 2026 20:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f9a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Jan 2026 20:37:34 +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: 17355cf50fcb - main - libgeom: Fix 32-bit gcc 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17355cf50fcbd0d8ddb638e1f2fd5861b526edbe Auto-Submitted: auto-generated Date: Sat, 03 Jan 2026 20:37:34 +0000 Message-Id: <69597e0e.3f9a2.3d060960@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=17355cf50fcbd0d8ddb638e1f2fd5861b526edbe commit 17355cf50fcbd0d8ddb638e1f2fd5861b526edbe Author: Dag-Erling Smørgrav AuthorDate: 2026-01-03 20:34:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-03 20:37:18 +0000 libgeom: Fix 32-bit gcc build MFC after: 1 week Fixes: 27894e20f140 ("libgeom: Fix segfault in 32-on-64 case") --- lib/libgeom/geom_xml2tree.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 03210947d431..a66938671845 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -71,6 +71,7 @@ StartElement(void *userData, const char *name, const char **attr) struct mystate *mt; void *id; void *ref; + uintmax_t umax; int i; mt = userData; @@ -80,10 +81,12 @@ StartElement(void *userData, const char *name, const char **attr) ref = NULL; for (i = 0; attr[i] != NULL; i += 2) { if (strcmp(attr[i], "id") == 0) { - id = (void *)strtoumax(attr[i + 1], NULL, 0); + umax = strtoumax(attr[i + 1], NULL, 0); + id = (void *)(uintptr_t)umax; mt->nident++; } else if (strcmp(attr[i], "ref") == 0) { - ref = (void *)strtoumax(attr[i + 1], NULL, 0); + umax = strtoumax(attr[i + 1], NULL, 0); + ref = (void *)(uintptr_t)umax; } } if (strcmp(name, "class") == 0 && mt->class == NULL) { From nobody Sun Jan 4 02:28:06 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 4dkLvB3vrJz6MGTm for ; Sun, 04 Jan 2026 02:28: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkLvB33vTz3WyF for ; Sun, 04 Jan 2026 02:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767493686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oJjXdWeKIBVNz8SBQBnJ4GhjCcc8yAbDzM0tUgopB2M=; b=ZoZwsAR5YODOKdJsMDqYhuVf5GT6CC7byJTCL/nNkxKn5+s9O2ULijCk1oY5XlL2ui86bE QNqkST6KmrlTK2Cg0YYX+AZXbLFC4V7b+SzewOnbMDAoaEFtiM8rLwg7O091zGnTQy3oj1 kqnhx6iEySiRP4KpaQAsIziCxDFcf1DdR7EQXe4ufwsZ9ehv5fdCYjkKWUy2UIgeh0qTZz 9uwSeAlfDAxcdKpvZwDrDEWKVk9wY80DxKVUNLMJCF00DmEMdxVRrYf/Sa/NCYuDn6vYfd kfrUC5BOlqYDPdmn/Hjd1vB2bXdHqL6ZIUoK4rdtkpDcoZdCmTSW9Rd2ndw3cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767493686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oJjXdWeKIBVNz8SBQBnJ4GhjCcc8yAbDzM0tUgopB2M=; b=JXNeWLV7bA6tKnm5lul9x6dePnJfyX5SPox7qpFspmFasf7jFrJNKgdXNdPElJXw9Z4+rd Drh0fiXkuuIvhRKF+205XOUZxdHj4U26OR8mYsO3p+kg3xEaA2iIdS1od1s/LqK5XyBZ3+ Iz8W1i+rJip2QK+T3c/MR5wFvz5AGHx1x+OVO/tFF5H0ZILs+q/c1ZAP/hVla9X+Nu1+in zxwLpJfe0nlEviHVhEZ5mdZ9NlK9S5Y8cir/2YrG9qJTL8IsM29HPheX12SWkuO0eoub4G 0yEOOO5DwhPUzfPtmsz5m4cWLOzJmFuhod/YTiM4PdRhcYE1SbcJVj8HXg49dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767493686; a=rsa-sha256; cv=none; b=LELajCu0NHORuFwxyq3ExjjO8PJ/mVggCzBUV4TSirCzfqjAAyVUWfd2C2QFZWxDaGmYxN 7480O2Afji5cSs7l4sb6tlnqVuYaU+PATt0bTCMB0/MTpbKux/O8nJFo4410sxG47CaXMB wmh2d2QPGMcao4+BvWktA2NU4qN6Aq6h6ychJDTUJpqMitEdU6WLwcYyuF5TudHUOgA3j2 NkSE7UzYZZeObePX9y1g4o9kcPXoIJegl+YH6qY/l6MKfEc9VaoxBG1I5jOGTSHsjOw63/ 3WzhuQLlowYEmKl2gOZ2zJb1uUffrSbZ/Hy5F7g9GsWli14GgIrhbZ9u/uUnlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkLvB2LQczW2 for ; Sun, 04 Jan 2026 02:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a488 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 02:28:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 8df2e5421468 - main - powerpc: put the isync inside the TD_LOCK() checking 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8df2e542146801fd01675e56724eaa567d04c209 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 02:28:06 +0000 Message-Id: <6959d036.a488.771ea5c1@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=8df2e542146801fd01675e56724eaa567d04c209 commit 8df2e542146801fd01675e56724eaa567d04c209 Author: Adrian Chadd AuthorDate: 2026-01-03 22:52:14 +0000 Commit: Adrian Chadd CommitDate: 2026-01-04 02:27:48 +0000 powerpc: put the isync inside the TD_LOCK() checking loop Fix a narrow window where the lock is unlocked but the checking CPU hasn't flushed things appropriately. Inside this window the CPU inside cpu_switch() will loop forever thinking the destination thread is still blocked/locked even though it is not. This manifests as the system hanging after starting all APs. I've seen this reliably trigger in qemu-system-ppc64 running power9 pseries guests; the more CPUs the more likely it triggers at boot. PR: kern/292167 Differential Revision: https://reviews.freebsd.org/D54478 Reviewed by: jhibbits MFC after: 1 week Relnotes: yes --- sys/powerpc/powerpc/swtch32.S | 2 +- sys/powerpc/powerpc/swtch64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/powerpc/swtch32.S b/sys/powerpc/powerpc/swtch32.S index 547e1c5a201b..ef1a397bf74d 100644 --- a/sys/powerpc/powerpc/swtch32.S +++ b/sys/powerpc/powerpc/swtch32.S @@ -141,8 +141,8 @@ cpu_switchin: blocked_loop: lwz %r7,TD_LOCK(%r2) cmpw %r6,%r7 - beq- blocked_loop isync + beq- blocked_loop #endif lwz %r17,TD_PCB(%r2) /* Get new current PCB */ diff --git a/sys/powerpc/powerpc/swtch64.S b/sys/powerpc/powerpc/swtch64.S index 5f80751c8a10..ba37274d32bb 100644 --- a/sys/powerpc/powerpc/swtch64.S +++ b/sys/powerpc/powerpc/swtch64.S @@ -194,8 +194,8 @@ cpu_switchin: blocked_loop: ld %r7,TD_LOCK(%r13) cmpd %r6,%r7 - beq- blocked_loop isync + beq- blocked_loop #endif ld %r17,TD_PCB(%r13) /* Get new PCB */ From nobody Sun Jan 4 09:20:18 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 4dkX2q1Xfsz6MlVV for ; Sun, 04 Jan 2026 09: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkX2p5YWMz46Zy for ; Sun, 04 Jan 2026 09:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767518418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tFJSjhZNTjqV8ljvm5ZcETd2bXYeCraQkda3SZcCC4w=; b=waj+i9AysA3R0VyW3EqWLporzULER2Ip+fxQ3eWyzrEmLJuALSEwfVV//kv2naHwX9pSBF 0RBW7x62mz+VtDo1u40qQfmqvSLw2UDdWDfY0Vax8QL2U5vqK/H/kha41MbA4hCgFnKL9/ Rg8slrqTUeWm+BO6FwElxFyHoUkG57zMALajXIS7YTGWvVGkBGQ381iwIPw9irlQBd9bmq N/zwYbG/mQNywojheLLmyaK6FaNfA4n6j1Fjs+7xyPn4MAxzzPma0/XH4tbhCA9MqU11yL 0t1oYXTvmSdSFXrtkAe4cGcRfkTBtldh5RDDj7D0oJ1XMTAjVfqUMnsjyZTmnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767518418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tFJSjhZNTjqV8ljvm5ZcETd2bXYeCraQkda3SZcCC4w=; b=CTUOegM13wmvEe1pks3L6Ob9BCLZ43rvaZnXK1WZTN8el4uL8z1/ULDVFXHDX3dg3gDByG 5bqwP6LPdLZHeOeuMTAPq2n0Hd12EEp6YQOi5yu4Yc1NbWXkwNPLpnubeymYwIVKk97pEx KK633S8XZBWmf5F/rqqlIaYaDuxZe7dTscb3zW/B+Kbu+wC6o2Cc1o9T2pXy9+T4T2QND2 Lc/WqzlvZLPnKXbVWhLTtE4PEOCCoHy3pHqDtFXk5V1aDrG5s/ERjwObpl1gDlsy3psVSI ud1Hj0gW2hWiAwf41HdM/Bzzq98gSbMLpl3G36HWa7Ac4u1AxJ56sb/Tqo2R3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767518418; a=rsa-sha256; cv=none; b=eCaV3TtHu22oof6qPvn/uc58WR7utQ4mgOxSwqD9kU9vfmPmZFltDvvvY0+ruExdMrWRCy HHHFIYqSpP2iJ4vuLAQz+O+0jeCIDkSAhnRhnCYZZxyqmcybemSt33lnpyogvxaL6b06Jg SvupLuGu38jx03Ioo3EFFaHzYL4xyLQuW+bICGZgYkGnIiasGtbNWl0UsGF0Xu6uF6OBt5 FsjAOmBcIdsQu74ykTC7whIW6hYC1eqWgrloryvTNm1IcrjEBwAtksGT4xTB9fij1irk3g dLkKY+v1kBFSXow3VbnnTzXN2asug5d7pC6bFK+HCCYCLE2AskIg5xvoi+dTsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkX2p4tbBzChc for ; Sun, 04 Jan 2026 09:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a7f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 09:20:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 08cdcff58acb - main - crypto/openssl: update vendor update instructions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 08cdcff58acb2aec881e42c7f097d6492d864898 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 09:20:18 +0000 Message-Id: <695a30d2.a7f4.8a66139@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=08cdcff58acb2aec881e42c7f097d6492d864898 commit 08cdcff58acb2aec881e42c7f097d6492d864898 Author: Enji Cooper AuthorDate: 2025-10-11 21:12:55 +0000 Commit: Enji Cooper CommitDate: 2026-01-04 09:20:13 +0000 crypto/openssl: update vendor update instructions This change fills out the requirements for doing vendor updates, documents the new vendor update process, and guides whoever needs to do the next version update a bit better than the documentation did prior to this change so everyone can pitch in with version updates a bit better. Convert the document to Markdown while here to make it easier to render/print out the directions in a structured format. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53190 --- crypto/openssl/FREEBSD-upgrade | 122 ----------------------- crypto/openssl/FREEBSD-upgrade.md | 202 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 202 insertions(+), 122 deletions(-) diff --git a/crypto/openssl/FREEBSD-upgrade b/crypto/openssl/FREEBSD-upgrade deleted file mode 100644 index 86e65e8e07dd..000000000000 --- a/crypto/openssl/FREEBSD-upgrade +++ /dev/null @@ -1,122 +0,0 @@ - FreeBSD maintainer's guide to OpenSSL - ===================================== - - These instructions assume you have a clone of the FreeBSD git repo - main branch in src/freebsd/main, and will store vendor trees under - src/freebsd/vendor/. In addition, this assumes there is a "freebsd" - origin pointing to git(repo).freebsd.org/src.git. - -01) Switch to the vendor branch: - - $ cd src/freebsd/main - $ git worktree add -b vendor/openssl-X.Y ../vendor/openssl-X.Y freebsd/vendor/openssl-X.Y - $ cd ../vendor/openssl-X.Y - -02) Download the latest OpenSSL tarball and signature from the official - website (https://www.openssl.org/source/). - - $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-X.Y.Z/openssl-X.Y.Z.tar.gz) - $ (cd .. && fetch https://github.com/openssl/openssl/releases/download/openssl-X.Y.Z/openssl-X.Y.Z.tar.gz.asc) - -03) Verify the signature: - - $ gpg --verify ../openssl-X.Y.Z.tar.gz.asc ../openssl-X.Y.Z.tar.gz - -04) Unpack the OpenSSL tarball to the parent directory: - - $ tar xf ../openssl-X.Y.Z.tar.gz -C .. - -05) Copy to the vendor branch: - - $ rsync --exclude .git --delete -av ../openssl-X.Y.Z/ . - -06) Take care of added / deleted files: - - $ git add -A - -07) Commit: - - $ git commit -m "openssl: Vendor import of OpenSSL X.Y.Z" - -08) Tag: - - $ git tag -a -m "Tag OpenSSL X.Y.Z" vendor/openssl/X.Y.Z - - At this point the vendor branch can be pushed to the FreeBSD repo via: - - $ git push freebsd vendor/openssl-X.Y - $ git push freebsd vendor/openssl/X.Y.Z - - Note the second "git push" command is used to push the tag, which is - not pushed by default. - - It is also possible to push the branch and tag together, but use - --dry-run first to ensure that no undesired tags will be pushed: - - $ git push --dry-run --follow-tags freebsd vendor/openssl-X.Y - $ git push --follow-tags freebsd vendor/openssl-X.Y - - The update and tag could instead be pushed later, along with the merge - to main, but pushing now allows others to collaborate. - -09) Merge from the vendor branch: - - $ git subtree merge -P crypto/openssl vendor/openssl-X.Y - - A number of files have been deleted from FreeBSD's copy of OpenSSL. - If git prompts for these deleted files during the merge, choose 'd' - (leaving them deleted). - -10) Resolve conflicts. Remember to bump the version and date in - secure/lib/libcrypto/Makefile.inc and - crypto/openssl/include/openssl/opensslv.h. - -11) Diff against the vendor branch: - - $ git diff --diff-filter=M vendor/openssl/X.Y.Z HEAD:crypto/openssl - - Review the diff for any unexpected changes. - -12) Re-generate the assembly files: - - $ cd secure/lib/libcrypto - $ make cleanasm buildasm - -13) Update the appropriate makefiles to reflect changes in the vendor's - build.info files. This is especially important if source files have - been added or removed. Keep in mind that the assembly files generated - belong to sys/crypto/openssl, and will therefore affect the kernel as - well. - -14) If symbols have been added or removed, update the appropriate - Version.map to reflect these changes. - -15) Compare compilation flags, the list of files built and included, the - list of symbols generated with the corresponding port if available. - -16) Re-generate the manual files: - - $ tar xzf openssl-X.Y.Z.tar.gz - $ (cd openssl-X.Y.Z && ./Configure --prefix=/usr --openssldir=/etc/ssl && - make build_man_docs) - [...] - $ find openssl-X.Y.Z/doc/man/man1 -name '*.1' -exec cp {} secure/usr.bin/openssl/man/ \; - $ find openssl-X.Y.Z/doc/man/man3 -name '*.3' -exec cp {} secure/lib/libcrypto/man/man3/ \; - $ find openssl-X.Y.Z/doc/man/man5 -name '*.5' -exec cp {} secure/lib/libcrypto/man/man5/ \; - $ find openssl-X.Y.Z/doc/man/man7 -name '*.7' -exec cp {} secure/lib/libcrypto/man/man7/ \; - $ grep -nrF usr/local secure/lib/libcrypto/man secure/usr.bin/openssl/man - [correct the references to the prefix and OpenSSL directories] - $ git commit --amend secure/lib/libcrypto/man secure/usr.bin/openssl/man - - Review the diff and tree status for anything requiring attention. - -16) Build and install world, reboot, test. - -17) Test the legacy provider as well: (here with "test" as the password) - - $ echo test | openssl rc4 -provider legacy -e -a -pbkdf2 - enter RC4 encryption password: - Verifying - enter RC4 encryption password: - U2FsdGVkX1+JvhqxLMOvlxvTi1/h - -18) Commit and hope you did not miss anything. diff --git a/crypto/openssl/FREEBSD-upgrade.md b/crypto/openssl/FREEBSD-upgrade.md new file mode 100644 index 000000000000..1fc38c4dd17f --- /dev/null +++ b/crypto/openssl/FREEBSD-upgrade.md @@ -0,0 +1,202 @@ +# FreeBSD maintainer's guide to OpenSSL + +## Assumptions + +These instructions assume the following: + +- A git clone of FreeBSD will be available at `$GIT_ROOT/src/freebsd/main` with + an origin named `freebsd`. Example: + `git clone -o freebsd git@gitrepo.freebsd.org:src.git "$GIT_ROOT/src/freebsd/main"` +- The vendor trees will be stored under `$GIT_ROOT/src/freebsd/vendor/`. + +## Software requirements + +The following additional software must be installed from ports: + +- lang/perl5 +- lang/python +- net/rsync +- security/gnupg + +## Warning + +This is a long and complicated process, in part because OpenSSL is a large, +complex, and foundational software component in the FreeBSD distribution. A +lot of the overall process has been automated to reduce potential human error, +but some rough edges still exist. These rough edges have been highlighted in +the directions. + +## Process + +### Notes + +The following directions use X.Y.Z to describe the major, minor, subminor +versions, respectively for the OpenSSL release. Please substitute the values as +appropriate in the directions below. + +All single commands are prefixed with `%`. + +### Variables + +``` +% OPENSSL_VER_MAJOR_MINOR=X.Y +% OPENSSL_VER_FULL=X.Y.Z +% RELEASE_TARFILE="openssl-${OPENSSL_VER_FULL}.tar.gz" +% BASE_URL="https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VER_FULL}/${RELEASE_TARFILE}" +``` + +### Switch to the vendor branch + +``` +% cd "$GIT_ROOT/src/freebsd/main" +% git worktree add -b vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} \ + ../vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} \ + freebsd/vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +% cd "$GIT_ROOT/src/freebsd/vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +``` + +### Download the latest OpenSSL release + +The following instructions demonstrate how to fetch a recent OpenSSL release +and its corresponding artifacts (release SHA256 checksum; release PGP +signature) from the [official website](https://www.openssl.org/source/). + +``` +% (cd .. && fetch ${BASE_URL} ${BASE_URL}.asc ${BASE_URL}.sha256) +``` + +### Verify the release authenticity and integrity + +**NOTE**: this step requires importing the project author's PGP keys beforehand. +See the [sources webpage](https://openssl-library.org/source/) for more +details. + +This step uses the PGP signature and SHA256 checksum files to verify the release +authenticity and integrity, respectively. + +``` +% (cd .. && sha256sum -c ${RELEASE_TARFILE}.sha256) +% (cd .. && gpg --verify ${RELEASE_TARFILE}.asc) +``` + +### Unpack the OpenSSL tarball to the parent directory + +``` +% (cd .. && tar xf ../${RELEASE_TARFILE}) +``` + +### Update the sources in the vendor branch + +**IMPORTANT**: the trailing slash in the source directory is required! + +``` +% rsync --exclude .git --delete -av ../openssl-${OPENSSL_VER_FULL}/ . +``` + +### Take care of added / deleted files + +``` +% git add -A +``` + +### Commit, tag, and push + +``` +% git commit -m "openssl: Vendor import of OpenSSL ${OPENSSL_VER_FULL}" +% git tag -a -m "Tag OpenSSL ${OPENSSL_VER_FULL}" vendor/openssl/${OPENSSL_VER_FULL} +``` + +The update and tag could instead be pushed later, along with the merge +to main, but pushing now allows others to collaborate. + +#### Push branch update and tag separately + +At this point the vendor branch can be pushed to the FreeBSD repo via: +``` +% git push freebsd vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +% git push freebsd vendor/openssl/${OPENSSL_VER_FULL} +``` + +**NOTE**: the second "git push" command is used to push the tag, which is not +pushed by default. + +#### Push branch update and tag simultaneously + +It is also possible to push the branch and tag together, but use +`--dry-run` first to ensure that no undesired tags will be pushed: + +``` +% git push --dry-run --follow-tags freebsd vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +% git push --follow-tags freebsd vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +``` + +### Remove any existing patches and generated files. + +``` +% make clean +``` + +Please note that this step does not remove any generated manpages: this happens +in a later step. + +### Merge from the vendor branch and resolve conflicts + +``` +% git subtree merge -P crypto/openssl vendor/openssl-${OPENSSL_VER_MAJOR_MINOR} +``` + +**NOTE**: Some files may have been deleted from FreeBSD's copy of OpenSSL. +If git prompts for these deleted files during the merge, choose 'd' +(leaving them deleted). + +### Patch, configure, and regenerate all files + +The following commands turn the crank associated with the vendor release +update: + +``` +% make patch +% make configure +% make all +``` + +This process updates all generated files, syncs the manpages with the new release, +regenerates assembly files, etc. + +For now, any build-related changes, e.g., a assembly source was removed, a manpage +was added, etc, will require makefile updates. + +### Diff against the vendor branch + +Review the diff for any unexpected changes: + +``` +% git diff --diff-filter=M vendor/openssl/${OPENSSL_VER_FULL} HEAD:crypto/openssl +``` + +The net-result should be just the applied patches from the freebsd/ directory. + +### Make build-related changes + +**IMPORTANT**: manual adjustments/care needed here. + +Update the appropriate makefiles to reflect changes in the vendor's +`build.info` metadata file. This is especially important if source files have +been added or removed. Keep in mind that the assembly files generated belong in +`sys/crypto/openssl`, and will therefore affect the kernel as well. + +If symbols have been added or removed, update the appropriate `Version.map` to +reflect these changes. Please try to stick to the new versioning scheme in the +target OpenSSL release to improve interoperability with binaries compiled +dynamically against the ports version of OpenSSL, for instance. + +Compare compilation flags, the list of files built and included, the list of +symbols generated with the corresponding port if available. + +### Build, install, and test + +Build and install a new version of world and the kernel with the newer release +of OpenSSL. Reboot the test host and run any appropriate tests using kyua, +`make checkworld`, etc. + +### Commit and push From nobody Sun Jan 4 09: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 4dkXrN4B88z6MnHT for ; Sun, 04 Jan 2026 09: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkXrN3M0cz4D7j for ; Sun, 04 Jan 2026 09: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=1767520580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r0u8YpWQEcNAhzHo7wcxM5+CF/o2ns1E5rs36YY3I68=; b=tTanfDcAg01ZX4j+pgxb24HxG9zEoF4mBZpTYBWd9TX726XC/WV2h5vjzJn3l7tQHkyraz gtPj4uF8NojXZLq14tH/qrpU5HpP9/WnD8QnHd0fVvCw+n++sDMBw4KynVofAFnsr4CL2E bQQfGLeybEaG/UnCVTlEQPFC+3S8kT465FvX7qw0XErIvh3nIL3nueMzIc1K0p5d+r7O3o +zPctwARs09UXe6O2oMQ6fpYEuNAq9ej/vvhMX8OeMXa7ztdf8z5tBozNVQNDfISPHPiFk sRR41x+kTBsdpuybaBCcDPW+QIvFBDesGyuHoEUlJtYNoTaI4vNJPwCiCrWZRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767520580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r0u8YpWQEcNAhzHo7wcxM5+CF/o2ns1E5rs36YY3I68=; b=a92+kYTBr/Zyfthj6KaAbhy0L/KbVD9gvJk5NtB6aCyGBfGVUQWkooQFXDqFoD42RrXrB8 vNv5bFLMZUCrVoDXVdpc++JnduRp0B1rqPu6yq7LU38rzFbLgZJse9EXxnauBIcVgKsrkc wT5wsb+bnmRNjM/6dYkZGof80LNba7f4jQe+UFmRlvq0u9qZEgO4NkNpjEEb0gE+gG0Tq9 n82fkMJN8RGDSXHKUpYtS0N3rrPB+9t5YDGGqrmLLmkAImFWUy7vZMWdhNUm32HYbU1Npt 7g7eKlWQIrqKCN7ip3boeAQ7W/LxoUQskfAd24SO3JFboqVwFeWqt7d6ceCVcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767520580; a=rsa-sha256; cv=none; b=dV1S/h0YGAWLtOiazwADrSmz+3Pl4SeAsU8Kls9gxZigZeTfbRtfra1wJaWQcIKlVucfxE G30iHOf1LheoSnhjarBJnKOZYNus5tlIbe6WVHTQJsRhQHPJDjy5La1kgLLyDc5shHa0Ix 7okFLjj3XpeF5cC4JnMiwWLz5tm4zZKvOl5mmvKekTAL4WlsTA1+ziSWPBfHp5W7AzLqYI u2AjrTEad02sc9n/fJIZYKraK/gNeP8qUyxC5HdlaRlL5KUUjBPKt75EF9VZDdtQGT3lHR uAVrHVm48jXedW7t9xzp7kgiM//WuyZ79fkqkI2FObEIUib6JCAAMK+RlLT7QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkXrN2xsHzTKC for ; Sun, 04 Jan 2026 09:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id df94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 09:56:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 43b5a264c6f6 - main - linuxkpi: Add option to skip trailing newline in `lkpi_hex_dump()` List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43b5a264c6f665ac451102d828a8f51307efe626 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 09:56:20 +0000 Message-Id: <695a3944.df94.5a521490@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=43b5a264c6f665ac451102d828a8f51307efe626 commit 43b5a264c6f665ac451102d828a8f51307efe626 Author: Jean-Sébastien Pédron AuthorDate: 2025-08-09 10:28:27 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-01-04 09:45:19 +0000 linuxkpi: Add option to skip trailing newline in `lkpi_hex_dump()` This will be useful in the upcoming implementation of `hex_dump_to_buffer()` which doesn't add one. Reviewed by: bz, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51844 --- sys/compat/linuxkpi/common/include/linux/printk.h | 4 ++-- sys/compat/linuxkpi/common/include/linux/seq_file.h | 2 +- sys/compat/linuxkpi/common/src/linux_compat.c | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/printk.h b/sys/compat/linuxkpi/common/include/linux/printk.h index d2d197682782..e10656c8a1d0 100644 --- a/sys/compat/linuxkpi/common/include/linux/printk.h +++ b/sys/compat/linuxkpi/common/include/linux/printk.h @@ -48,7 +48,7 @@ int __lkpi_hexdump_printf(void *, const char *, ...) __printflike(2, 3); void lkpi_hex_dump(int(*)(void *, const char *, ...), void *arg1, const char *, const char *, const int, const int, const int, - const void *, size_t, const bool); + const void *, size_t, const bool, const bool); static inline void print_hex_dump(const char *level, const char *prefix_str, @@ -56,7 +56,7 @@ print_hex_dump(const char *level, const char *prefix_str, const void *buf, size_t len, const bool ascii) { lkpi_hex_dump(__lkpi_hexdump_printf, NULL, level, prefix_str, prefix_type, - rowsize, groupsize, buf, len, ascii); + rowsize, groupsize, buf, len, ascii, true); } static inline void diff --git a/sys/compat/linuxkpi/common/include/linux/seq_file.h b/sys/compat/linuxkpi/common/include/linux/seq_file.h index 47da16ab8688..3c7862890c67 100644 --- a/sys/compat/linuxkpi/common/include/linux/seq_file.h +++ b/sys/compat/linuxkpi/common/include/linux/seq_file.h @@ -115,7 +115,7 @@ seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type, int rowsize, int groupsize, const void *buf, size_t len, bool ascii) { lkpi_hex_dump(__lkpi_hexdump_sbuf_printf, m->buf, NULL, prefix_str, prefix_type, - rowsize, groupsize, buf, len, ascii); + rowsize, groupsize, buf, len, ascii, true); } #define file linux_file diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 03d866260dd9..c2bad1f28eaf 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1894,7 +1894,7 @@ void lkpi_hex_dump(int(*_fpf)(void *, const char *, ...), void *arg1, const char *level, const char *prefix_str, const int prefix_type, const int rowsize, const int groupsize, - const void *buf, size_t len, const bool ascii) + const void *buf, size_t len, const bool ascii, const bool trailing_newline) { typedef const struct { long long value; } __packed *print_64p_t; typedef const struct { uint32_t value; } __packed *print_32p_t; @@ -1978,9 +1978,11 @@ lkpi_hex_dump(int(*_fpf)(void *, const char *, ...), void *arg1, break; } } - ret = _fpf(arg1, "\n"); - if (ret < 0) - break; + if (len > 0 && trailing_newline) { + ret = _fpf(arg1, "\n"); + if (ret < 0) + break; + } } } From nobody Sun Jan 4 09: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 4dkXrP587fz6MnFs for ; Sun, 04 Jan 2026 09:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkXrP3s74z4Cxh for ; Sun, 04 Jan 2026 09:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767520581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vfhuD6Wm6hC+yl6YyVYfRKKTOPaIB4VB3997h8J3RM=; b=t58S07FNuxLT3DLEOTXHJDRtcyMZe24zXtLzdXvRs2gaOx0PX5OWU5v7j36xdjtrAY2Ocj UAnwaD+tBc1o4TJq4iZ7GEVeIzoN5MloCSeqhGHOyCboXylUBk86EdzQR7ek1gyWht4vdz 0vOxsgJvb5d8LQ0sEJiuNpsSqpVrYH01QsTZmRJOUbuBpxXL5X03isHA2WXLVzcWUJwyu3 +GUVj9omJ+xVisgmXDGNP9EhCdtwOFoUoKUKjD4BqRJkbeSwbFU6l0TBmmzeDRHU0w/17D FcDJjr8mrIB5i9xR9iZBzX8CStTO9mEm17w9dY0risDM/7NGpVC5418jb0XIhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767520581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vfhuD6Wm6hC+yl6YyVYfRKKTOPaIB4VB3997h8J3RM=; b=rDLx3qK+6WXcj+BJTW7eTrDNDN+dyB4vQM4kn/D6M6vlDEh/O8iMVPpIANcyUXD8DnSWM4 QlNrDcQ0J0LWU6gEqhAcDDXhPk4Ag2GC1gP8jqJDC4vSEj1GQcr2pclhNxud+AAU5OoCuu C0N125gSe4MVq+RXPlXSjpSSpZ4oCy8vBhGnkBS3Mw/gnnCrJ+mlhdZldeEqoM2EWn8mJU TD8eMusuIu0UvCbKBT8ydbpLYr/MdqIhR0dUX/mwz+Sr2gUGsKcNKdorCn0NV0HiA+iTXm eYnaAgCPMqA8F32D44Zhdor9H92BZ8mQ3+sXC6MfBSc1CqThU0Fuojl3jnQ6UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767520581; a=rsa-sha256; cv=none; b=p1o+ho73vKKHGBHZpiuroPuj6bkRakRk5ndYshPnsszWybeYp4XTJkom65aXOxvI8CuCHy yxm0gHeQwIWUrnvqj5OjtmRHeJRR7KVps3ZAcZ6nCkskhizxoIvu6JVlFWQnaBusjdgSup WOEvBfgQbo/8/xgb9JeX4pPF4VG8GYexL+SPc9aU85sTMjiBMqrcOl9CO3FcsadhwtDgqk SxbS4+DBZd5fd4SzXu2IpNjwlit/BGjEsifxnZq4mIbjefSI4CjcxB6CdbqY0+US36FY1Y nYo2o/0lnkQk7vDmS5RD9zr49Ny8rYpqCMWABcU41G2bIS06CLP82tIjgZkY7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkXrP3SNFzTcd for ; Sun, 04 Jan 2026 09:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bffa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 09:56:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: b1bef9f7e0e1 - main - linuxkpi: Add hex_dump_to_buffer() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1bef9f7e0e182a9eee222639ffc8af4883ec0fa Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 09:56:21 +0000 Message-Id: <695a3945.bffa.623ca786@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=b1bef9f7e0e182a9eee222639ffc8af4883ec0fa commit b1bef9f7e0e182a9eee222639ffc8af4883ec0fa Author: Jean-Sébastien Pédron AuthorDate: 2025-07-10 23:03:51 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-01-04 09:45:36 +0000 linuxkpi: Add hex_dump_to_buffer() This function prints a single line of hex dump to the given line buffer. The implementation relies on `lkpi_hex_dump()` to format the string. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51559 --- sys/compat/linuxkpi/common/include/linux/printk.h | 6 ++ sys/compat/linuxkpi/common/src/linux_compat.c | 70 +++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/printk.h b/sys/compat/linuxkpi/common/include/linux/printk.h index e10656c8a1d0..066ec900f04e 100644 --- a/sys/compat/linuxkpi/common/include/linux/printk.h +++ b/sys/compat/linuxkpi/common/include/linux/printk.h @@ -50,6 +50,12 @@ void lkpi_hex_dump(int(*)(void *, const char *, ...), void *arg1, const char *, const char *, const int, const int, const int, const void *, size_t, const bool, const bool); +#define hex_dump_to_buffer(buf, len, rowsize, groupsize, linebuf, linebuflen, ascii) \ + lkpi_hex_dump_to_buffer((buf), (len), (rowsize), (groupsize), (linebuf), (linebuflen), (ascii)) + +int lkpi_hex_dump_to_buffer(const void *buf, size_t len, int rowsize, + int groupsize, char *linebuf, size_t linebuflen, bool ascii); + static inline void print_hex_dump(const char *level, const char *prefix_str, const int prefix_type, const int rowsize, const int groupsize, diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index c2bad1f28eaf..8fc644241d79 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1986,6 +1986,76 @@ lkpi_hex_dump(int(*_fpf)(void *, const char *, ...), void *arg1, } } +struct hdtb_context { + char *linebuf; + size_t linebuflen; + int written; +}; + +static int +hdtb_cb(void *arg, const char *format, ...) +{ + struct hdtb_context *context; + int written; + va_list args; + + context = arg; + + va_start(args, format); + written = vsnprintf( + context->linebuf, context->linebuflen, format, args); + va_end(args); + + if (written < 0) + return (written); + + /* + * Linux' hex_dump_to_buffer() function has the same behaviour as + * snprintf() basically. Therefore, it returns the number of bytes it + * would have written if the destination buffer was large enough. + * + * If the destination buffer was exhausted, lkpi_hex_dump() will + * continue to call this callback but it will only compute the bytes it + * would have written but write nothing to that buffer. + */ + context->written += written; + + if (written < context->linebuflen) { + context->linebuf += written; + context->linebuflen -= written; + } else { + context->linebuf += context->linebuflen; + context->linebuflen = 0; + } + + return (written); +} + +int +lkpi_hex_dump_to_buffer(const void *buf, size_t len, int rowsize, + int groupsize, char *linebuf, size_t linebuflen, bool ascii) +{ + int written; + struct hdtb_context context; + + context.linebuf = linebuf; + context.linebuflen = linebuflen; + context.written = 0; + + if (rowsize != 16 && rowsize != 32) + rowsize = 16; + + len = min(len, rowsize); + + lkpi_hex_dump( + hdtb_cb, &context, NULL, NULL, DUMP_PREFIX_NONE, + rowsize, groupsize, buf, len, ascii, false); + + written = context.written; + + return (written); +} + static void linux_timer_callback_wrapper(void *context) { From nobody Sun Jan 4 09: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 4dkXrM4b9Pz6MnX4 for ; Sun, 04 Jan 2026 09: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkXrM2v57z4D5K for ; Sun, 04 Jan 2026 09: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=1767520579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMHw6wv1wsvIEzmmuzVDcvQIIJNsqMGgTtq/s+dgaZo=; b=g/e+yszFgvUiuLi42S4lV75DqpsH1yQLkuwtq3IZpc/XaqBZIZ75XDLYEpBKyUk1XnKoYW R3UTdDLo4pHms3MuRQgYy7CzAAiUQHuf4UtYrQw9F33FA1kIwpGK355skcy//HYY/sIsSM ZIBIPHLG8uuDTQiW0MQ5RMAVV9xjDvLliu0LS41R8NWt9DPHLjIT3T3gQQRnhNGr8IQM8D 5Owc/09ZUi06qc3u3NVPKCxJaKjYpJZWLzzSUvdshN7RjRaX2SACxaGJ7+JFd67z+oBBL5 F9CKNDPG6xGPRbLz+hYgUcAWtUebtPRYUQc8A9eMVxWtNJt75jdb8c280FXINw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767520579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMHw6wv1wsvIEzmmuzVDcvQIIJNsqMGgTtq/s+dgaZo=; b=g5abnjj8eGlxf4Lj6PzJg+4BUuXSP6XOabOrXB4he1eAR/oF+xHX5PRXNrJw2DyKE3D6fV WNPFKxI6pF+Kt6zE6zplRIg4FY1SbBg+tic9WDnuqJ3p08f+e0VhPR0x4MxonAZAQIa6OR 4z37R105/eScqo/meYD4YZp5i6ypPBjUN7HJKeRpWbPYPWskAbd0XupCbeVS9c2PPtMf1Q hZtcSgrJzUqL3hmxG29whw1h8I0luvjG3uglX+8pGukPfM1MGtR4USDPW3b12EUGL2EbL8 8OKR7jQRKjHjmD7SE2IsZTIoEuIW7zGw9kUMJkc35gfCTK5lXWBfqkCMetolPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767520579; a=rsa-sha256; cv=none; b=Sbalpr0nO+gLfye4/RghsXFIKLX1NZfTO63ykgtwsfebnmBsAbodrVQkDSh86Hp8596Q21 vaBkucFCSaXXX0KVwaWAsmHBxmywtu3MLDmJd2K3DJPSBlZEj+T9S+6Cr+pUD+BmqBfZ27 lWNWxcL79dY3F2bI76nspqRCptZugA2ISj/cPrmjxIoEkqRj2RGjO7PPJGd7vEpznWyDzC jBnW57BI6xbP0qyPQFfN0UASw1tGpilGegKtM9umw4wuXIUzu28MIYxjEOZuV9GQLSFPDg NpxS4K9BwuEYJQYZUIvlh0VnctnODjQsS37a0tEFZWhP35pk+z+Q9NJ61qGLGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkXrM25pzzDW8 for ; Sun, 04 Jan 2026 09:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id cd56 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 09:56:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 38d757b6c29c - main - linuxkpi: Avoid trailing whitespaces in lkpi_hex_dump() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38d757b6c29c990de72dc51ac123922d3f095f53 Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 09:56:19 +0000 Message-Id: <695a3943.cd56.2157529c@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=38d757b6c29c990de72dc51ac123922d3f095f53 commit 38d757b6c29c990de72dc51ac123922d3f095f53 Author: Jean-Sébastien Pédron AuthorDate: 2025-07-26 15:30:40 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-01-04 09:44:52 +0000 linuxkpi: Avoid trailing whitespaces in lkpi_hex_dump() We use the return value of the callback to track the number of bytes written. We use it to determine if a group of characters should be prepended with a whitespace. This way, we never add a trailing whitespace. We need to pay attention to the return value of the callback: if it is negative, it's an error and we return immediately. Otherwise, we would decrease the number of written bytes and possibly make it negative. Reviewed by: bz, christos Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51558 --- sys/compat/linuxkpi/common/src/linux_compat.c | 66 +++++++++++++++++++++------ 1 file changed, 53 insertions(+), 13 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 35430daf311d..03d866260dd9 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -1900,47 +1900,87 @@ lkpi_hex_dump(int(*_fpf)(void *, const char *, ...), void *arg1, typedef const struct { uint32_t value; } __packed *print_32p_t; typedef const struct { uint16_t value; } __packed *print_16p_t; const void *buf_old = buf; - int row; + int row, linelen, ret; while (len > 0) { - if (level != NULL) - _fpf(arg1, "%s", level); - if (prefix_str != NULL) - _fpf(arg1, "%s ", prefix_str); + linelen = 0; + if (level != NULL) { + ret = _fpf(arg1, "%s", level); + if (ret < 0) + break; + linelen += ret; + } + if (prefix_str != NULL) { + ret = _fpf( + arg1, "%s%s", linelen ? " " : "", prefix_str); + if (ret < 0) + break; + linelen += ret; + } switch (prefix_type) { case DUMP_PREFIX_ADDRESS: - _fpf(arg1, "[%p] ", buf); + ret = _fpf( + arg1, "%s[%p]", linelen ? " " : "", buf); + if (ret < 0) + return; + linelen += ret; break; case DUMP_PREFIX_OFFSET: - _fpf(arg1, "[%#tx] ", ((const char *)buf - - (const char *)buf_old)); + ret = _fpf( + arg1, "%s[%#tx]", linelen ? " " : "", + ((const char *)buf - (const char *)buf_old)); + if (ret < 0) + return; + linelen += ret; break; default: break; } for (row = 0; row != rowsize; row++) { if (groupsize == 8 && len > 7) { - _fpf(arg1, "%016llx ", ((print_64p_t)buf)->value); + ret = _fpf( + arg1, "%s%016llx", linelen ? " " : "", + ((print_64p_t)buf)->value); + if (ret < 0) + return; + linelen += ret; buf = (const uint8_t *)buf + 8; len -= 8; } else if (groupsize == 4 && len > 3) { - _fpf(arg1, "%08x ", ((print_32p_t)buf)->value); + ret = _fpf( + arg1, "%s%08x", linelen ? " " : "", + ((print_32p_t)buf)->value); + if (ret < 0) + return; + linelen += ret; buf = (const uint8_t *)buf + 4; len -= 4; } else if (groupsize == 2 && len > 1) { - _fpf(arg1, "%04x ", ((print_16p_t)buf)->value); + ret = _fpf( + arg1, "%s%04x", linelen ? " " : "", + ((print_16p_t)buf)->value); + if (ret < 0) + return; + linelen += ret; buf = (const uint8_t *)buf + 2; len -= 2; } else if (len > 0) { - _fpf(arg1, "%02x ", *(const uint8_t *)buf); + ret = _fpf( + arg1, "%s%02x", linelen ? " " : "", + *(const uint8_t *)buf); + if (ret < 0) + return; + linelen += ret; buf = (const uint8_t *)buf + 1; len--; } else { break; } } - _fpf(arg1, "\n"); + ret = _fpf(arg1, "\n"); + if (ret < 0) + break; } } From nobody Sun Jan 4 13:21: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 4dkdNZ75P7z6N1kj for ; Sun, 04 Jan 2026 13:21: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkdNZ55drz3Knl for ; Sun, 04 Jan 2026 13:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lzdiFuTQNdoePsgsjYpduBi8TS5V3BE/UGSJMUM4FsY=; b=YF4MLzDvD9koQZFkycLTB62rBCnLIhlYVijWu7GnuXiO7vSkmzO/c88S5/1dBZGq5azFhs GzjQuBM7aUhpmV/WX6W72sRvSrX7YfNtw+WPvUeTBiuCrqETnbmH+g6TsJbfx5Fk1KjqtW 5TBb97dfF1yHVCeLzu5AkCranL8D2jtjq3yLDwRvQUEXh2ZfyQtmhkz7B1LP9ZA2WPImfZ SstuCGRUrmBbidXpXuY0fx8NigNozOSr56cvGEUMj2AFoepQ4dEDZt8DfhexpWbZ442RM2 dQnZnI3emcmJyldcsMBLxFzAQphArr/+C0Wv95Mqkieog8dWbLpuV9g4e7wY0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lzdiFuTQNdoePsgsjYpduBi8TS5V3BE/UGSJMUM4FsY=; b=WkcX/o8GC3d7wFsDbSykTxiJ6Wn3YZZCdTv6d3pmuxJGjBW4BsHW+spk4vphb8XrQLsWN4 CV5uZJsekh+1qQ7SmMHUEpxnF7VIJOuY6wFja3TVxgnlW4wc+gtWcA84IAGl4uRwKPCxtU +P1TeKAbt3+KuZ9pGi8WT5+8OgOeLBDn2/44AZiKUXMGgycBNu1P0e8U6eK7utBkixnu4I Y6Cv8V3zTA6zwqikL1VT9z38OsKTyOkCTSL/TxWyWoTuWMZ5RBM6V5AmwNsFCz76YaWdqd s+sBD0vIMhOAU3tSXtHg5mABKB1hNf3nSq5LeEUFWOXOO4eHLeD1AYZDBDO9rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767532862; a=rsa-sha256; cv=none; b=dhpt2wwol+ZI7FOw6tbhDolJVFrYsgNX7u8Yb5r+tVpPsoSuG2gooyS2pouwYf/B88uQMY C6XhCw7x/LQ76Cn1CY1/cz7XUCNGf/rHc+uEmZnxyVTpJk8LwUoS8M+agYnSUksoF//vn7 bQXIwyzZSQHHLKhJyIrRRjrYEHfROFW2dQUQoqmk+JX5YCQZzPSO5hwW2JTld1bkwF2ytW OBK1JHub3zZMW8T3V0KjEWvKUHgCLhQB3QiTmgtqyZgrMDpqdqSUVzncsd3/tgumIdGI4+ NHoc1MnDZwtS5OmLdD4MmWNyQkWG5hg4F4aBntTrkbhTg0KPVRi399D/La0aRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkdNZ4SVZzcYw for ; Sun, 04 Jan 2026 13:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a4b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:21:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 9595055ae749 - main - loader.efi: only use firmware provided Blt on GOP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 9595055ae7494997bb07b4aaed544f88ac4c5e7f Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:21:02 +0000 Message-Id: <695a693e.3a4b0.7bba4b46@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=9595055ae7494997bb07b4aaed544f88ac4c5e7f commit 9595055ae7494997bb07b4aaed544f88ac4c5e7f Author: Ahmad Khalifa AuthorDate: 2026-01-04 13:15:37 +0000 Commit: Ahmad Khalifa CommitDate: 2026-01-04 13:15:37 +0000 loader.efi: only use firmware provided Blt on GOP gfx_state.tg_private points to a EFI_GRAPHICS_OUTPUT_PROTOCOL only when using GOP. The firmware provided Blt functions on UGA platforms have been observed to not work on old MacBooks, and are likley hit or miss anyways as UGA has been deprecated since 2006. Reviewed by: tsoome PR: 291935 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54432 --- stand/common/gfx_fb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index eb41c51c50b6..d99d9b7a868f 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -83,6 +83,7 @@ */ #include +#include #include #include #include @@ -856,7 +857,7 @@ gfxfb_blt(void *BltBuffer, GFXFB_BLT_OPERATION BltOperation, int rv; #if defined(EFI) EFI_STATUS status; - EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = gfx_state.tg_private; + EFI_GRAPHICS_OUTPUT_PROTOCOL *gop; EFI_TPL tpl; /* @@ -866,7 +867,10 @@ gfxfb_blt(void *BltBuffer, GFXFB_BLT_OPERATION BltOperation, * done as they are provided by protocols that disappear when exit * boot services. */ - if (!ignore_gop_blt && gop != NULL && boot_services_active) { + if (gfx_state.tg_fb_type == FB_GOP && !ignore_gop_blt && + boot_services_active) { + assert(gfx_state.tg_private != NULL); + gop = gfx_state.tg_private; tpl = BS->RaiseTPL(TPL_NOTIFY); switch (BltOperation) { case GfxFbBltVideoFill: From nobody Sun Jan 4 13:21:01 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 4dkdNY6xc3z6N1xb for ; Sun, 04 Jan 2026 13:21: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkdNY4y8jz3Kcb for ; Sun, 04 Jan 2026 13:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lAv+hbKvTcOurk0jRFovSK+co1Nhrfz6IlrJcjy0IjQ=; b=CMzbcqDHuk8kvvfYKSb+FOn/kDUYUpN33z0ttzPkxfbWQO6ScKeK0HszwAy0/lMvpf/qLf 7WD8Zf5mFGicJZCcqQy03f7RTcxabNjbrHsK1eUx0SIFYBOnsQKt/Wnsm/SzurfR4FenMB RKB0RJmo49fv2FvlJaYW1eVY+PBXZQWY+amtGhKoXAxgIE9yBpZfPJek2/KCY+BjDHNBV+ poXk3316gAeYXHjmowkhHLbMzVZ/nZGvndoFl1oN6nEooKXIELemwHNTcjVU4S1MumIKSj zbKLBRVKJpcBUd4DUNxLQkTbQMiofpOQbDLpWwikaNaA/dH4+CuV+2BPov/zaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lAv+hbKvTcOurk0jRFovSK+co1Nhrfz6IlrJcjy0IjQ=; b=rW3jijNQpE5+FzflhVb/aUL7uzE/nGfwPctQvD+Napw8K5wn7yulvr0n3ikHJmT7m20pf/ 3rkn9Qa5wgYfEcYSYIOpkMMCWY+fr/oDLlwXMXx4fEcgHdtz7I9WCM3E3a3vM/mZe7V/Wv hCCmWD/Sa7Ysqe6ZH4RkPUvGp1UDaTEF7YtXUq+eyVJBMbcfL10Am8t7JocVdj8gXymQGb y7XtMWgUW6rWWatF7fLIC7AcXuieLZc/J6lUSEowjNE1khuicCXzmt+iXNPQ8cu86tdvDO h5hjCRWv91aPgTQc8Dv8n3cLXQcfGNDNZnBaDYSZKIZaEVnzRJ2KF3NEklTjTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767532861; a=rsa-sha256; cv=none; b=yzVEm0fOnQAIiwQdkKXRqv4haqXTmImixOxROkVM2p2Lyddk4mbid0Sdg0DGRY7n1AEIrX ExOo1ZJnNpekqBlvr+pamKxs5qmnCZY7S4E1DTibDc22OWrwaAQnO1NOGbFsQ3Jw76sfGd TK3OM4sgfaGcLajcxRmVAEjEq0rZAZnakSDNN8kqneNeuae5UQLsCumJJsNx8PSmKKd4pr 704uA1wargirok+EKvD3kIvKupMnnckz7JNscMNfpkQu8Mf3mDi/+/kwY8zYpfZTqGtIWi z3PaLqwfAqUMOOoMtxEV/quhiNpLaAB7jTKweAJHgrgX1ai2YGLlIVy6U8y94A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkdNY46Cyzbp8 for ; Sun, 04 Jan 2026 13:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39cc4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:21:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 5d85dde27b47 - main - loader.efi: probe for UGA if GOP isn't 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d85dde27b4769604fc108b89328607e70e767ed Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:21:01 +0000 Message-Id: <695a693d.39cc4.8c196a6@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=5d85dde27b4769604fc108b89328607e70e767ed commit 5d85dde27b4769604fc108b89328607e70e767ed Author: Ahmad Khalifa AuthorDate: 2026-01-04 13:15:02 +0000 Commit: Ahmad Khalifa CommitDate: 2026-01-04 13:15:02 +0000 loader.efi: probe for UGA if GOP isn't found Probe for UGA instead of returning early if we can't find GOP. Reviewed by: tsoome PR: 291935 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54431 --- stand/efi/loader/framebuffer.c | 74 ++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/stand/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c index 08834aa7106b..dc0047de1116 100644 --- a/stand/efi/loader/framebuffer.c +++ b/stand/efi/loader/framebuffer.c @@ -590,53 +590,55 @@ efi_find_framebuffer(teken_gfx_t *gfx_state) if (EFI_ERROR(status)) free(hlist); } - if (EFI_ERROR(status)) - return (efi_status_to_errno(status)); - - nhandles = hsize / sizeof(*hlist); - /* - * Search for ConOut protocol, if not found, use first handle. - */ - gop_handle = NULL; - for (i = 0; i < nhandles; i++) { - EFI_GRAPHICS_OUTPUT_PROTOCOL *tgop; - void *dummy; + if (EFI_ERROR(status)) { + status = BS->LocateProtocol(&uga_guid, NULL, (VOID **)&uga); + if (status == EFI_SUCCESS) { + gfx_state->tg_fb_type = FB_UGA; + gfx_state->tg_private = uga; + } else { + return (efi_status_to_errno(status)); + } + } else { + nhandles = hsize / sizeof(*hlist); - status = OpenProtocolByHandle(hlist[i], &gop_guid, (void **)&tgop); - if (status != EFI_SUCCESS) - continue; + /* + * Search for ConOut protocol, if not found, use first handle. + */ + gop_handle = NULL; + for (i = 0; i < nhandles; i++) { + EFI_GRAPHICS_OUTPUT_PROTOCOL *tgop; + void *dummy; + + status = OpenProtocolByHandle(hlist[i], &gop_guid, + (void **)&tgop); + if (status != EFI_SUCCESS) + continue; - if (tgop->Mode->Info->PixelFormat == PixelBltOnly || - tgop->Mode->Info->PixelFormat >= PixelFormatMax) - continue; + if (tgop->Mode->Info->PixelFormat == PixelBltOnly || + tgop->Mode->Info->PixelFormat >= PixelFormatMax) + continue; - status = OpenProtocolByHandle(hlist[i], &conout_guid, &dummy); - if (status == EFI_SUCCESS) { - gop_handle = hlist[i]; - gop = tgop; - break; - } else if (gop_handle == NULL) { - gop_handle = hlist[i]; - gop = tgop; + status = OpenProtocolByHandle(hlist[i], &conout_guid, + &dummy); + if (status == EFI_SUCCESS) { + gop_handle = hlist[i]; + gop = tgop; + break; + } else if (gop_handle == NULL) { + gop_handle = hlist[i]; + gop = tgop; + } } - } - free(hlist); + free(hlist); + if (gop_handle == NULL) + return (ENXIO); - if (gop_handle != NULL) { gfx_state->tg_fb_type = FB_GOP; gfx_state->tg_private = gop; if (edid_info == NULL) edid_info = efifb_gop_get_edid(gop_handle); - } else { - status = BS->LocateProtocol(&uga_guid, NULL, (VOID **)&uga); - if (status == EFI_SUCCESS) { - gfx_state->tg_fb_type = FB_UGA; - gfx_state->tg_private = uga; - } else { - return (efi_status_to_errno(status)); - } } switch (gfx_state->tg_fb_type) { From nobody Sun Jan 4 13:21: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 4dkdPc6S6Mz6N1xs for ; Sun, 04 Jan 2026 13:21: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkdPc4Hvgz3LBT for ; Sun, 04 Jan 2026 13:21:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8PMVRzjnfQrOqJt4GOuGVqGkrhZMWqWTd8k8jbCN+c=; b=M4MLu+CcLqtGJQuIDEs+InxV4k8FQX5pk74et5xWk4sfrA+avTBTbeinh2+dK8ouvmWVQW DzPu8QPoOp1xTzsX9XfSOPOtPeI1J+A4QOWE76F2RWol1IfaUzW/hWf7AfjdcsonF1xUH5 bBxkV2cJVC7//fb0YaEsge0iAZAoUfWsTxNEtalJodsoXg1EycagFZf9OIkJotY2NVWWNc aCnRdvhQ6bGCU4AI1k8xBx/zv8NO08xqJO/7gn5LAyzh/knsynFB5Vi35vvGXqrVr2KaU/ e95wzsHQ6alXJpXrGO6jhCneuQq4LT4XL5FwNhsywfLCj2J8CM8GXEiNjJVPjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767532916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8PMVRzjnfQrOqJt4GOuGVqGkrhZMWqWTd8k8jbCN+c=; b=R/CS/5GYmEMRSgFHuZw2tQprOboXEBMvyOSY9VkKLKc4f2OmoOJ/rsdUa895tdQYMmeN8R b3WRI5U5/nK5yifszQ1sszQ2z2gkC2IaMMSNcWy7MdhbZOmDhCzo47Mm5MBSoQZu7BMlQ7 l90RPrgB7SUBGHKejV0W5dgL1LQXu6dbE6g8I2MIl0xkMw9Ca1Zrm7dveukQhJno3dg6ST bMR+kElEXuYPqGZilBAJFZWV/KSJnW19a61z8wZgbTznrKm2lgfT1U/fUemAEe1cCgXBPg w/OPzJoJQY26xTZyCqkgIZQgMgxlm2wFYkND7fpX2kv7upemXO+dbkkiiKsETA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767532916; a=rsa-sha256; cv=none; b=l7r6hDCWf44lt1GI3d4JDpyRNleOKrHAYjanHd/FSRKxcj2fYBtfxf93dPzTQakNQ/GlPG N8ZMpzjDMKGz3MV9GVo5VV4B/HnEbFx1y5OxqQoG+4T7b6txJ9T24ZxxrzWYW77nbRW8Hz bCjQHFJ74fQ9BxIpiohVtQdzTvdzDj1hgBsaWd11WcOzWzCwB4x/cWhZEv9IwDSqHX0DYl tyPUqYS7CRht5yO0RH4zfbQH9p73bKLFNv62E+cg2a66gTymf4if7dPZB9/r2zCefm4hp3 EolMjjuQV7vS2Zw7fI621rjnOsZACKM2KONS4zn5By2W/4VtJ0LrIEDXnImu5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkdPc3YZKzc4D for ; Sun, 04 Jan 2026 13:21:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3967a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 13:21:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 2f83319214d9 - main - libc/amd64: fix stpncpy.S 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: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f83319214d9adb8ab7a77e35d1014658b3f9cae Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 13:21:56 +0000 Message-Id: <695a6974.3967a.494e6935@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=2f83319214d9adb8ab7a77e35d1014658b3f9cae commit 2f83319214d9adb8ab7a77e35d1014658b3f9cae Author: Robert Clausecker AuthorDate: 2025-12-18 23:37:33 +0000 Commit: Robert Clausecker CommitDate: 2026-01-04 13:21:41 +0000 libc/amd64: fix stpncpy.S again The previous fix introduced a regression on machines without the BMI1 instruction set extension. The TZCNT instruction used in this function behaves different on old machines when the source operand is zero, but the code was originally designed to never trigger this case. The bug fix caused this case to be possible, leading to a regression on sufficiently old hardware. Fix the code by messing with things such that the source operand is never zero. PR: 291720 Fixes: 66eb78377bf109af1d9e25626bf254b4369436ec Tested by: cy Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D54303 --- lib/libc/amd64/string/stpncpy.S | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/libc/amd64/string/stpncpy.S b/lib/libc/amd64/string/stpncpy.S index 764ee1d4008c..2efadc97a435 100644 --- a/lib/libc/amd64/string/stpncpy.S +++ b/lib/libc/amd64/string/stpncpy.S @@ -36,9 +36,7 @@ .set stpncpy, __stpncpy ARCHFUNCS(__stpncpy) ARCHFUNC(__stpncpy, scalar) -#if 0 /* temporarily disabled cf. PR 291720 */ ARCHFUNC(__stpncpy, baseline) -#endif ENDARCHFUNCS(__stpncpy) ARCHENTRY(__stpncpy, scalar) @@ -93,7 +91,6 @@ ARCHEND(__stpncpy, scalar) /* stpncpy(char *restrict rdi, const char *rsi, size_t rdx) */ ARCHENTRY(__stpncpy, baseline) #define bounce (-3*16-8) /* location of on-stack bounce buffer */ - test %rdx, %rdx # no bytes to copy? jz .L0 @@ -225,8 +222,8 @@ ARCHENTRY(__stpncpy, baseline) /* 1--32 bytes to copy, bounce through the stack */ .Lrunt: movdqa %xmm1, bounce+16(%rsp) # clear out rest of on-stack copy - bts %r10, %r8 # treat end of buffer as end of string and %r9d, %r8d # mask out head before string + bts %r10, %r8 # treat end of buffer as end of string test $0x1ffff, %r8d # end of string within first chunk or right after? jnz 0f # if yes, do not inspect second buffer @@ -235,10 +232,10 @@ ARCHENTRY(__stpncpy, baseline) pcmpeqb %xmm1, %xmm0 # NUL in second chunk? pmovmskb %xmm0, %r9d shl $16, %r9d - or %r9d, %r8d # merge found NUL bytes into NUL mask + or %r9, %r8 # merge found NUL bytes into NUL mask /* end of string after one buffer */ -0: tzcnt %r8d, %r8d # location of last char in string +0: tzcnt %r8, %r8 # location of last char in string movdqu %xmm1, bounce(%rsp, %r8, 1) # clear bytes behind string lea bounce(%rsp, %rcx, 1), %rsi # start of string copy on stack lea (%rdi, %r8, 1), %rax # return pointer to NUL byte From nobody Sun Jan 4 22:48: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 4dkszR2Gy9z6N0J2 for ; Sun, 04 Jan 2026 22:48: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkszR1cpYz3ZNf for ; Sun, 04 Jan 2026 22:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767566915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzD0FzHFY4Vlr8/ZL1j/anGSZjbNYVZL/JWe3KjgEvg=; b=TISk0nQt+nuSwoXbyF2s6vulBov8N/v2+3PiEkPddVU1fBQoW86iJoTl4U0OiWVkCLmkfT IiLwfAsKFNAOweFNs++NUKj6t0fJr/VJJ4cmv8YGo6IMHCeTJwJ1OT8iu7Fi2y2t5I2GaK H7+n2OQ/5TxMwKUSsAtEpqc0u6f6/9d6mheO/4OMj+d5zAhN3UZI0OlTv5DSa9FJ8B0ulC kMOoijl3LqPmh1d8567E0+NSFTfKukoCXzlSFzkzah1zGvQaK2ZZ9jZMz7OGbq1ZuMuFlW YRk5CE+lvoqhMgCsSJbvyVpUrPXoKByDWQzx96wwwXGCiCsC4G9nqrNfyL2yPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767566915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzD0FzHFY4Vlr8/ZL1j/anGSZjbNYVZL/JWe3KjgEvg=; b=k9gj2nF1U4LQrVoPDL1/s+JS/ft+9jeyle0ny5LA9xmpt5IfkmnluIZaIpuWUv2qUWOQBp DNgMvfrDB8yh0s3F/rve2FFIOz4GVvxok+2DapmEfUAppt/LnJ3RIKrv1lxqeE4wU8AmgO 5EQ1LhXK00aS2tMIqwqEa5d7TQ9jsn52+Mzt5rhF8ROigVppPOs+MR7HrKiWy/IyG2r89k Kf1+axRM06UJUQ2LIcZ+kltpQZzKnO/8KpvEBRoR6psJSG8RixFteHh/DKEmv8FnggIchC Re21QLcGrmxZMnkXyoKu6MMX9dBUYmlloUTWHxWDMywoiS6GtIXE8eITGraJFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767566915; a=rsa-sha256; cv=none; b=VGpGHYltBkh1tCEN6PoSRwe2H+dxsjCgARI/7V55xpD/ZfSxE5KWpJD8sBon1gIoaMqORf KWGJ20uepbuM7lHybPLzLeoMhV/4rFa4+SygstmshPc/McNVEtHd1H4QQmnnVCro/Hn1I3 ywyTpt3ysYMUnXaPoVevQvitLobyAP7RYylEfC85qqHGBnQQBIKhdwzlFImDn7CYlowmrm 9Ol7KIqIWL2fVtatIBpF/RKBy1gmUBIKtZLApmavS5RTkQ/BnusVG9QD7qidSbrHP1e+Xe TFU68Ekt1T70VI7xPbxUc05MyzsUXLv2nt7UlV/DaqtHLikzQ2A9pkF6XrVbjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkszR18mXzvMw for ; Sun, 04 Jan 2026 22:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20dd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 22:48:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9c923575606b - main - vm/vm_object.h: clarify the OBJ_ONEMAPPING semantic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 9c923575606bbd29dcf0ec3384150d2d67136cbb Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 22:48:35 +0000 Message-Id: <695aee43.20dd6.e22f3b6@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9c923575606bbd29dcf0ec3384150d2d67136cbb commit 9c923575606bbd29dcf0ec3384150d2d67136cbb Author: Konstantin Belousov AuthorDate: 2025-12-31 22:26:38 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-04 22:47:51 +0000 vm/vm_object.h: clarify the OBJ_ONEMAPPING semantic Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D54459 --- sys/vm/vm_object.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 98afb93f8389..cd1d10d4fb89 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -197,8 +197,9 @@ struct vm_object { #define OBJ_SPLIT 0x00000400 /* object is being split */ #define OBJ_COLLAPSING 0x00000800 /* Parent of collapse. */ #define OBJ_COLORED 0x00001000 /* pg_color is defined */ -#define OBJ_ONEMAPPING 0x00002000 /* One USE (a single, non-forked) - mapping flag */ +#define OBJ_ONEMAPPING 0x00002000 /* Each page is allowed to have at most + one managed mapping, all in the same + vm_map */ #define OBJ_PAGERPRIV1 0x00004000 /* Pager private */ #define OBJ_PAGERPRIV2 0x00008000 /* Pager private */ #define OBJ_SYSVSHM 0x00010000 /* SysV SHM */