From nobody Mon Nov 17 14:46:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d99Yp1ts0z6HLtc; Mon, 17 Nov 2025 14:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d99Yp1FqQz3C1n; Mon, 17 Nov 2025 14:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9zTwDPBR9n5lPMaiWfJfc+py4UjOYvSiSsUpqcCN7XQ=; b=PhrcnAwXWxr8J9FsbcinikXV6AzayTl6dqC6McTyd24RNZQJQ1GZTgRd/EP6dHpmApHY0q ObgiGTYsP1RjT4D4TMZhqHQbI9i+ygGxk+S5WyNtG0VJCq33P1n9YNzfUXXF7Z4sLLLKxO dnm2HMD8MqA4XVX0R4LoEuFk2WOWmlEqpJFj9xWilDS6Rk9gSuLvKQYlI4EDbm6bbFxiUs 8LDis3HKAL/RFXMhCn3mFy8NoXrUKbM19vKP5yzYDPX7OAVz84E5iAGi1USqkta2cP4ojo dXoxvOrBXT7p9Vv4DdbCqMdRw6bLTxWgOQioyfgStDPZYBRDTqDqR62ekZEZKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9zTwDPBR9n5lPMaiWfJfc+py4UjOYvSiSsUpqcCN7XQ=; b=XsJKwVee42XZaWC6GdhxPiuu+2EH8I0i2FlNRjMAUBaTd6ZeUDQLE7NL/0WrZ9YdPT0XA9 6tKD0iOXXtccp6dqrko55FpFvVCk+eDIowLY//cD2SGiV3BJp9T4OPSoMIOdKztMOFUgXz 9dlD0frDxBZJAHcjsYRQLWx5wQNgqDI1uqTWeqYggoRt9jIekMqORAZDGpn4kUtNLPg6cX WUwr8p1FhQCAq5d7vdpa1geYJU28jERr35Z+pykWqlD2oe8JhBlYHsud478R6iC70fuC+R xOKG9eBHme8BFjNLuJeyqiivmWjWuvfbimRlRh2Pm2aoIo4VeALRcsllAXD6iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763390814; a=rsa-sha256; cv=none; b=ReTK5u87FFWZVECYXGW2sXeD414TCZMex8X5pHQHF/72CA6G+McF6KCJnKWyqNMx+5dnCN DURTfmLdjK2E1Q4HUXXS+/JGwupXV3NDZUA1pxHV0yS4E7VDqxFCPZ9YsfrkLHJuCEsuIP 0Dkoo9QUL05OBWJmGi+rMDFylofh27a6RM3tPx/fA/8F4oWMpYyIFK/U2rtJH+QjOYpMLS c/yyXHi++L9CU6SfnpoUM3dca6dvsfb/ptqFMJVLmiqy4cXmYLKgBZ1imntfunOIQI8QPP ChVUHITy+OIvwtaxnS0x05I0B1wrpfxFvi1MxcZUzSy9dMSvWL/kDsyipE1ppg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d99Yp0g7bz1Qwv; Mon, 17 Nov 2025 14:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHEksLu099239; Mon, 17 Nov 2025 14:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHEksQL099236; Mon, 17 Nov 2025 14:46:54 GMT (envelope-from git) Date: Mon, 17 Nov 2025 14:46:54 GMT Message-Id: <202511171446.5AHEksQL099236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cf3e1dc5f59e - stable/15 - newfs_msdos: Improve error messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cf3e1dc5f59e13252ef314bd4f72e19c38115840 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cf3e1dc5f59e13252ef314bd4f72e19c38115840 commit cf3e1dc5f59e13252ef314bd4f72e19c38115840 Author: Ed Maste AuthorDate: 2025-11-09 19:43:50 +0000 Commit: Ed Maste CommitDate: 2025-11-17 14:46:37 +0000 newfs_msdos: Improve error messages - Report overly long OEM string as too long, not just "bad". - Use warn instead of warnx for open or ftruncate failure to report the error string. Reviewed by: se Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53649 (cherry picked from commit dbb34d496708a37763d3d8bf6782991dee10d17e) --- sbin/newfs_msdos/mkfs_msdos.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index dcc2bb982efc..a570d92cd17b 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -264,7 +264,7 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) goto done; } if (o.OEM_string && strlen(o.OEM_string) > 8) { - warnx("%s: bad OEM string", o.OEM_string); + warnx("%s: OEM string too long", o.OEM_string); goto done; } if (o.create_size) { @@ -274,11 +274,11 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) } fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644); if (fd == -1) { - warnx("failed to create %s", fname); + warn("failed to create %s", fname); goto done; } if (ftruncate(fd, o.create_size)) { - warnx("failed to initialize %jd bytes", (intmax_t)o.create_size); + warn("failed to initialize %jd bytes", (intmax_t)o.create_size); goto done; } } else if ((fd = open(fname, o.no_create ? O_RDONLY : O_RDWR)) == -1) { From nobody Mon Nov 17 14:48:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d99cB0tnnz6HLV4; Mon, 17 Nov 2025 14:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d99cB0338z3CDv; Mon, 17 Nov 2025 14:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rUuKqRkOVLYBx0uTXsH1zkWel88y6h+A6bsQG+I/PWI=; b=Eqja2FR4tvN+oDD20PfpLgXHgvP1KVLMwBz0QXjMsvj+x1SnFDh8d4E9z58PsYQ9jp90U1 6kuYDmL0Sj/YFWlVpSdZsg/zgLBsCiw1RwlV2CIXEkyf1iuUa/fumD6+HBp8nXut1Sk495 V/6qun5qDoxk5Nhx3W0MrbjdcNCzyMfqJVtIBdeLrQ/EQQSi/94h4KSwJ/9QPojW3V7Oq/ phqoxKsm1RjpCbW13W2UsqguGfCdQOQbDxZdvsYxXfgktdc7d1rLAUEubos0Psb1svYIcP nrQxqOQwI1lHLNZp3VhBGF4/7S45/FBwZe/vWB5NyrHpPRYHYNu8CaA5HwBmwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rUuKqRkOVLYBx0uTXsH1zkWel88y6h+A6bsQG+I/PWI=; b=bgwqU1nvuo+zsA7yWem81ZGJoZ3HdVP0KTD4vk+7noiew5ESPtFnLfLvZ2d8RGt9G2crfF wDWlP0g2MhEB4GZZVUyulI7XwHmcBqHWcMcdL5YdZPo9b9+17zCM6Q9CWocly3Y/onf/vi AS9TOWMOtDZoo0vVmgY8LhiIrehyBMQM8jOoJ4Va9w0k443SJ9ESrR9KiAw4fnAtPssIZn PM1WFbtlOlJfeb0GQtZiWVmD9BRisu8rVIK3iqiIP1Y8XtKo/hr5YYFlc6o6cjsoRkhZx/ YUOoQHzqvfYLQD86TTPNjl0vjzCtad2JFSu+uOmTWpPtRcxhLwOQ3NPsAECuWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763390938; a=rsa-sha256; cv=none; b=QxoibRf4mz52XlVHCBDGGJuG90G+524aw0/d1IgdUBmMASgoKtMbPSK1/ee7k+ESFn7oTK dSOQl6jJr0Ct64iF4z3L++iMEsVQp2zqCdFTham9wyRlUuqyQiDomeEodfeyTWp0tMKp4O Lw+Nbg1LyYTyB9ixtgbtaxl76ubFMknmu9ZjLwfQ4AfdSpks2m+XK6keRIw2O/PwCmb85q gTjJ+TmEsUlle6DkeM7geCKlTZi92TzhVFOnh/zNLNJYVhNxDoM+/VJJh626gvjMpX3lDx MeuDq93fZuGvCJk2x0kiitTr6QPzCF+qNJ7Q9OVIb6dUaWaEKK4ctH5HMsPr/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d99c96S2Kz1RPP; Mon, 17 Nov 2025 14:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHEmvR9099937; Mon, 17 Nov 2025 14:48:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHEmvll099934; Mon, 17 Nov 2025 14:48:57 GMT (envelope-from git) Date: Mon, 17 Nov 2025 14:48:57 GMT Message-Id: <202511171448.5AHEmvll099934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3602181372ab - stable/14 - newfs_msdos: Improve error messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3602181372abc0aa164b5024c6269720e7896b10 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3602181372abc0aa164b5024c6269720e7896b10 commit 3602181372abc0aa164b5024c6269720e7896b10 Author: Ed Maste AuthorDate: 2025-11-09 19:43:50 +0000 Commit: Ed Maste CommitDate: 2025-11-17 14:48:41 +0000 newfs_msdos: Improve error messages - Report overly long OEM string as too long, not just "bad". - Use warn instead of warnx for open or ftruncate failure to report the error string. Reviewed by: se Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53649 (cherry picked from commit dbb34d496708a37763d3d8bf6782991dee10d17e) (cherry picked from commit cf3e1dc5f59e13252ef314bd4f72e19c38115840) --- sbin/newfs_msdos/mkfs_msdos.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index 065e3c5f4192..3600755f30c3 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -264,7 +264,7 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) goto done; } if (o.OEM_string && strlen(o.OEM_string) > 8) { - warnx("%s: bad OEM string", o.OEM_string); + warnx("%s: OEM string too long", o.OEM_string); goto done; } if (o.create_size) { @@ -274,11 +274,11 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) } fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644); if (fd == -1) { - warnx("failed to create %s", fname); + warn("failed to create %s", fname); goto done; } if (ftruncate(fd, o.create_size)) { - warnx("failed to initialize %jd bytes", (intmax_t)o.create_size); + warn("failed to initialize %jd bytes", (intmax_t)o.create_size); goto done; } } else if ((fd = open(fname, o.no_create ? O_RDONLY : O_RDWR)) == -1) { From nobody Mon Nov 17 16:39:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9D493Mj4z6GXPX; Mon, 17 Nov 2025 16:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9D492Lk2z3TTH; Mon, 17 Nov 2025 16:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763397593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lX99Pqabt10rCSWtMJ2ZVpbu0DExFGx8EnWHPDJZfdA=; b=rQvDalD3Bl5R6q532zhCFqatLNcy5xTR7UKspPDkX9ofj4PImdSgsGV99VKjuJfBYfH323 JvMeMrtDU5Ed2kCJEazQhRjzZS0xdojd5qqXxHnUyztjLkTzuqRJhyDg4mVDFw20BABqe2 Ic/6ocgJLCbeHqhtEUJVslgW5zNIccAgBD3hqIJjtPn+zj9hLWn8nqdsvqn9HTF/vHmPGI vLy82t7Cv3NQ0fN0hxI2EgLBKx9rI38O9gZmb8q6QtEdsIiZsiuU8CHq/vCkWzOZERyUn7 f1XkrD1yz1EBi6BrEsAk4WQnlg577B64ZUB3Tf56gmnO5fsp0RlQ5vrSkl+9Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763397593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lX99Pqabt10rCSWtMJ2ZVpbu0DExFGx8EnWHPDJZfdA=; b=or2mS4RZS1KvWOcBrDyivRezPGw+cUt7nOMj7a5TtbEnJvJIBIIOQvjLN/SPrqxl/8SbVf TbjvzQSvIqvTVdutd5Jx3xc7hjInQ6pVFwDZjCSKoarMoy34CWcWY50jtofF8EXtAct64b M8Kzu8g+GYts9U7JaXX5WNFn5x5g/NPvgCyDFHpK+2fUGngaxnCrFk3EYX3CxW788f8kTB fff+r19eHGcuLZHOAybsyIXfnYwG+0PLBEDKjgcbmyTMAlL3ph2QnsLG7Q4uu/yRXDa3xJ ocxH1wUL+h2hpYeE+xTweKRXOW90BMqa/5i86+BZm2D7KZ59X4T99ElokE4YTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763397593; a=rsa-sha256; cv=none; b=veC24Dke3tqwU6PP/BNf17KqhPd3HlCdgczZt/VyIF7T9NlxAnc4FosFCR4gW5duAfYE+H CrqvroXaeAB8fZQlOc9XTIZzrgsT5AO/QaJ8rVYLQRoeHD9WFDly17bY3Kp7qFjQ5oPmCK axI11QRxHx7zm8voaBoFL7kLQjYwpUfQJ3VhgROQkyrJbqgTYUujJzg7DnlWqlrQdBtugg GWKBD79HS5pAlVoo0kcSQ7/GqCC799oHNwimQID07kOpxXI/QhGEaC84pTkXVWKbHwqodI wrSILC42W34trovDzW/kLPYsXoSnQIw3xscBC/aP5wyQaQeKeHQv4TIEhLELqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9D491NTsz15k; Mon, 17 Nov 2025 16:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHGdril008835; Mon, 17 Nov 2025 16:39:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHGdrtr008832; Mon, 17 Nov 2025 16:39:53 GMT (envelope-from git) Date: Mon, 17 Nov 2025 16:39:53 GMT Message-Id: <202511171639.5AHGdrtr008832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e2956be814a1 - stable/13 - file: Simplify an INVARIANTS check in _fdrop() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e2956be814a1ae86d7b5f83144b517e54424da27 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e2956be814a1ae86d7b5f83144b517e54424da27 commit e2956be814a1ae86d7b5f83144b517e54424da27 Author: Mark Johnston AuthorDate: 2025-05-13 23:26:49 +0000 Commit: Mark Johnston CommitDate: 2025-11-17 14:29:25 +0000 file: Simplify an INVARIANTS check in _fdrop() No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit a2e22ed3420d92d9d98a1e9681b5c9b1fbe40fca) --- sys/kern/kern_descrip.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index f51a1092114d..57ecf253f5be 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3718,13 +3718,10 @@ int __noinline _fdrop(struct file *fp, struct thread *td) { int error; -#ifdef INVARIANTS - int count; - count = refcount_load(&fp->f_count); - if (count != 0) - panic("fdrop: fp %p count %d", fp, count); -#endif + KASSERT(refcount_load(&fp->f_count) == 0, + ("fdrop: fp %p count %d", fp, refcount_load(&fp->f_count))); + error = fo_close(fp, td); atomic_subtract_int(&openfiles, 1); crfree(fp->f_cred); From nobody Mon Nov 17 16:39:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9D4B3L1Lz6GXBf; Mon, 17 Nov 2025 16:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9D4B1lRNz3TJ3; Mon, 17 Nov 2025 16:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763397594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxBkOt9WDNS3vOyzBZH0IMjgvuxvCj6ux3I6JX/JDrU=; b=cBTu1pI6kXEaOcFVUBnivTpOwIvbWEMXYlJ7nBarifnyrxYtIw5Zl0I/yNDMf8G3K6AXkv PJKUGNm14e8AxZXm2cUTs1F01bODoTP99F1XOmyz/hh7J7IPVz55F6kN6G7UixMvDj9VAy xDlfxIGNqjvwDWcUjDFJfoGBSurl1pdEY61VEdfF49XO6I1P3pSNFbV227cCR1ATHENsNE nIIXEbsAi6F8WJrrbHtKPkGTidgyBopmC6ojz9T3KSOgIOxm5sZc3h0zu2L0qspe5VYmF7 R1fAEqzKDLp5bgiacT628nOUulYSZvnLQc73rGqtN7v5oD1CngwzKF55e7YYcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763397594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxBkOt9WDNS3vOyzBZH0IMjgvuxvCj6ux3I6JX/JDrU=; b=T9myU2+o3Hne7cIBa3qpLSkldWmsicsltRJGhuUnt8eYAPelBa/rI2yA6+jAO3q1P8kfBS 5LiEWM/sV9F1PJx6/KrbbFa1XfXGevYddsT6CkkNInWXpQVNmJMobhsm6XHiKVmNkzkXxF o17TpbhfstivPymx7s/6u2xFddrlXAJE8Toll2KLNnypHNb9hxEQ4WcolkZjlYXmmFoGcJ ADyoMhZGuGPjpKUOt5zRTu+/WJxx6TkQlXR4mGdqwHcKDhOskkJBGLhbrV2NnuThAyxlUH S8rDyCenP9F/VrlqEMohxYJAfA3UHMVrBlqMt2rM97dkO6O6CNlufBzKBAAcmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763397594; a=rsa-sha256; cv=none; b=c5mn85beJn9BnoGBLtOtOdJWdPXgWj8HAj0FG/sWUexfx6nys+MDK+eQmkyLm0jLi4UamU cz0KrgGXaMMMFqSmeP03fHNa9dxRwiq7KccM9IlzX+kLFpYjYEKdqPOneB8uCLOLiMJZBX 7JcigrerZZLWum+Y6aeNJconb7UXeFz3d+nvizcu4AHedDbgG6ms+XQr9I5TuzhgsQSLVH c6EQs7855Jo9ej9i87X/BSxpE0Dp2V9P00JvZurAPVJMI2AHGi3g3a1on3ClfG48cUmUyv SjPs74bDNmBcvO9CcvTKqXYjrvZ35SfYEbzm/y5rqpL++s6HgQCcFP31P84LkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9D4B1K5Pz1RN; Mon, 17 Nov 2025 16:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHGdsac008870; Mon, 17 Nov 2025 16:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHGdspa008867; Mon, 17 Nov 2025 16:39:54 GMT (envelope-from git) Date: Mon, 17 Nov 2025 16:39:54 GMT Message-Id: <202511171639.5AHGdspa008867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ecc1e61d3140 - stable/13 - file: Qualify pointers to capsicum rights as const List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ecc1e61d31407680c9acee9c7adcf2ca2aa21432 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ecc1e61d31407680c9acee9c7adcf2ca2aa21432 commit ecc1e61d31407680c9acee9c7adcf2ca2aa21432 Author: Mark Johnston AuthorDate: 2025-05-20 20:19:30 +0000 Commit: Mark Johnston CommitDate: 2025-11-17 15:06:28 +0000 file: Qualify pointers to capsicum rights as const File descriptor lookup routines typically take a set of capsicum rights as input to the lookup, so that the fd's rights can be atomically checked. This set should be qualified with const. No functional change intended. Reviewed by: olce, oshogbo, brooks, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50419 (cherry picked from commit 5319cb21610ad947c56fd0cd4f18ef5b58bc8db7) --- sys/kern/kern_descrip.c | 48 +++++++++++++++++++++++++++--------------------- sys/kern/sys_procdesc.c | 5 +++-- sys/kern/uipc_mqueue.c | 5 +++-- sys/kern/uipc_sem.c | 6 +++--- sys/kern/uipc_syscalls.c | 4 ++-- sys/kern/vfs_syscalls.c | 5 +++-- sys/sys/file.h | 21 +++++++++++---------- sys/sys/filedesc.h | 19 ++++++++++--------- sys/sys/namei.h | 4 ++-- sys/sys/procdesc.h | 6 ++++-- sys/sys/socketvar.h | 2 +- 11 files changed, 69 insertions(+), 56 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 57ecf253f5be..f073fc64e0bc 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -114,7 +114,8 @@ static void fdgrowtable_exp(struct filedesc *fdp, int nfd); static void fdunused(struct filedesc *fdp, int fd); static void fdused(struct filedesc *fdp, int fd); static int fget_unlocked_seq(struct filedesc *fdp, int fd, - cap_rights_t *needrightsp, struct file **fpp, seqc_t *seqp); + const cap_rights_t *needrightsp, struct file **fpp, + seqc_t *seqp); static int getmaxfd(struct thread *td); static u_long *filecaps_copy_prep(const struct filecaps *src); static void filecaps_copy_finish(const struct filecaps *src, @@ -2978,7 +2979,7 @@ finit_vnode(struct file *fp, u_int flag, void *data, struct fileops *ops) } int -fget_cap_locked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_cap_locked(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp) { struct filedescent *fde; @@ -3010,7 +3011,7 @@ out: } int -fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, +fget_cap(struct thread *td, int fd, const cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp) { struct filedesc *fdp = td->td_proc->p_fd; @@ -3256,7 +3257,7 @@ out_free: } static int -fget_unlocked_seq(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_unlocked_seq(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp, seqc_t *seqp) { #ifdef CAPABILITIES @@ -3339,7 +3340,7 @@ fget_unlocked_seq(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, * racing with itself. */ int -fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_unlocked(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp) { #ifdef CAPABILITIES @@ -3406,7 +3407,7 @@ out_fallback: */ #ifdef CAPABILITIES int -fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_only_user(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp) { const struct filedescent *fde; @@ -3436,7 +3437,7 @@ fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, } #else int -fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, +fget_only_user(struct filedesc *fdp, int fd, const cap_rights_t *needrightsp, struct file **fpp) { struct file *fp; @@ -3472,7 +3473,7 @@ fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, */ static __inline int _fget(struct thread *td, int fd, struct file **fpp, int flags, - cap_rights_t *needrightsp) + const cap_rights_t *needrightsp) { struct filedesc *fdp; struct file *fp; @@ -3520,15 +3521,15 @@ _fget(struct thread *td, int fd, struct file **fpp, int flags, } int -fget(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +fget(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp) { return (_fget(td, fd, fpp, 0, rightsp)); } int -fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp, vm_prot_t *maxprotp, - struct file **fpp) +fget_mmap(struct thread *td, int fd, const cap_rights_t *rightsp, + vm_prot_t *maxprotp, struct file **fpp) { int error; #ifndef CAPABILITIES @@ -3571,22 +3572,24 @@ fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp, vm_prot_t *maxprotp, } int -fget_read(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +fget_read(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp) { return (_fget(td, fd, fpp, FREAD, rightsp)); } int -fget_write(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +fget_write(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp) { return (_fget(td, fd, fpp, FWRITE, rightsp)); } int -fget_fcntl(struct thread *td, int fd, cap_rights_t *rightsp, int needfcntl, - struct file **fpp) +fget_fcntl(struct thread *td, int fd, const cap_rights_t *rightsp, + int needfcntl, struct file **fpp) { struct filedesc *fdp = td->td_proc->p_fd; #ifndef CAPABILITIES @@ -3624,7 +3627,7 @@ fget_fcntl(struct thread *td, int fd, cap_rights_t *rightsp, int needfcntl, * XXX: what about the unused flags ? */ static __inline int -_fgetvp(struct thread *td, int fd, int flags, cap_rights_t *needrightsp, +_fgetvp(struct thread *td, int fd, int flags, const cap_rights_t *needrightsp, struct vnode **vpp) { struct file *fp; @@ -3646,14 +3649,15 @@ _fgetvp(struct thread *td, int fd, int flags, cap_rights_t *needrightsp, } int -fgetvp(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp) +fgetvp(struct thread *td, int fd, const cap_rights_t *rightsp, + struct vnode **vpp) { return (_fgetvp(td, fd, 0, rightsp, vpp)); } int -fgetvp_rights(struct thread *td, int fd, cap_rights_t *needrightsp, +fgetvp_rights(struct thread *td, int fd, const cap_rights_t *needrightsp, struct filecaps *havecaps, struct vnode **vpp) { struct filecaps caps; @@ -3685,14 +3689,16 @@ out: } int -fgetvp_read(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp) +fgetvp_read(struct thread *td, int fd, const cap_rights_t *rightsp, + struct vnode **vpp) { return (_fgetvp(td, fd, FREAD, rightsp, vpp)); } int -fgetvp_exec(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp) +fgetvp_exec(struct thread *td, int fd, const cap_rights_t *rightsp, + struct vnode **vpp) { return (_fgetvp(td, fd, FEXEC, rightsp, vpp)); @@ -3700,7 +3706,7 @@ fgetvp_exec(struct thread *td, int fd, cap_rights_t *rightsp, struct vnode **vpp #ifdef notyet int -fgetvp_write(struct thread *td, int fd, cap_rights_t *rightsp, +fgetvp_write(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp) { diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index aab7b1616594..4665dc2c0421 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -121,7 +121,7 @@ static struct fileops procdesc_ops = { * died. */ int -procdesc_find(struct thread *td, int fd, cap_rights_t *rightsp, +procdesc_find(struct thread *td, int fd, const cap_rights_t *rightsp, struct proc **p) { struct procdesc *pd; @@ -168,7 +168,8 @@ procdesc_pid(struct file *fp_procdesc) * Retrieve the PID associated with a process descriptor. */ int -kern_pdgetpid(struct thread *td, int fd, cap_rights_t *rightsp, pid_t *pidp) +kern_pdgetpid(struct thread *td, int fd, const cap_rights_t *rightsp, + pid_t *pidp) { struct file *fp; int error; diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index be3e3fefa749..14fbe9a7f281 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -2159,13 +2159,14 @@ sys_kmq_unlink(struct thread *td, struct kmq_unlink_args *uap) return (error); } -typedef int (*_fgetf)(struct thread *, int, cap_rights_t *, struct file **); +typedef int (*_fgetf)(struct thread *, int, const cap_rights_t *, + struct file **); /* * Get message queue by giving file slot */ static int -_getmq(struct thread *td, int fd, cap_rights_t *rightsp, _fgetf func, +_getmq(struct thread *td, int fd, const cap_rights_t *rightsp, _fgetf func, struct file **fpp, struct mqfs_node **ppn, struct mqueue **pmq) { struct mqfs_node *pn; diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index 7cb25749ad9c..9871c0528338 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -123,8 +123,8 @@ static int ksem_create(struct thread *td, const char *path, semid_t *semidp, mode_t mode, unsigned int value, int flags, int compat32); static void ksem_drop(struct ksem *ks); -static int ksem_get(struct thread *td, semid_t id, cap_rights_t *rightsp, - struct file **fpp); +static int ksem_get(struct thread *td, semid_t id, + const cap_rights_t *rightsp, struct file **fpp); static struct ksem *ksem_hold(struct ksem *ks); static void ksem_insert(char *path, Fnv32_t fnv, struct ksem *ks); static struct ksem *ksem_lookup(char *path, Fnv32_t fnv); @@ -588,7 +588,7 @@ ksem_create(struct thread *td, const char *name, semid_t *semidp, mode_t mode, } static int -ksem_get(struct thread *td, semid_t id, cap_rights_t *rightsp, +ksem_get(struct thread *td, semid_t id, const cap_rights_t *rightsp, struct file **fpp) { struct ksem *ks; diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index ef3ebeb58176..336a0dd77d5c 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -91,7 +91,7 @@ static int sockargs(struct mbuf **, char *, socklen_t, int); * A reference on the file entry is held upon returning. */ int -getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, +getsock_cap(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp, u_int *fflagp, struct filecaps *havecapsp) { struct file *fp; @@ -727,7 +727,7 @@ kern_sendit(struct thread *td, int s, struct msghdr *mp, int flags, struct uio auio; struct iovec *iov; struct socket *so; - cap_rights_t *rights; + const cap_rights_t *rights; #ifdef KTRACE struct uio *ktruio = NULL; #endif diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 7dcdaa66adb8..51f26b843c45 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -4315,7 +4315,7 @@ out: * semantics. */ int -getvnode_path(struct thread *td, int fd, cap_rights_t *rightsp, +getvnode_path(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp) { struct file *fp; @@ -4353,7 +4353,8 @@ getvnode_path(struct thread *td, int fd, cap_rights_t *rightsp, * A reference on the file entry is held upon returning. */ int -getvnode(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp) +getvnode(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp) { int error; diff --git a/sys/sys/file.h b/sys/sys/file.h index 9ae31974745a..4c0ec276c700 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -251,14 +251,15 @@ extern struct fileops socketops; extern int maxfiles; /* kernel limit on number of open files */ extern int maxfilesperproc; /* per process limit on number of open files */ -int fget(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp); -int fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp, +int fget(struct thread *td, int fd, const cap_rights_t *rightsp, + struct file **fpp); +int fget_mmap(struct thread *td, int fd, const cap_rights_t *rightsp, vm_prot_t *maxprotp, struct file **fpp); -int fget_read(struct thread *td, int fd, cap_rights_t *rightsp, +int fget_read(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); -int fget_write(struct thread *td, int fd, cap_rights_t *rightsp, +int fget_write(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); -int fget_fcntl(struct thread *td, int fd, cap_rights_t *rightsp, +int fget_fcntl(struct thread *td, int fd, const cap_rights_t *rightsp, int needfcntl, struct file **fpp); int _fdrop(struct file *fp, struct thread *td); int fget_remote(struct thread *td, struct proc *p, int fd, struct file **fpp); @@ -281,15 +282,15 @@ int file_kcmp_generic(struct file *fp1, struct file *fp2, struct thread *td); void finit(struct file *, u_int, short, void *, struct fileops *); void finit_vnode(struct file *, u_int, void *, struct fileops *); -int fgetvp(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); -int fgetvp_exec(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp_exec(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); -int fgetvp_rights(struct thread *td, int fd, cap_rights_t *needrightsp, +int fgetvp_rights(struct thread *td, int fd, const cap_rights_t *needrightsp, struct filecaps *havecaps, struct vnode **vpp); -int fgetvp_read(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp_read(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); -int fgetvp_write(struct thread *td, int fd, cap_rights_t *rightsp, +int fgetvp_write(struct thread *td, int fd, const cap_rights_t *rightsp, struct vnode **vpp); int fgetvp_lookup_smr(int fd, struct nameidata *ndp, struct vnode **vpp, bool *fsearch); int fgetvp_lookup(int fd, struct nameidata *ndp, struct vnode **vpp); diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 9055f0a785e7..bf7a27e37161 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -267,22 +267,23 @@ struct filedesc_to_leader * struct filedesc_to_leader * filedesc_to_leader_share(struct filedesc_to_leader *fdtol, struct filedesc *fdp); -int getvnode(struct thread *td, int fd, cap_rights_t *rightsp, +int getvnode(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); -int getvnode_path(struct thread *td, int fd, cap_rights_t *rightsp, +int getvnode_path(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp); void mountcheckdirs(struct vnode *olddp, struct vnode *newdp); -int fget_cap_locked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, - struct file **fpp, struct filecaps *havecapsp); -int fget_cap(struct thread *td, int fd, cap_rights_t *needrightsp, +int fget_cap_locked(struct filedesc *fdp, int fd, + const cap_rights_t *needrightsp, struct file **fpp, + struct filecaps *havecapsp); +int fget_cap(struct thread *td, int fd, const cap_rights_t *needrightsp, struct file **fpp, struct filecaps *havecapsp); /* Return a referenced file from an unlocked descriptor. */ -int fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, - struct file **fpp); +int fget_unlocked(struct filedesc *fdp, int fd, + const cap_rights_t *needrightsp, struct file **fpp); /* Return a file pointer without a ref. FILEDESC_IS_ONLY_USER must be true. */ -int fget_only_user(struct filedesc *fdp, int fd, cap_rights_t *needrightsp, - struct file **fpp); +int fget_only_user(struct filedesc *fdp, int fd, + const cap_rights_t *needrightsp, struct file **fpp); #define fput_only_user(fdp, fp) ({ \ MPASS(FILEDESC_IS_ONLY_USER(fdp)); \ MPASS(refcount_load(&fp->f_count) > 0); \ diff --git a/sys/sys/namei.h b/sys/sys/namei.h index e8369867c6b8..1d0fd1c96449 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -72,7 +72,7 @@ struct nameidata { */ const char *ni_dirp; /* pathname pointer */ enum uio_seg ni_segflg; /* location of pathname */ - cap_rights_t *ni_rightsneeded; /* rights required to look up vnode */ + const cap_rights_t *ni_rightsneeded; /* rights needed to look up vnode */ /* * Arguments to lookup. */ @@ -249,7 +249,7 @@ int cache_fplookup(struct nameidata *ndp, enum cache_fpl_status *status, #define NDINIT_ALL(ndp, op, flags, segflg, namep, dirfd, startdir, rightsp, td) \ do { \ struct nameidata *_ndp = (ndp); \ - cap_rights_t *_rightsp = (rightsp); \ + const cap_rights_t *_rightsp = (rightsp); \ MPASS(_rightsp != NULL); \ NDINIT_PREFILL(_ndp); \ NDINIT_DBG(_ndp); \ diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h index ca26d65d5417..4e8b06fb7377 100644 --- a/sys/sys/procdesc.h +++ b/sys/sys/procdesc.h @@ -94,8 +94,10 @@ struct procdesc { * In-kernel interfaces to process descriptors. */ int procdesc_exit(struct proc *); -int procdesc_find(struct thread *, int fd, cap_rights_t *, struct proc **); -int kern_pdgetpid(struct thread *, int fd, cap_rights_t *, pid_t *pidp); +int procdesc_find(struct thread *, int fd, const cap_rights_t *, + struct proc **); +int kern_pdgetpid(struct thread *, int fd, const cap_rights_t *, + pid_t *pidp); void procdesc_new(struct proc *, int); void procdesc_finit(struct procdesc *, struct file *); pid_t procdesc_pid(struct file *); diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index e7ad086818f4..d2b5ac867a46 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -418,7 +418,7 @@ struct uio; */ int getsockaddr(struct sockaddr **namp, const struct sockaddr *uaddr, size_t len); -int getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, +int getsock_cap(struct thread *td, int fd, const cap_rights_t *rightsp, struct file **fpp, u_int *fflagp, struct filecaps *havecaps); void soabort(struct socket *so); int soaccept(struct socket *so, struct sockaddr **nam); From nobody Mon Nov 17 20:25:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9K4h3X28z6GvFp; Mon, 17 Nov 2025 20:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9K4h2tfVz3H91; Mon, 17 Nov 2025 20:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763411140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CiMu78+MlZSxZXiKfPsdNuzZ7VqQJakw3JuZP5sObv0=; b=PeOqQqNdJcv4kzNPWaJQB4+HVNZbeoBt9ghZFpYFBUdvLcm41hyEKc6v7H27bhurXR5muh DZnxyUxFJnYnM1KqLb9WzlVVs7Hki2zeUc5Eggchh/YyDmIXUrjMH/QFkTV0fYOy4bM03I 8fE6CyL2XufDlawtnvtvxuJJw0g2fdejPNHz82vCYHHbMUX3TIck+r1nV07Q7fhS36KavY NyHSZFzoaVrhHWNk8wYOVruL29kFFjyju3F+Vm3FrhEdkxttJZG77OmJ+4LxPMzHS81ry7 2+49pNAhJCZj/GcgehKb1uc9JbMtCfvBcYv18L3yXZLY+9V2BwpFsJZNtfme1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763411140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CiMu78+MlZSxZXiKfPsdNuzZ7VqQJakw3JuZP5sObv0=; b=FnoHC6p5XqG+0/ILT+589RxVVMsIYZVdrGmZdkQXejqBxjnesoHCBlf7ldANHvvNIbG1g/ A/cpddBT+G1DsJU8tT7ORl+p2BbP9fISbeip/L4L9i3q90/qs+6jQoeXUepvkv9lKg2KXD xq4CjN81aAkOomgsHjyRedjXjAK3IlrGXJ399C+XmxH1zwqo8BLryZ603FA/2hor9mMlHP kjkwaOV9Sex2EhR3kGSqTGZOyD3kUgqtR/I2XqZNYzvMLKt9zPOgDHS+DuoC8sKlDm2+Ce GAYbAa+pt5bzVVysxermye7XU5Umic2oHvqmkAcixei7GUJhBauMOezIY6LX1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763411140; a=rsa-sha256; cv=none; b=YrkXSsWRpUkJzOZRLR6o3ruPrY65ksk3BqVvVX1H3P0BlNC5PI9RyE4aznLFtOSA8//tjf iKmvJ7MFB0LJWPdQxsV0Fn+6d42XsxhyVcZztJPoYO4KSfLzaVhRgU3z+/DK5KECxTKprb 5X/PuIokofRsvCZcExkSez1dKLYnqRpXRLx8jWWXvpTNBjE0ymOsX54dgPt4+cOIB/MrPZ G+IveT+nkF4kn2zthPGCoiYYphpkF2KZ51A0T2nZRD3ggovSAiol2yjI8poByRbDyDBh1G 7ewmfjalLiQAjYgCNy6WU1UH41ARLohckSijNY1gOcl1pgrxgtFXBIV226EGDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9K4h2THpz7xs; Mon, 17 Nov 2025 20:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHKPeA2040634; Mon, 17 Nov 2025 20:25:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHKPeek040631; Mon, 17 Nov 2025 20:25:40 GMT (envelope-from git) Date: Mon, 17 Nov 2025 20:25:40 GMT Message-Id: <202511172025.5AHKPeek040631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 259264460d8d - stable/15 - Add --libxo support for geom status and list sub commands. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 259264460d8dca4b7c51a73bad101ea78b3209e3 Auto-Submitted: auto-generated The branch stable/15 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=259264460d8dca4b7c51a73bad101ea78b3209e3 commit 259264460d8dca4b7c51a73bad101ea78b3209e3 Author: Kirk McKusick AuthorDate: 2025-10-13 21:15:05 +0000 Commit: Kirk McKusick CommitDate: 2025-11-17 20:25:21 +0000 Add --libxo support for geom status and list sub commands. Submitted-by: Johan Söllvander Differential Revision: https://reviews.freebsd.org/D37615 Differential Revision: https://reviews.freebsd.org/D53110 Differential Revision: https://reviews.freebsd.org/D53180 Differential Revision: https://reviews.freebsd.org/D53313 (cherry picked from commit 0d4642a67e59f8da5e00a05001c342bdad2a806f) (cherry-picked from commit 2168e15ee89b4206d8e65a4ea04e4721f60f4060) (cherry picked from commit 2f461ddd784b4abdb7f88701d20fc45f658c42f5) (cherry picked from commit c174f518c9c8cf3a567c5f60414508ac951a2ae4) --- sbin/geom/Makefile | 2 +- sbin/geom/core/geom.c | 254 +++++++++++++++++++++++++++++++++++--------------- 2 files changed, 179 insertions(+), 77 deletions(-) diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile index 078503d3ae67..61561ef1ff1b 100644 --- a/sbin/geom/Makefile +++ b/sbin/geom/Makefile @@ -9,7 +9,7 @@ MAN= geom.8 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/core CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\" -LIBADD= geom util +LIBADD= geom util xo .if defined(RESCUE) .PATH: ${SRCTOP}/lib/geom/part \ diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index b78021194ddd..51ea52a3e858 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -49,9 +49,12 @@ #include #include #include +#include #include "misc/subr.h" +#define GEOM_XO_VERSION "1" + #ifdef STATIC_GEOM_CLASSES extern uint32_t gpart_version; extern struct g_command gpart_class_commands[]; @@ -513,6 +516,7 @@ run_command(int argc, char *argv[]) gctl_free(req); if (verbose) printf("Done.\n"); + xo_finish(); exit(EXIT_SUCCESS); } @@ -810,6 +814,10 @@ main(int argc, char *argv[]) provider_name = NULL; tflag = false; + argc = xo_parse_args(argc, argv); + if (argc < 0) + return (argc); + if (strcmp(getprogname(), "geom") == 0) { while ((ch = getopt(argc, argv, "hp:t")) != -1) { switch (ch) { @@ -831,6 +839,7 @@ main(int argc, char *argv[]) * Don't adjust argc and argv, it would break get_class(). */ } + xo_set_version(GEOM_XO_VERSION); if (tflag && provider_name != NULL) { errx(EXIT_FAILURE, @@ -839,6 +848,7 @@ main(int argc, char *argv[]) if (provider_name != NULL) { list_one_geom_by_provider(provider_name); + xo_finish(); return (0); } @@ -882,29 +892,33 @@ find_geom(struct gclass *classp, const char *name) } static void -list_one_provider(struct gprovider *pp, const char *prefix) +list_one_provider(struct gprovider *pp, const char *padding) { struct gconfig *conf; char buf[5]; - printf("Name: %s\n", pp->lg_name); + xo_emit("{Lcw:Name}{:name}\n", pp->lg_name); humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); - printf("%sMediasize: %jd (%s)\n", prefix, (intmax_t)pp->lg_mediasize, - buf); - printf("%sSectorsize: %u\n", prefix, pp->lg_sectorsize); + xo_emit("{P:/%s}{Lcw:Mediasize}{:mediasize/%jd} ({N:/%s})\n", + padding, (intmax_t)pp->lg_mediasize, buf); + xo_emit("{P:/%s}{Lcw:Sectorsize}{:sectorsize/%u}\n", + padding, pp->lg_sectorsize); if (pp->lg_stripesize > 0 || pp->lg_stripeoffset > 0) { - printf("%sStripesize: %ju\n", prefix, pp->lg_stripesize); - printf("%sStripeoffset: %ju\n", prefix, pp->lg_stripeoffset); + xo_emit("{P:/%s}{Lcw:Stripesize}{:stripesize/%ju}\n", + padding, pp->lg_stripesize); + xo_emit("{P:/%s}{Lcw:Stripeoffset}{:stripeoffset/%ju}\n", + padding, pp->lg_stripeoffset); } - printf("%sMode: %s\n", prefix, pp->lg_mode); + xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); LIST_FOREACH(conf, &pp->lg_config, lg_config) { - printf("%s%s: %s\n", prefix, conf->lg_name, conf->lg_val); + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); } } static void -list_one_consumer(struct gconsumer *cp, const char *prefix) +list_one_consumer(struct gconsumer *cp, const char *padding) { struct gprovider *pp; struct gconfig *conf; @@ -915,20 +929,24 @@ list_one_consumer(struct gconsumer *cp, const char *prefix) else { char buf[5]; - printf("Name: %s\n", pp->lg_name); + xo_emit("{Lcw:Name}{:name}\n", pp->lg_name); humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); - printf("%sMediasize: %jd (%s)\n", prefix, - (intmax_t)pp->lg_mediasize, buf); - printf("%sSectorsize: %u\n", prefix, pp->lg_sectorsize); + xo_emit("{P:/%s}{Lcw:Mediasize}{:mediasize/%jd} ({N:/%s})\n", + padding, (intmax_t)pp->lg_mediasize, buf); + xo_emit("{P:/%s}{Lcw:Sectorsize}{:sectorsize/%u}\n", + padding, pp->lg_sectorsize); if (pp->lg_stripesize > 0 || pp->lg_stripeoffset > 0) { - printf("%sStripesize: %ju\n", prefix, pp->lg_stripesize); - printf("%sStripeoffset: %ju\n", prefix, pp->lg_stripeoffset); + xo_emit("{P:/%s}{Lcw:Stripesize}{:stripesize/%ju}\n", + padding, pp->lg_stripesize); + xo_emit("{P:/%s}{Lcw:Stripeoffset}{:stripeoffset/%ju}\n", + padding, pp->lg_stripeoffset); } - printf("%sMode: %s\n", prefix, cp->lg_mode); + xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); } LIST_FOREACH(conf, &cp->lg_config, lg_config) { - printf("%s%s: %s\n", prefix, conf->lg_name, conf->lg_val); + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); } } @@ -940,27 +958,36 @@ list_one_geom(struct ggeom *gp) struct gconfig *conf; unsigned n; - printf("Geom name: %s\n", gp->lg_name); + xo_emit("{Lcw:Geom name}{:name}\n", gp->lg_name); LIST_FOREACH(conf, &gp->lg_config, lg_config) { - printf("%s: %s\n", conf->lg_name, conf->lg_val); + xo_emit("{Lcwa:}{a:}\n", conf->lg_name, conf->lg_name, + conf->lg_val ? conf->lg_val : ""); } if (!LIST_EMPTY(&gp->lg_provider)) { - printf("Providers:\n"); + xo_open_list("providers"); + xo_emit("{Tc:Providers}\n"); n = 1; LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { - printf("%u. ", n++); + xo_emit("{T:/%u}. ", n++); + xo_open_instance("provider"); list_one_provider(pp, " "); + xo_close_instance("provider"); } + xo_close_list("providers"); } if (!LIST_EMPTY(&gp->lg_consumer)) { - printf("Consumers:\n"); + xo_open_list("consumers"); + xo_emit("{Tc:Consumers}\n"); n = 1; LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - printf("%u. ", n++); + xo_emit("{T:/%u}. ", n++); + xo_open_instance("consumer"); list_one_consumer(cp, " "); + xo_close_instance("consumer"); } + xo_close_list("consumers"); } - printf("\n"); + xo_emit("\n"); } static void @@ -978,8 +1005,10 @@ list_one_geom_by_provider(const char *provider_name) if (gp == NULL) errx(EXIT_FAILURE, "Cannot find provider '%s'.", provider_name); - printf("Geom class: %s\n", gp->lg_class->lg_name); + xo_open_container(provider_name); + xo_emit("{Lwc:Geom class}{:class}\n", gp->lg_class->lg_name); list_one_geom(gp); + xo_close_container(provider_name); } static void @@ -1038,14 +1067,20 @@ std_list(struct gctl_req *req, unsigned flags __unused) "an instance named '%s'.", gclass_name, name); } + xo_open_container(gclass_name); list_one_geom(gp); + xo_close_container(gclass_name); } } else { + xo_open_list(gclass_name); LIST_FOREACH(gp, &classp->lg_geom, lg_geom) { if (LIST_EMPTY(&gp->lg_provider) && !all) continue; + xo_open_instance("geom"); list_one_geom(gp); + xo_close_instance("geom"); } + xo_close_list(gclass_name); } geom_deletetree(&mesh); } @@ -1115,34 +1150,24 @@ status_update_len_prs(struct ggeom *gp, int *name_len, int *status_len) } static char * -status_one_consumer(struct gconsumer *cp) +status_one_consumer(struct gconsumer *cp, const char *value) { - static char buf[256]; struct gprovider *pp; struct gconfig *conf; - const char *state, *syncr; + char *ret; pp = cp->lg_provider; if (pp == NULL) return (NULL); - state = NULL; - syncr = NULL; + ret = NULL; LIST_FOREACH(conf, &cp->lg_config, lg_config) { - if (strcasecmp(conf->lg_name, "state") == 0) - state = conf->lg_val; - if (strcasecmp(conf->lg_name, "synchronized") == 0) - syncr = conf->lg_val; - } - if (state == NULL && syncr == NULL) - snprintf(buf, sizeof(buf), "%s", pp->lg_name); - else if (state != NULL && syncr != NULL) { - snprintf(buf, sizeof(buf), "%s (%s, %s)", pp->lg_name, - state, syncr); - } else { - snprintf(buf, sizeof(buf), "%s (%s)", pp->lg_name, - state ? state : syncr); + if (strcasecmp(conf->lg_name, value) == 0) + ret = conf->lg_val; } - return (buf); + + if (ret == NULL) + return (NULL); + return (ret); } static void @@ -1150,8 +1175,9 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) { struct gconsumer *cp; struct gconfig *conf; - const char *name, *status, *component; - int gotone; + char fmt[64]; + const char *name, *status, *cstate, *csyncr; + int gotone, len; name = gp->lg_name; status = "N/A"; @@ -1161,21 +1187,59 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) break; } } - gotone = 0; + gotone = len = 0; + xo_open_instance("status"); LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - component = status_one_consumer(cp); - if (component == NULL) + if (cp->lg_provider == NULL) continue; + + cstate = status_one_consumer(cp, "state"); + csyncr = status_one_consumer(cp, "synchronized"); + if (!gotone || script) { + if (!gotone) { + xo_emit("{t:name/%*s} {t:status/%*s} ", + name_len, name, status_len, status); + xo_open_list("components"); + } else { + /* + * XXX: running the same xo_emit() as above or + * variations of it will cause the XML/JSON to + * produce extra "components" lists in script + * mode + */ + + snprintf(fmt, sizeof(fmt), "%*s %*s ", + name_len, name, status_len, status); + xo_emit(fmt); + } + } + + xo_open_instance("components"); + if (cstate != NULL && csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", + len, "", cp->lg_provider->lg_name, cstate, csyncr); + } else if (cstate != NULL) { + xo_emit("{P:/%*s}{:component} ({:state})\n", + len, "", cp->lg_provider->lg_name, cstate); + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", + len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); + } + xo_close_instance("components"); gotone = 1; - printf("%*s %*s %s\n", name_len, name, status_len, status, - component); - if (!script) - name = status = ""; + if (!len && !script) + len = name_len + status_len + 4; } if (!gotone) { - printf("%*s %*s %s\n", name_len, name, status_len, status, - "N/A"); + xo_emit("{t:name/%*s} {t:status/%*s} N/A\n", + name_len, name, status_len, status); + } else { + xo_close_list("components"); } + xo_close_instance("status"); } static void @@ -1184,9 +1248,11 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) struct gprovider *pp; struct gconsumer *cp; struct gconfig *conf; - const char *name, *status, *component; - int gotone; + const char *name, *status, *cstate, *csyncr; + char fmt[64]; + int gotone, len; + xo_open_instance("status"); LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { name = pp->lg_name; status = "N/A"; @@ -1202,22 +1268,60 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) break; } } - gotone = 0; + gotone = len = 0; LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - component = status_one_consumer(cp); - if (component == NULL) + if (cp->lg_provider == NULL) continue; + + cstate = status_one_consumer(cp, "state"); + csyncr = status_one_consumer(cp, "synchronized"); + if (!gotone || script) { + if (!gotone) { + xo_emit("{t:name/%*s} {t:status/%*s} ", + name_len, name, status_len, status); + xo_open_list("components"); + } else { + /* + * XXX: running the same xo_emit() as + * above or variations of it will + * cause the XML/JSON to produce + * extra "components" lists in + * script mode + */ + + snprintf(fmt, sizeof(fmt), "%*s %*s ", + name_len, name, status_len, status); + xo_emit(fmt); + } + } + + xo_open_instance("component"); + if (cstate != NULL && csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", + len, "", cp->lg_provider->lg_name, cstate, csyncr); + } else if (cstate != NULL) { + xo_emit("{P:/%*s}{:component} ({:state})\n", + len, "", cp->lg_provider->lg_name, cstate); + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", + len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); + } + xo_close_instance("component"); gotone = 1; - printf("%*s %*s %s\n", name_len, name, - status_len, status, component); - if (!script) - name = status = ""; + if (!len && !script) + len = name_len + status_len + 4; } if (!gotone) { - printf("%*s %*s %s\n", name_len, name, - status_len, status, "N/A"); + xo_emit("{t:name/%*s} {t:status/%*s} N/A\n", + name_len, name, status_len, status); + } else { + xo_close_list("components"); } } + xo_close_instance("status"); } static void @@ -1240,13 +1344,9 @@ std_status(struct gctl_req *req, unsigned flags __unused) all = gctl_get_int(req, "all"); geoms = gctl_get_int(req, "geoms"); script = gctl_get_int(req, "script"); - if (script) { - name_len = 0; - status_len = 0; - } else { - name_len = strlen("Name"); - status_len = strlen("Status"); - } + name_len = strlen("Name"); + status_len = strlen("Status"); + if (nargs > 0) { for (i = 0, n = 0; i < nargs; i++) { name = gctl_get_ascii(req, "arg%d", i); @@ -1282,9 +1382,10 @@ std_status(struct gctl_req *req, unsigned flags __unused) goto end; } if (!script) { - printf("%*s %*s %s\n", name_len, "Name", status_len, "Status", - "Components"); + xo_emit("{T:/%*s} {T:/%*s} {T:Components}\n", + name_len, "Name", status_len, "Status"); } + xo_open_list(gclass_name); if (nargs > 0) { for (i = 0; i < nargs; i++) { name = gctl_get_ascii(req, "arg%d", i); @@ -1312,6 +1413,7 @@ std_status(struct gctl_req *req, unsigned flags __unused) } } } + xo_close_list(gclass_name); end: geom_deletetree(&mesh); } From nobody Mon Nov 17 20:39:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9KNk06vqz6GvgM; Mon, 17 Nov 2025 20:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9KNj71dBz3KPX; Mon, 17 Nov 2025 20:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763411973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSOpZWSwkP0MnjDLMv3334JdkWftevLY/mIH6pFuoPA=; b=R3q6mq4J41DL25kBOIf1+0FJVtE694G4zc/bbe2fs57yDvqqv+mJzLW9ajIy/aFDxZVitl Xm0yWm96RiAoO4DI+0teX2rxrNh0eKubgRCu4PUpTvdbs8FvNqz6nHakJTnMwqkQFxDLmr 6E7YKF8s12af0pB5+o/PmxtHK41ZW3J/jm4/yJxqKgmhQClqomAl7l29LEIhs0eQdtmUhB KBxWPqQemxwV5l9KAa9pZ3AjC3+jxypfFE2PSMTBrgJ8j4jTjWoSj2EFDXxG6yLQEQlmju zhudgx0QR9M4Fsv0aIjS1cGWqcPRRET7Sp1v80vrkstL/2+JMmeqE4u8xWwWoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763411973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSOpZWSwkP0MnjDLMv3334JdkWftevLY/mIH6pFuoPA=; b=dS+ufeNPR5Sy58NetFuNd6fBFmSNoai4WltztgCOTVwJSzT8lPqBVBc3EjSwram1zWeQ1i n9vEhVf1E7aLayXTg3N6vXUkyu+7lwgQFHoTnVgfqzdrkVfdoOy/P8qHHwaDybpQxrhA0G 357uqm7ZTCq8YBlZn/vgeQ3aDaOBdQBBCLrfsswf9oMQ3Jwm0bPCFkoXguLSgfeesQFzAO c1h1iWfbnR58omVUok0+pwe+Ynrj31qt6gyx1MeuKgx4uJTBmSDpVz5K/Tt3N3RFNHFOeU /AdKe+7vAEE9WHaIyfjV9wSQthPQeAISMMzWVBsC5yh5gQw2rOhEw1yVavSs/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763411973; a=rsa-sha256; cv=none; b=bbRNqXmLOTzc5zTcZzBfVVmEjN67XBgmC5TJJDLsYfzJLVF9hbVv5FAQZo5a1nZLAcOL1T TaHRG0I2skI5OrptFE0pJGDbs2FRa/Arak2/Hg0cHT5+S2Vh1zkU91+Ut3bP5siKBuOSNB iNmrE3icuCMlxc6lVTuB+cMshs/HgLZgNRiEdOhGI6zAnIFf8fhevC55v6hqTGp1BKVcYj PDrTId/KYIA05UcN4p2HPoSs0nqCXg7iQMbPixtyULobThdlREb6vdts4d8VGk/nAoNTln pqPkJT4DOKzVHJyPzUzTscrrjmmRMB1Tv9FNKA/l5CsFKxgpNZq2CBmHuSr/mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9KNj6XlYz86Y; Mon, 17 Nov 2025 20:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHKdX0S060047; Mon, 17 Nov 2025 20:39:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHKdXEi060044; Mon, 17 Nov 2025 20:39:33 GMT (envelope-from git) Date: Mon, 17 Nov 2025 20:39:33 GMT Message-Id: <202511172039.5AHKdXEi060044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 511e33d20925 - stable/14 - Add --libxo support for geom status and list sub commands. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 511e33d209257eadeb5487bcff91389c3ff6d5eb Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=511e33d209257eadeb5487bcff91389c3ff6d5eb commit 511e33d209257eadeb5487bcff91389c3ff6d5eb Author: Kirk McKusick AuthorDate: 2025-10-13 21:15:05 +0000 Commit: Kirk McKusick CommitDate: 2025-11-17 20:33:21 +0000 Add --libxo support for geom status and list sub commands. Submitted-by: Johan Söllvander Differential Revision: https://reviews.freebsd.org/D37615 Differential Revision: https://reviews.freebsd.org/D53110 Differential Revision: https://reviews.freebsd.org/D53180 Differential Revision: https://reviews.freebsd.org/D53313 (cherry picked from commit 0d4642a67e59f8da5e00a05001c342bdad2a806f) (cherry picked from commit 2168e15ee89b4206d8e65a4ea04e4721f60f4060) (cherry picked from commit 2f461ddd784b4abdb7f88701d20fc45f658c42f5) (cherry picked from commit c174f518c9c8cf3a567c5f60414508ac951a2ae4) --- sbin/geom/Makefile | 2 +- sbin/geom/core/geom.c | 254 +++++++++++++++++++++++++++++++++++--------------- 2 files changed, 179 insertions(+), 77 deletions(-) diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile index b311a9e8e8fb..0aa9d7f350bb 100644 --- a/sbin/geom/Makefile +++ b/sbin/geom/Makefile @@ -10,7 +10,7 @@ MAN= geom.8 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/core CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\" -LIBADD= geom util +LIBADD= geom util xo .if defined(RESCUE) .PATH: ${SRCTOP}/lib/geom/part \ diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index ccaf7adca305..6631e6b7f6af 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -50,9 +50,12 @@ #include #include #include +#include #include "misc/subr.h" +#define GEOM_XO_VERSION "1" + #ifdef STATIC_GEOM_CLASSES extern uint32_t gpart_version; extern struct g_command gpart_class_commands[]; @@ -514,6 +517,7 @@ run_command(int argc, char *argv[]) gctl_free(req); if (verbose) printf("Done.\n"); + xo_finish(); exit(EXIT_SUCCESS); } @@ -811,6 +815,10 @@ main(int argc, char *argv[]) provider_name = NULL; tflag = false; + argc = xo_parse_args(argc, argv); + if (argc < 0) + return (argc); + if (strcmp(getprogname(), "geom") == 0) { while ((ch = getopt(argc, argv, "hp:t")) != -1) { switch (ch) { @@ -832,6 +840,7 @@ main(int argc, char *argv[]) * Don't adjust argc and argv, it would break get_class(). */ } + xo_set_version(GEOM_XO_VERSION); if (tflag && provider_name != NULL) { errx(EXIT_FAILURE, @@ -840,6 +849,7 @@ main(int argc, char *argv[]) if (provider_name != NULL) { list_one_geom_by_provider(provider_name); + xo_finish(); return (0); } @@ -883,29 +893,33 @@ find_geom(struct gclass *classp, const char *name) } static void -list_one_provider(struct gprovider *pp, const char *prefix) +list_one_provider(struct gprovider *pp, const char *padding) { struct gconfig *conf; char buf[5]; - printf("Name: %s\n", pp->lg_name); + xo_emit("{Lcw:Name}{:name}\n", pp->lg_name); humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); - printf("%sMediasize: %jd (%s)\n", prefix, (intmax_t)pp->lg_mediasize, - buf); - printf("%sSectorsize: %u\n", prefix, pp->lg_sectorsize); + xo_emit("{P:/%s}{Lcw:Mediasize}{:mediasize/%jd} ({N:/%s})\n", + padding, (intmax_t)pp->lg_mediasize, buf); + xo_emit("{P:/%s}{Lcw:Sectorsize}{:sectorsize/%u}\n", + padding, pp->lg_sectorsize); if (pp->lg_stripesize > 0 || pp->lg_stripeoffset > 0) { - printf("%sStripesize: %ju\n", prefix, pp->lg_stripesize); - printf("%sStripeoffset: %ju\n", prefix, pp->lg_stripeoffset); + xo_emit("{P:/%s}{Lcw:Stripesize}{:stripesize/%ju}\n", + padding, pp->lg_stripesize); + xo_emit("{P:/%s}{Lcw:Stripeoffset}{:stripeoffset/%ju}\n", + padding, pp->lg_stripeoffset); } - printf("%sMode: %s\n", prefix, pp->lg_mode); + xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); LIST_FOREACH(conf, &pp->lg_config, lg_config) { - printf("%s%s: %s\n", prefix, conf->lg_name, conf->lg_val); + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); } } static void -list_one_consumer(struct gconsumer *cp, const char *prefix) +list_one_consumer(struct gconsumer *cp, const char *padding) { struct gprovider *pp; struct gconfig *conf; @@ -916,20 +930,24 @@ list_one_consumer(struct gconsumer *cp, const char *prefix) else { char buf[5]; - printf("Name: %s\n", pp->lg_name); + xo_emit("{Lcw:Name}{:name}\n", pp->lg_name); humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); - printf("%sMediasize: %jd (%s)\n", prefix, - (intmax_t)pp->lg_mediasize, buf); - printf("%sSectorsize: %u\n", prefix, pp->lg_sectorsize); + xo_emit("{P:/%s}{Lcw:Mediasize}{:mediasize/%jd} ({N:/%s})\n", + padding, (intmax_t)pp->lg_mediasize, buf); + xo_emit("{P:/%s}{Lcw:Sectorsize}{:sectorsize/%u}\n", + padding, pp->lg_sectorsize); if (pp->lg_stripesize > 0 || pp->lg_stripeoffset > 0) { - printf("%sStripesize: %ju\n", prefix, pp->lg_stripesize); - printf("%sStripeoffset: %ju\n", prefix, pp->lg_stripeoffset); + xo_emit("{P:/%s}{Lcw:Stripesize}{:stripesize/%ju}\n", + padding, pp->lg_stripesize); + xo_emit("{P:/%s}{Lcw:Stripeoffset}{:stripeoffset/%ju}\n", + padding, pp->lg_stripeoffset); } - printf("%sMode: %s\n", prefix, cp->lg_mode); + xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); } LIST_FOREACH(conf, &cp->lg_config, lg_config) { - printf("%s%s: %s\n", prefix, conf->lg_name, conf->lg_val); + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); } } @@ -941,27 +959,36 @@ list_one_geom(struct ggeom *gp) struct gconfig *conf; unsigned n; - printf("Geom name: %s\n", gp->lg_name); + xo_emit("{Lcw:Geom name}{:name}\n", gp->lg_name); LIST_FOREACH(conf, &gp->lg_config, lg_config) { - printf("%s: %s\n", conf->lg_name, conf->lg_val); + xo_emit("{Lcwa:}{a:}\n", conf->lg_name, conf->lg_name, + conf->lg_val ? conf->lg_val : ""); } if (!LIST_EMPTY(&gp->lg_provider)) { - printf("Providers:\n"); + xo_open_list("providers"); + xo_emit("{Tc:Providers}\n"); n = 1; LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { - printf("%u. ", n++); + xo_emit("{T:/%u}. ", n++); + xo_open_instance("provider"); list_one_provider(pp, " "); + xo_close_instance("provider"); } + xo_close_list("providers"); } if (!LIST_EMPTY(&gp->lg_consumer)) { - printf("Consumers:\n"); + xo_open_list("consumers"); + xo_emit("{Tc:Consumers}\n"); n = 1; LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - printf("%u. ", n++); + xo_emit("{T:/%u}. ", n++); + xo_open_instance("consumer"); list_one_consumer(cp, " "); + xo_close_instance("consumer"); } + xo_close_list("consumers"); } - printf("\n"); + xo_emit("\n"); } static void @@ -979,8 +1006,10 @@ list_one_geom_by_provider(const char *provider_name) if (gp == NULL) errx(EXIT_FAILURE, "Cannot find provider '%s'.", provider_name); - printf("Geom class: %s\n", gp->lg_class->lg_name); + xo_open_container(provider_name); + xo_emit("{Lwc:Geom class}{:class}\n", gp->lg_class->lg_name); list_one_geom(gp); + xo_close_container(provider_name); } static void @@ -1039,14 +1068,20 @@ std_list(struct gctl_req *req, unsigned flags __unused) "an instance named '%s'.", gclass_name, name); } + xo_open_container(gclass_name); list_one_geom(gp); + xo_close_container(gclass_name); } } else { + xo_open_list(gclass_name); LIST_FOREACH(gp, &classp->lg_geom, lg_geom) { if (LIST_EMPTY(&gp->lg_provider) && !all) continue; + xo_open_instance("geom"); list_one_geom(gp); + xo_close_instance("geom"); } + xo_close_list(gclass_name); } geom_deletetree(&mesh); } @@ -1116,34 +1151,24 @@ status_update_len_prs(struct ggeom *gp, int *name_len, int *status_len) } static char * -status_one_consumer(struct gconsumer *cp) +status_one_consumer(struct gconsumer *cp, const char *value) { - static char buf[256]; struct gprovider *pp; struct gconfig *conf; - const char *state, *syncr; + char *ret; pp = cp->lg_provider; if (pp == NULL) return (NULL); - state = NULL; - syncr = NULL; + ret = NULL; LIST_FOREACH(conf, &cp->lg_config, lg_config) { - if (strcasecmp(conf->lg_name, "state") == 0) - state = conf->lg_val; - if (strcasecmp(conf->lg_name, "synchronized") == 0) - syncr = conf->lg_val; - } - if (state == NULL && syncr == NULL) - snprintf(buf, sizeof(buf), "%s", pp->lg_name); - else if (state != NULL && syncr != NULL) { - snprintf(buf, sizeof(buf), "%s (%s, %s)", pp->lg_name, - state, syncr); - } else { - snprintf(buf, sizeof(buf), "%s (%s)", pp->lg_name, - state ? state : syncr); + if (strcasecmp(conf->lg_name, value) == 0) + ret = conf->lg_val; } - return (buf); + + if (ret == NULL) + return (NULL); + return (ret); } static void @@ -1151,8 +1176,9 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) { struct gconsumer *cp; struct gconfig *conf; - const char *name, *status, *component; - int gotone; + char fmt[64]; + const char *name, *status, *cstate, *csyncr; + int gotone, len; name = gp->lg_name; status = "N/A"; @@ -1162,21 +1188,59 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) break; } } - gotone = 0; + gotone = len = 0; + xo_open_instance("status"); LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - component = status_one_consumer(cp); - if (component == NULL) + if (cp->lg_provider == NULL) continue; + + cstate = status_one_consumer(cp, "state"); + csyncr = status_one_consumer(cp, "synchronized"); + if (!gotone || script) { + if (!gotone) { + xo_emit("{t:name/%*s} {t:status/%*s} ", + name_len, name, status_len, status); + xo_open_list("components"); + } else { + /* + * XXX: running the same xo_emit() as above or + * variations of it will cause the XML/JSON to + * produce extra "components" lists in script + * mode + */ + + snprintf(fmt, sizeof(fmt), "%*s %*s ", + name_len, name, status_len, status); + xo_emit(fmt); + } + } + + xo_open_instance("components"); + if (cstate != NULL && csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", + len, "", cp->lg_provider->lg_name, cstate, csyncr); + } else if (cstate != NULL) { + xo_emit("{P:/%*s}{:component} ({:state})\n", + len, "", cp->lg_provider->lg_name, cstate); + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", + len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); + } + xo_close_instance("components"); gotone = 1; - printf("%*s %*s %s\n", name_len, name, status_len, status, - component); - if (!script) - name = status = ""; + if (!len && !script) + len = name_len + status_len + 4; } if (!gotone) { - printf("%*s %*s %s\n", name_len, name, status_len, status, - "N/A"); + xo_emit("{t:name/%*s} {t:status/%*s} N/A\n", + name_len, name, status_len, status); + } else { + xo_close_list("components"); } + xo_close_instance("status"); } static void @@ -1185,9 +1249,11 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) struct gprovider *pp; struct gconsumer *cp; struct gconfig *conf; - const char *name, *status, *component; - int gotone; + const char *name, *status, *cstate, *csyncr; + char fmt[64]; + int gotone, len; + xo_open_instance("status"); LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { name = pp->lg_name; status = "N/A"; @@ -1203,22 +1269,60 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) break; } } - gotone = 0; + gotone = len = 0; LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - component = status_one_consumer(cp); - if (component == NULL) + if (cp->lg_provider == NULL) continue; + + cstate = status_one_consumer(cp, "state"); + csyncr = status_one_consumer(cp, "synchronized"); + if (!gotone || script) { + if (!gotone) { + xo_emit("{t:name/%*s} {t:status/%*s} ", + name_len, name, status_len, status); + xo_open_list("components"); + } else { + /* + * XXX: running the same xo_emit() as + * above or variations of it will + * cause the XML/JSON to produce + * extra "components" lists in + * script mode + */ + + snprintf(fmt, sizeof(fmt), "%*s %*s ", + name_len, name, status_len, status); + xo_emit(fmt); + } + } + + xo_open_instance("component"); + if (cstate != NULL && csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", + len, "", cp->lg_provider->lg_name, cstate, csyncr); + } else if (cstate != NULL) { + xo_emit("{P:/%*s}{:component} ({:state})\n", + len, "", cp->lg_provider->lg_name, cstate); + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", + len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); + } + xo_close_instance("component"); gotone = 1; - printf("%*s %*s %s\n", name_len, name, - status_len, status, component); - if (!script) - name = status = ""; + if (!len && !script) + len = name_len + status_len + 4; } if (!gotone) { - printf("%*s %*s %s\n", name_len, name, - status_len, status, "N/A"); + xo_emit("{t:name/%*s} {t:status/%*s} N/A\n", + name_len, name, status_len, status); + } else { + xo_close_list("components"); } } + xo_close_instance("status"); } static void @@ -1241,13 +1345,9 @@ std_status(struct gctl_req *req, unsigned flags __unused) all = gctl_get_int(req, "all"); geoms = gctl_get_int(req, "geoms"); script = gctl_get_int(req, "script"); - if (script) { - name_len = 0; - status_len = 0; - } else { - name_len = strlen("Name"); - status_len = strlen("Status"); - } + name_len = strlen("Name"); + status_len = strlen("Status"); + if (nargs > 0) { for (i = 0, n = 0; i < nargs; i++) { name = gctl_get_ascii(req, "arg%d", i); @@ -1283,9 +1383,10 @@ std_status(struct gctl_req *req, unsigned flags __unused) goto end; } if (!script) { - printf("%*s %*s %s\n", name_len, "Name", status_len, "Status", - "Components"); + xo_emit("{T:/%*s} {T:/%*s} {T:Components}\n", + name_len, "Name", status_len, "Status"); } + xo_open_list(gclass_name); if (nargs > 0) { for (i = 0; i < nargs; i++) { name = gctl_get_ascii(req, "arg%d", i); @@ -1313,6 +1414,7 @@ std_status(struct gctl_req *req, unsigned flags __unused) } } } + xo_close_list(gclass_name); end: geom_deletetree(&mesh); } From nobody Mon Nov 17 22:16:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9MXl2Cvlz6H4Ty; Mon, 17 Nov 2025 22:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9MXl1fRyz3gTF; Mon, 17 Nov 2025 22:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763417799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z/0DffE6wFsjHuOJvk9f8ZJkbeqFagV20PogMX+GueQ=; b=TjU9ot+G2IDd03iqpQXXnXGFZt0LqGlVyz2CwdnP0+49eC80s6OHYp8rMmPj+5jF481Oin FEt5Hza4R+LC5FJBiEajyvY3PPz9xw6J4cqzGhON7UFCxDOwUcjawvT+0bp4j7Dte8wiG2 HVykMYlEkndlEBHfGYaFouQH49j9DUEaqOe2AbxiowvbZOrtaTbnArFX6msVilwQK85HkC drLChHvFMyxkxgeSEn+qmFy94J3yKn9pxKgUNxBTuHYUy7+H2dZ0fzTIUc8kpDfBC6zQFy uQnQTO5WjgNFrwaS4k8oK5CeipwPP4EP59u0m/b49ImPxTuoWxgc0O8omUAfQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763417799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z/0DffE6wFsjHuOJvk9f8ZJkbeqFagV20PogMX+GueQ=; b=PmTUseBgZy2Iz5IbsOrR6k/3lH20lvw5WocPRQGLSgUljGScTRtVVvm4Valekx7E8cCFVy ZyUkraB+hhQMFKLELjfbV9J/FQOmSxuu+9yTvI48l9Jez7rR3+G3Ue+Ib7ZnutpliXKRdk VmahMOsjx1iZj6PxldtHghzA0WL64jkvFMIQiTZ5GlOWy1PWfkR6/yy2QLweRYdi7joj5D 8F6ugeoJaWjca9w7n1AsCFNmXmM1fGEim83yMs+6LsEXTcbKJmu/msEBNLNU2yKGU69sa+ qiA8B7dAzH+yP9CjdySr+/LqPBw1IkHnJ/hWQpIOGH2bGZYnBxugffs020HPLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763417799; a=rsa-sha256; cv=none; b=qsahfR1bln0Ei9vQRZAv7YSNgXnE7tNmKtgPUmKk70lPAWVNtgOcQ7/9N+9HqfEHVHDOZB ukmdbaKckdyi4nhB94k9U7/iauV/lo+KmvJ/JrMESx/i/2NrEMyUvT30mhW0ZuxNjNF0rr u43r1tUExsY8OT1jP0e3rYgjtUozsOZXJW8cntW3RDlIsc3XDtyu1U0+/dF1fEpoYEq+Xw 2ETN0KQD4zCM7bSEnZ+UzVtqTdKEzYPSVAy6rrNEuZpBnJ7EiHArJYvn2CCukqy5H0JaD3 +JaVRe+hK6LrGaz88IzpB8Oc4yE8QM1QwgFKVMCio6DCX22YPXMrnsu7Eo9LdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9MXl0jmKzBQt; Mon, 17 Nov 2025 22:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHMGcbW049884; Mon, 17 Nov 2025 22:16:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHMGcp7049881; Mon, 17 Nov 2025 22:16:38 GMT (envelope-from git) Date: Mon, 17 Nov 2025 22:16:38 GMT Message-Id: <202511172216.5AHMGcp7049881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: 321a15380668 - stable/14 - bhyve: Report SVM as disabled on AMD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 321a153806685dff031c6ab2d453f077914910ec Auto-Submitted: auto-generated The branch stable/14 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=321a153806685dff031c6ab2d453f077914910ec commit 321a153806685dff031c6ab2d453f077914910ec Author: Chuck Tuffli AuthorDate: 2025-07-26 22:09:59 +0000 Commit: Chuck Tuffli CommitDate: 2025-11-17 21:54:00 +0000 bhyve: Report SVM as disabled on AMD bhyve with a Windows 2025 guest will hang/freeze with the message rdmsr to register 0xc0010114 on a system with an AMD Ryzen 5. Evidently, recent versions of Windows ignore the CPUID bits and still read this MSR. Fix is to report Secure Virtual Machine (SVM) mode as disabled in the VM CR. PR: 288308 (cherry picked from commit 92dfc3fbcd79422a4586590edabe483f361b7e0e) --- usr.sbin/bhyve/amd64/xmsr.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/usr.sbin/bhyve/amd64/xmsr.c b/usr.sbin/bhyve/amd64/xmsr.c index 7481df4669e7..b245fc27045d 100644 --- a/usr.sbin/bhyve/amd64/xmsr.c +++ b/usr.sbin/bhyve/amd64/xmsr.c @@ -205,6 +205,15 @@ emulate_rdmsr(struct vcpu *vcpu __unused, uint32_t num, uint64_t *val) *val = 1; break; + case MSR_VM_CR: + /* + * We currently don't support nested virt. + * Windows seems to ignore the cpuid bits and reads this + * MSR anyways. + */ + *val = VM_CR_SVMDIS; + break; + default: error = -1; break; From nobody Mon Nov 17 23:47:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9PZ016ZYz6HBRq; Mon, 17 Nov 2025 23:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9PZ00LK4z3qw4; Mon, 17 Nov 2025 23:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763423272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCZ+gVxI2SqL9Dbm9ehyeeXxfETxaJGeO29MivCS6sU=; b=dkNWAIQiHEPAcyzRDnLn6MYK/cjJ1M+uuRKXTI0skpUdI1BKu+dGnEIgLbEsNnZRAwePVK WGTfUHtwQKlEhtDTCOPOZ/SjMz+fUa7CxxKgrt8nxYDiERSOIaQgKYjH6sCLkqAI2cEldl eKxtBxCLIsLmglMkjTXWBh0FJW5VOWB6voZVpSlUn7aDMYyleAav2ytYKUvsu2RtW4rnCQ 2UtJb8HkK8QUmX/wJuiMhsHt+9xSjAbGFT4Ks7v2PKW5/+YnjaFZe2iwthgZD2FRQJJIcB O+SXKz/JCjRxBHDy8zMSaEZFCMMLwRHd4WFQ+BLb9Y51fX9FLv7udSsObYPGxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763423272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCZ+gVxI2SqL9Dbm9ehyeeXxfETxaJGeO29MivCS6sU=; b=nXzOEaYnaOXfi/6lV6HfvCGrRyR+wpTzMe8BNacotwmW75mBChvAYZ6k4ylrgdW3FTJQJh NFT17SpNyJDgNk/9f4Ez3q01uaxkcqOwslx8hgNjBvP3NpCUCqDIp6Ojo1bi+lcPo1KUoR 6DdZRDOOP8NNOqQ6WVcHPT2JjLJQmBVJkaQJ1thxXg4J949LuUFWUqOQRFvEEUJsr5hetC GDojox7+oNbXHzmDl2woYcn340V6SfOrUorQl33ZcwsSyV7CkhqTAQra39/OihnV6G4jnS Ehti0yCHvoDJEFvK5PLf4fZDIbbfJvfi/EzMpZ9NiBcof78mP0yZ5LldJ27NDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763423272; a=rsa-sha256; cv=none; b=ObQPwHWB4zrbOmRDI2l6Tz28t52BoaOlkMAlYCRjMdwDijl8XNe35h8xdQL+9/qaAXzCdI RsYWy3s/qckXkCZdM0XjHtaW61wZSIMTNVjXUjVnf2I/rKjtjpg+bPaOkornnHmcTdvXex 8cYk3Era6cDoKzxScaprcXSwNSwsOAduQdatmZSBJ7zNkZuGtj4GM/QBjPhSHp5rg75u7L hTleg6vxfTRa/TvRuPIj1M5NoRWfedCtAEhsG44xz8HFtjdlyWb/CwiiRQ9N5vl4hR4Row A+xj3g+B9LeEtV7DC7708WPA8r343sigxMTXJjikQcOi070l/zHMAsfkHwYfTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9PYz6mkwzDT0; Mon, 17 Nov 2025 23:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHNlpuU019608; Mon, 17 Nov 2025 23:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHNlpqe019605; Mon, 17 Nov 2025 23:47:51 GMT (envelope-from git) Date: Mon, 17 Nov 2025 23:47:51 GMT Message-Id: <202511172347.5AHNlpqe019605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 45197d29ced2 - stable/14 - Fix getmntpoint(3) to operate as it is documented in its manual page. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 45197d29ced2f57941a771dc8ec37243a52b9a7e Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=45197d29ced2f57941a771dc8ec37243a52b9a7e commit 45197d29ced2f57941a771dc8ec37243a52b9a7e Author: Kirk McKusick AuthorDate: 2025-10-22 18:01:03 +0000 Commit: Kirk McKusick CommitDate: 2025-11-17 23:47:36 +0000 Fix getmntpoint(3) to operate as it is documented in its manual page. The -libutil function getmntpoint(3) is documented as accepting a device name “with or without /dev/ prepended to it” but did not attempt to prepend /dev/. This patch corrects the problem by prepending /dev/ to names that do not begin with a '/'. Reported-by: Dag-Erling Smørgrav Differential Revision: https://reviews.freebsd.org/D53185 Sponsored-by: Netflix (cherry picked from commit 99bf680a8499dea71db5da705dfe41f4bb5e00ab) --- sbin/mount/getmntopts.c | 53 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index fab25466425f..32f2920eb9c5 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -152,6 +152,18 @@ checkpath_allow_file(const char *path, char *resolved) return (0); } +static char * +prependdevtopath(const char *path, char *buf, u_long buflen) +{ + u_long len; + + if ((len = strlen(_PATH_DEV) + strlen(path) + 1) > buflen) + return NULL; + strncpy(buf, _PATH_DEV, len); + strncat(buf, path, len - sizeof(_PATH_DEV)); + return (buf); +} + /* * Get the mount point information for name. Name may be mount point name * or device name (with or without /dev/ preprended). @@ -160,19 +172,27 @@ struct statfs * getmntpoint(const char *name) { struct stat devstat, mntdevstat; - char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; - char *ddevname; + char *devname; struct statfs *mntbuf, *statfsp; - int i, mntsize, isdev; - u_long len; + int i, len, isdev, mntsize, mntfromnamesize; + char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; + u_long devlen; - if (stat(name, &devstat) != 0) + devlen = sizeof(device); + /* + * Note that stat(NULL, &statbuf) returns -1 (EBADF) which will + * cause us to return NULL if prependdevtopath() returns NULL. + */ + if (stat(name, &devstat) != 0 && + (name[0] != '/' && + stat(prependdevtopath(name, device, devlen), &devstat) != 0)) return (NULL); if (S_ISCHR(devstat.st_mode) || S_ISBLK(devstat.st_mode)) isdev = 1; else isdev = 0; mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); + mntfromnamesize = sizeof(statfsp->f_mntfromname); for (i = 0; i < mntsize; i++) { statfsp = &mntbuf[i]; if (isdev == 0) { @@ -180,19 +200,20 @@ getmntpoint(const char *name) continue; return (statfsp); } - ddevname = statfsp->f_mntfromname; - if (*ddevname != '/') { - if ((len = strlen(_PATH_DEV) + strlen(ddevname) + 1) > - sizeof(statfsp->f_mntfromname) || - len > sizeof(device)) + devname = statfsp->f_mntfromname; + if (*devname == '/') { + if (stat(devname, &mntdevstat) != 0) + continue; + } else { + devname = prependdevtopath(devname, device, devlen); + if (devname == NULL || + (len = strlen(devname)) > mntfromnamesize) + continue; + if (stat(devname, &mntdevstat) != 0) continue; - strncpy(device, _PATH_DEV, len); - strncat(device, ddevname, len); - if (stat(device, &mntdevstat) == 0) - strncpy(statfsp->f_mntfromname, device, len); + strncpy(statfsp->f_mntfromname, devname, len); } - if (stat(ddevname, &mntdevstat) == 0 && - S_ISCHR(mntdevstat.st_mode) && + if (S_ISCHR(mntdevstat.st_mode) && mntdevstat.st_rdev == devstat.st_rdev) return (statfsp); } From nobody Tue Nov 18 00:02:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9PvK1yXlz6HCcr; Tue, 18 Nov 2025 00:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9PvK1NFhz3sbg; Tue, 18 Nov 2025 00:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763424173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddl9y3ao/0LKH0j9IRJEf/qazm/u3Jr8AjxfkexgMss=; b=aqCxDnGsFqvGhSKI9DHuczsc40RuLQ0j9L0cohtJvpmNF5bMWDJsAAk7LpCIoHYJHT4iua kL9gKYtVs50XQi5m1bIzcgQLyy2YaTyMuNkqkZQHjwvZGl8dTQdi3vAv1Q6X1FVj7sC7U6 0iN5FWhRY6jZVvhxnh2MNhxQhbNcVPXHVhah9fKoJ6In4nhDNAqVpjmgcl6hS3Kfgj3myh /kGF5BpIwECKpE3tMFm4p4wx7Tu2Lx7NNZUyKs1KMV6KvUDQvDvITy2Z6rvHMe+zU+H8Xy 86Sd6lIo7RdAOp5Zhsn7PbKCB3mysHPzFt94HT5lTcx49RzY95iV+FfMep54OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763424173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddl9y3ao/0LKH0j9IRJEf/qazm/u3Jr8AjxfkexgMss=; b=cBigvqXfRUnxGXdwKUKpbIiA/8Cose7k2tCmuesuiuOG4tdX87XikZ4yJJD9h8M04ecSpl W23FkSeP2VteHbadhUgJeU2Gkoqs1riwwXbx3WyAfG3MP+aoRNRcm0IZcJiqV/bCUdS969 Usb86nqnu7eAn25U7vxaK13Td3p5rJ1FZ07bJoqYNC6b2ZTcP0BYaFZ54nnVrWNt+vvk4/ +8hdPNKIhgeQZx1UdJCLLCp08iZv5GGG7bnmJoUz1ZP36pUulA5N0f26l8SXE/TV1THIHR 2WwZkY8zMAuOUtrDCHbAlhIcGtJgAY0Q2DS/4k6uYQgK6jEqptQWDpnvh6BZxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763424173; a=rsa-sha256; cv=none; b=FgEmZGexveHh7JhNWCfeBksZ1CqcGMtLwC1YGXIXbSOQEWf8aAajmCMDBCyH26fiQ65ozG Sv0Y7eEV3ryRHisD9h2HtaPN2aKlVwsL0v+7RE8kFKsSWIWdfu2fqKnIC2wrJLHC8B3t70 QvsEpQsFcNc1yMhXVsmAOT3Cj0KuexYPJkdqfK/scMbB39g9wOvroiw9nQKtfH2ubAWqnT 8/BJXivyicg9HR8/PnyTDGSHdLjE4E35xtuIdm7VTPr7IRX/we46NaAD1suNgA59Iy1sxv b9SFP2CvTvT8LFEync3fVcNWljy9UmjwAG6PJ5SxODjT4NG2P/fXWRR55MqG6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9PvK0zZyzVcV; Tue, 18 Nov 2025 00:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI02r1a056610; Tue, 18 Nov 2025 00:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI02r51056607; Tue, 18 Nov 2025 00:02:53 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:02:53 GMT Message-Id: <202511180002.5AI02r51056607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 404fbe6847b4 - stable/15 - Fix getmntpoint(3) to operate as it is documented in its manual page. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 404fbe6847b42d12fcaa034d148d41ff63ccf420 Auto-Submitted: auto-generated The branch stable/15 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=404fbe6847b42d12fcaa034d148d41ff63ccf420 commit 404fbe6847b42d12fcaa034d148d41ff63ccf420 Author: Kirk McKusick AuthorDate: 2025-10-22 18:01:03 +0000 Commit: Kirk McKusick CommitDate: 2025-11-17 23:57:26 +0000 Fix getmntpoint(3) to operate as it is documented in its manual page. The -libutil function getmntpoint(3) is documented as accepting a device name “with or without /dev/ prepended to it” but did not attempt to prepend /dev/. This patch corrects the problem by prepending /dev/ to names that do not begin with a '/'. Reported-by: Dag-Erling Smørgrav Differential Revision: https://reviews.freebsd.org/D53185 Sponsored-by: Netflix (cherry picked from commit 99bf680a8499dea71db5da705dfe41f4bb5e00ab) --- lib/libutil/mntopts.c | 53 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/lib/libutil/mntopts.c b/lib/libutil/mntopts.c index 07d3dd6d98a3..4a064a086fd5 100644 --- a/lib/libutil/mntopts.c +++ b/lib/libutil/mntopts.c @@ -145,6 +145,18 @@ checkpath_allow_file(const char *path, char *resolved) return (0); } +static char * +prependdevtopath(const char *path, char *buf, u_long buflen) +{ + u_long len; + + if ((len = strlen(_PATH_DEV) + strlen(path) + 1) > buflen) + return NULL; + strncpy(buf, _PATH_DEV, len); + strncat(buf, path, len - sizeof(_PATH_DEV)); + return (buf); +} + /* * Get the mount point information for name. Name may be mount point name * or device name (with or without /dev/ preprended). @@ -153,19 +165,27 @@ struct statfs * getmntpoint(const char *name) { struct stat devstat, mntdevstat; - char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; - char *ddevname; + char *devname; struct statfs *mntbuf, *statfsp; - int i, mntsize, isdev; - u_long len; + int i, len, isdev, mntsize, mntfromnamesize; + char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; + u_long devlen; - if (stat(name, &devstat) != 0) + devlen = sizeof(device); + /* + * Note that stat(NULL, &statbuf) returns -1 (EBADF) which will + * cause us to return NULL if prependdevtopath() returns NULL. + */ + if (stat(name, &devstat) != 0 && + (name[0] != '/' && + stat(prependdevtopath(name, device, devlen), &devstat) != 0)) return (NULL); if (S_ISCHR(devstat.st_mode) || S_ISBLK(devstat.st_mode)) isdev = 1; else isdev = 0; mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); + mntfromnamesize = sizeof(statfsp->f_mntfromname); for (i = 0; i < mntsize; i++) { statfsp = &mntbuf[i]; if (isdev == 0) { @@ -173,19 +193,20 @@ getmntpoint(const char *name) continue; return (statfsp); } - ddevname = statfsp->f_mntfromname; - if (*ddevname != '/') { - if ((len = strlen(_PATH_DEV) + strlen(ddevname) + 1) > - sizeof(statfsp->f_mntfromname) || - len > sizeof(device)) + devname = statfsp->f_mntfromname; + if (*devname == '/') { + if (stat(devname, &mntdevstat) != 0) + continue; + } else { + devname = prependdevtopath(devname, device, devlen); + if (devname == NULL || + (len = strlen(devname)) > mntfromnamesize) + continue; + if (stat(devname, &mntdevstat) != 0) continue; - strncpy(device, _PATH_DEV, len); - strncat(device, ddevname, len); - if (stat(device, &mntdevstat) == 0) - strncpy(statfsp->f_mntfromname, device, len); + strncpy(statfsp->f_mntfromname, devname, len); } - if (stat(ddevname, &mntdevstat) == 0 && - S_ISCHR(mntdevstat.st_mode) && + if (S_ISCHR(mntdevstat.st_mode) && mntdevstat.st_rdev == devstat.st_rdev) return (statfsp); } From nobody Tue Nov 18 00:51:44 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzj0Q9mz6HH1R; Tue, 18 Nov 2025 00:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzh6fF7z3xJq; Tue, 18 Nov 2025 00:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IvAC5xh1QLOYStgt0vMQhr8aQhnUuWRNHR0yrAQmpg=; b=GYk5hH77PKOLGzCe+s9dEUeI+gxB5SJc5/jcz5Xsdi3nXklkbQdX2hxgwLsI0lfK0+dOaA uwl3t9bSxjRbatzecXbFqjTftkRtSKGt3vvR3lwlaROkQTrpV0tK8bL5gokV4v/qw2F1fT f2FkMnVPdRzlFm3WCLKmtgbE/q83aOeME0CeFdlpONymDpm81TF1Q1TG6HO3VqhSYqLPoS 9TxYtf+g5wCtDdbD4CGb1qlovBW4IP4h73cf3Y4LhOT59Si7b1lZQjWSRAQGhEDqkJd/6E Pa9JaL8RW/+QsyfAfAPOY3CEM2TEz32cLiptKR2CESjkR1M6HGHLE0sV3MWohA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IvAC5xh1QLOYStgt0vMQhr8aQhnUuWRNHR0yrAQmpg=; b=GyEZjhDsYa/OMWHLFU35LgOQivdGY1D3578ovt637ncEVPwcjoiLV+QCj44pR4B9zW5x1S tMfRmfjjfqgJg2lXXFDvGErdBJOmZtBUhyO7N6z0KzUZ6Q8ZQ60M75XpIXThp/cQzz59sa TsXIGGk3hHfxa+wwS+KPh+1cW3LY13jouH1u45udoJBwAzIwKffDXN+B0htpT+e+qzxilw 8u6XJN96AERV27EbI7ekfK36KopGHVoT5oMfw2hs19ch/gaTp6SJN3wVdkfNsjE9TuKlfN NE41Pw8LwpfSnz6hcBvIi/4c2+uct9YFANt1tVoKNw6KCBALT/94ORgDpkLdTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427104; a=rsa-sha256; cv=none; b=pVSN4OWgWgUzoYa77BHSgOzgotv1zBhiSeOD0vYxY7ZIjAnL0iSf9PicY7X6s4NSNPHEDP O5k7HRvr6RIxY+VfrleJFfKGyQE2migYuRZU4pBSU58S8APVC6Psp0hOuJwhHVDjFNArpv yuaXCKqHufGxvKb869kEvdv4GZZtDhf315/1UJyXTMoNPcBJZvZqubzzVy6vwJPKe+QZNO S2qMrjBbQ3p4bnVzcKOgpzID5REnsEWEDOcyL0TjmSNGDlCvNp5GDRZ5E6VMQhJMfmpLIm qAAdIlIEMYu/1i8kkFyQajn6c1JHadrGjK7+SWQ73a1JiHP7y3A7rgjKI3do9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzh6372zY7k; Tue, 18 Nov 2025 00:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0piuO044679; Tue, 18 Nov 2025 00:51:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0piPU044676; Tue, 18 Nov 2025 00:51:44 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:44 GMT Message-Id: <202511180051.5AI0piPU044676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: f7fe9f04c396 - stable/15 - sound: Add kqueue support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f7fe9f04c396d16a144dcce779e6a633e584e4a0 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f7fe9f04c396d16a144dcce779e6a633e584e4a0 commit f7fe9f04c396d16a144dcce779e6a633e584e4a0 Author: Christos Margiolis AuthorDate: 2025-11-11 12:04:45 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:00 +0000 sound: Add kqueue support Co-authored by: meka@tilda.center Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53029 (cherry picked from commit 4181bf9d18166c4061bfa137b8a46972a5a55f67) --- sys/dev/sound/pcm/channel.c | 9 +++-- sys/dev/sound/pcm/channel.h | 1 + sys/dev/sound/pcm/dsp.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 4d13f20a5262..062eeb251a5b 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -271,7 +271,7 @@ chn_lockdestroy(struct pcm_channel *c) * @retval 1 = ready for I/O * @retval 0 = not ready for I/O */ -static int +int chn_polltrigger(struct pcm_channel *c) { struct snd_dbuf *bs = c->bufsoft; @@ -313,6 +313,7 @@ chn_wakeup(struct pcm_channel *c) bs = c->bufsoft; if (CHN_EMPTY(c, children.busy)) { + KNOTE_LOCKED(&bs->sel.si_note, 0); if (SEL_WAITING(sndbuf_getsel(bs)) && chn_polltrigger(c)) selwakeuppri(sndbuf_getsel(bs), PRIBIO); CHN_BROADCAST(&c->intr_cv); @@ -1277,6 +1278,7 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, } c->bufhard = b; c->bufsoft = bs; + knlist_init_mtx(&bs->sel.si_note, c->lock); c->devinfo = CHANNEL_INIT(c->methods, devinfo, b, c, direction); if (c->devinfo == NULL) { @@ -1373,8 +1375,11 @@ chn_kill(struct pcm_channel *c) feeder_remove(c); if (c->devinfo && CHANNEL_FREE(c->methods, c->devinfo)) sndbuf_free(b); - if (bs) + if (bs) { + knlist_clear(&bs->sel.si_note, 0); + knlist_destroy(&bs->sel.si_note); sndbuf_destroy(bs); + } if (b) sndbuf_destroy(b); CHN_LOCK(c); diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 9ad21d219001..15180bc8f0b6 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -261,6 +261,7 @@ int chn_read(struct pcm_channel *c, struct uio *buf); u_int32_t chn_start(struct pcm_channel *c, int force); int chn_sync(struct pcm_channel *c, int threshold); int chn_flush(struct pcm_channel *c); +int chn_polltrigger(struct pcm_channel *c); int chn_poll(struct pcm_channel *c, int ev, struct thread *td); char *chn_mkname(char *buf, size_t len, struct pcm_channel *c); diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 27d5b740b90b..1b205d7229fc 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -81,6 +81,7 @@ static d_ioctl_t dsp_ioctl; static d_poll_t dsp_poll; static d_mmap_t dsp_mmap; static d_mmap_single_t dsp_mmap_single; +static d_kqfilter_t dsp_kqfilter; struct cdevsw dsp_cdevsw = { .d_version = D_VERSION, @@ -89,6 +90,7 @@ struct cdevsw dsp_cdevsw = { .d_write = dsp_write, .d_ioctl = dsp_ioctl, .d_poll = dsp_poll, + .d_kqfilter = dsp_kqfilter, .d_mmap = dsp_mmap, .d_mmap_single = dsp_mmap_single, .d_name = "dsp", @@ -2962,6 +2964,86 @@ dsp_oss_getchannelmask(struct pcm_channel *wrch, struct pcm_channel *rdch, return (ret); } +static void +dsp_kqdetach(struct knote *kn) +{ + struct pcm_channel *ch = kn->kn_hook; + + if (ch == NULL) + return; + CHN_LOCK(ch); + knlist_remove(&ch->bufsoft->sel.si_note, kn, 1); + CHN_UNLOCK(ch); +} + +static int +dsp_kqevent(struct knote *kn, long hint) +{ + struct pcm_channel *ch = kn->kn_hook; + + CHN_LOCKASSERT(ch); + if (ch->flags & CHN_F_DEAD) { + kn->kn_flags |= EV_EOF; + return (1); + } + kn->kn_data = 0; + if (chn_polltrigger(ch)) { + if (kn->kn_filter == EVFILT_READ) + kn->kn_data = sndbuf_getready(ch->bufsoft); + else + kn->kn_data = sndbuf_getfree(ch->bufsoft); + } + + return (kn->kn_data > 0); +} + +static const struct filterops dsp_filtops = { + .f_isfd = 1, + .f_detach = dsp_kqdetach, + .f_event = dsp_kqevent, +}; + +static int +dsp_kqfilter(struct cdev *dev, struct knote *kn) +{ + struct dsp_cdevpriv *priv; + struct snddev_info *d; + struct pcm_channel *ch; + int err = 0; + + if ((err = devfs_get_cdevpriv((void **)&priv)) != 0) + return (err); + + d = priv->sc; + if (!DSP_REGISTERED(d)) + return (EBADF); + PCM_GIANT_ENTER(d); + switch (kn->kn_filter) { + case EVFILT_READ: + ch = priv->rdch; + break; + case EVFILT_WRITE: + ch = priv->wrch; + break; + default: + kn->kn_hook = NULL; + err = EINVAL; + ch = NULL; + break; + } + if (ch != NULL) { + kn->kn_fop = &dsp_filtops; + CHN_LOCK(ch); + knlist_add(&ch->bufsoft->sel.si_note, kn, 1); + CHN_UNLOCK(ch); + kn->kn_hook = ch; + } else + err = EINVAL; + PCM_GIANT_LEAVE(d); + + return (err); +} + #ifdef OSSV4_EXPERIMENT /** * @brief Retrieve an audio device's label From nobody Tue Nov 18 00:51:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzk23q1z6HGwM; Tue, 18 Nov 2025 00:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzk0Znkz3x0H; Tue, 18 Nov 2025 00:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJFhuQ/e/GdyL/YEtJaF0Y03RFtRdDNzHGkJhQJJ+P4=; b=a1fFxm4VZ8bHapFYS/qq+J7y+eJC8b8ug9paWRFsPnVYGD7B+yyBzm/yEu7OEcQzYOsK3R UncM2i44L148R1xUYA6f2eaDB71U+arPITOB9tscGcLQV4QIezhtWUTqn1cWOVXdZGGORn vHeJkaqqX0diDltp5GKiBdomfsVgZCx2WDoGlo6kZ9C3pY6jTcWL9ItAZJdataJ8TOimzd Fn7W2nJ1xmV09s2XUEJk1ky7hG3+EeFP3CTWm0fqb5iNvt1/pSrmqf9oq3bKO42AO7mfwV FcWtnUpUBONSfSFVxxAAwVPaQ7J3I7Z6WezDEetfed1VM+nfrdgETQzWxcIJmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJFhuQ/e/GdyL/YEtJaF0Y03RFtRdDNzHGkJhQJJ+P4=; b=V4y9KvXo/y8n3/2iYWaGwHQ23MLSpa7PqpLQWiFxQkW0/GYBCSHdZ5Gjqbf2j3DNQDn7r4 v3cKplLRwd+iIPIofbO13x2YziXI+OOcsYgAUyvwnIfHpsM2dMG5crutjam+D1CCKUkOZy qQbozpTR+M8i9WqV5HexFq41RgA9kwy0jdz9R+rswStWh1rlf92kry11ffwwrieHaMrmZw kivRopEwB/K/qYg0yK1qBb5gLXsqTdaIkS8GmerI3zUKLr+Uekmtrimouo116TA3E6vSw4 g6w8wQQ1d/V4jhMkcIV4Ky4YI0tQ2hNsfl74yj+NvUGyFbdYddxg/4ph/R7V0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427106; a=rsa-sha256; cv=none; b=Vu9cRC1VMYku6pgwPkZKc7j4/e/14Nuz5r8+d7jGSNTqktskVov41F2X2g431o5eNF0Vkt iYDZaozDoG5i8PuuW0i6vtauEhZDiO3fUv8gQx70hGOs9uPubVzjF5mZAHGTCMm4tGP0N6 fq+Z4yEhEwn4SnEqZB/huNlf9zWFyLk+hZc3JiaEeADtkmsxat1hEBQRaPEofl/py/NGrB WQpFy5whxGfdUgtlJqkylOMDNhEB1gNny9YnmGeI/Km0yau/LGnuhuR7M+qxUwSz9/HX6d Qukn8K1FUkxw9s29VLrW9vCg1Xvwe4NNrJ5ogs5bGwdx9gIzXHhYvZEylyTGmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzj70smzXmm; Tue, 18 Nov 2025 00:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pjX7044713; Tue, 18 Nov 2025 00:51:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pj99044710; Tue, 18 Nov 2025 00:51:45 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:45 GMT Message-Id: <202511180051.5AI0pj99044710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 16dc00a5cf58 - stable/15 - sound tests: Test polling List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 16dc00a5cf58b4be96748b4a7c9b932f6422547c Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=16dc00a5cf58b4be96748b4a7c9b932f6422547c commit 16dc00a5cf58b4be96748b4a7c9b932f6422547c Author: Christos Margiolis AuthorDate: 2025-11-11 12:04:54 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:12 +0000 sound tests: Test polling Co-authored by: meka@tilda.center Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53188 (cherry picked from commit dd81b19ef23622d03d7c75935e11c2b2af3f4cb8) (cherry picked from commit 41f2ec3be93a2981e5afcc2569e6abcc64414437) (cherry picked from commit eb95b990f8ebfb85ce6e4d7d16305746b5eddcde) (cherry picked from commit fb99c0ba60dc464aab2102c4395791e151d438c6) --- tests/sys/sound/Makefile | 1 + tests/sys/sound/polling.c | 205 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+) diff --git a/tests/sys/sound/Makefile b/tests/sys/sound/Makefile index 74a0765a0540..ab52a7aad386 100644 --- a/tests/sys/sound/Makefile +++ b/tests/sys/sound/Makefile @@ -3,6 +3,7 @@ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/sound ATF_TESTS_C+= pcm_read_write +ATF_TESTS_C+= polling ATF_TESTS_C+= sndstat CFLAGS+= -I${SRCTOP}/sys diff --git a/tests/sys/sound/polling.c b/tests/sys/sound/polling.c new file mode 100644 index 000000000000..b7a328d13d4c --- /dev/null +++ b/tests/sys/sound/polling.c @@ -0,0 +1,205 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * + * This software was developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include + +#define FMT_ERR(s) s ": %s", strerror(errno) + +static int +oss_init(void) +{ + int fd, tmp, rc; + + fd = open("/dev/dsp.dummy", O_RDWR); + ATF_REQUIRE_MSG(fd >= 0, FMT_ERR("open")); + + tmp = 2; + rc = ioctl(fd, SNDCTL_DSP_CHANNELS, &tmp); + ATF_REQUIRE_EQ_MSG(rc, 0, FMT_ERR("ioctl")); + + tmp = AFMT_S16_LE; + rc = ioctl(fd, SNDCTL_DSP_SETFMT, &tmp); + ATF_REQUIRE_EQ_MSG(rc, 0, FMT_ERR("ioctl")); + + tmp = 48000; + rc = ioctl(fd, SNDCTL_DSP_SPEED, &tmp); + ATF_REQUIRE_EQ_MSG(rc, 0, FMT_ERR("ioctl")); + + /* + * See http://manuals.opensound.com/developer/SNDCTL_DSP_SETTRIGGER.html + */ + tmp = PCM_ENABLE_INPUT | PCM_ENABLE_OUTPUT; + rc = ioctl(fd, SNDCTL_DSP_SETTRIGGER, &tmp); + ATF_REQUIRE_EQ_MSG(rc, 0, FMT_ERR("ioctl")); + + return (fd); +} + +ATF_TC(poll_kqueue); +ATF_TC_HEAD(poll_kqueue, tc) +{ + atf_tc_set_md_var(tc, "descr", "kqueue(2) test"); + atf_tc_set_md_var(tc, "require.kmods", "snd_dummy"); +} + +ATF_TC_BODY(poll_kqueue, tc) +{ + struct kevent ev; + int16_t buf[32]; + int fd, kq; + + fd = oss_init(); + + kq = kqueue(); + ATF_REQUIRE_MSG(kq >= 0, FMT_ERR("kqueue")); + EV_SET(&ev, fd, EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, 0); + ATF_REQUIRE_MSG(kevent(kq, &ev, 1, NULL, 0, NULL) == 0, + FMT_ERR("kevent")); + + ATF_REQUIRE_MSG(kevent(kq, NULL, 0, &ev, 1, NULL) == 1, + FMT_ERR("kevent")); + ATF_REQUIRE_MSG((ev.flags & EV_ERROR) == 0, "EV_ERROR is set"); + ATF_REQUIRE_MSG(ev.data != 0, "data is %" PRId64, ev.data); + ATF_REQUIRE_MSG(read(fd, buf, sizeof(buf)) > 0, FMT_ERR("read")); + + EV_SET(&ev, fd, EVFILT_READ, EV_DELETE, 0, 0, 0); + close(kq); + + kq = kqueue(); + ATF_REQUIRE_MSG(kq >= 0, FMT_ERR("kqueue")); + EV_SET(&ev, fd, EVFILT_WRITE, EV_ADD | EV_CLEAR, 0, 0, 0); + ATF_REQUIRE_MSG(kevent(kq, &ev, 1, NULL, 0, NULL) == 0, + FMT_ERR("kevent")); + + ATF_REQUIRE_MSG(kevent(kq, NULL, 0, &ev, 1, NULL) == 1, + FMT_ERR("kevent")); + ATF_REQUIRE_MSG((ev.flags & EV_ERROR) == 0, "EV_ERROR is set"); + ATF_REQUIRE_MSG(ev.data != 0, "data is %" PRId64, ev.data); + ATF_REQUIRE_MSG(write(fd, buf, sizeof(buf)) > 0, FMT_ERR("write")); + + EV_SET(&ev, fd, EVFILT_WRITE, EV_DELETE, 0, 0, 0); + close(kq); + + close(fd); +} + +ATF_TC(poll_poll); +ATF_TC_HEAD(poll_poll, tc) +{ + atf_tc_set_md_var(tc, "descr", "poll(2) test"); + atf_tc_set_md_var(tc, "require.kmods", "snd_dummy"); +} + +ATF_TC_BODY(poll_poll, tc) +{ + struct pollfd pfd[2]; + int16_t buf[32]; + int fd; + bool rd = false; + bool wr = false; + + fd = oss_init(); + + while (!rd || !wr) { + pfd[0].fd = fd; + pfd[0].events = POLLIN; + pfd[1].fd = fd; + pfd[1].events = POLLOUT; + ATF_REQUIRE_MSG(poll(pfd, sizeof(pfd) / sizeof(struct pollfd), + -1) > 0, FMT_ERR("poll")); + + if (pfd[0].revents) { + ATF_REQUIRE_MSG(read(fd, buf, sizeof(buf)) > 0, + FMT_ERR("read")); + rd = true; + } + if (pfd[1].revents) { + ATF_REQUIRE_MSG(write(fd, buf, sizeof(buf)) > 0, + FMT_ERR("write")); + wr = true; + } + } + close(fd); +} + +ATF_TC(poll_select); +ATF_TC_HEAD(poll_select, tc) +{ + atf_tc_set_md_var(tc, "descr", "select(2) test"); + atf_tc_set_md_var(tc, "require.kmods", "snd_dummy"); +} + +ATF_TC_BODY(poll_select, tc) +{ + fd_set fds[2]; + int16_t buf[32]; + int fd; + bool rd = false; + bool wr = false; + + fd = oss_init(); + + while (!rd || !wr) { + FD_ZERO(&fds[0]); + FD_ZERO(&fds[1]); + FD_SET(fd, &fds[0]); + FD_SET(fd, &fds[1]); + ATF_REQUIRE_MSG(select(fd + 2, &fds[0], &fds[1], NULL, NULL) > 0, + FMT_ERR("select")); + if (FD_ISSET(fd, &fds[0])) { + ATF_REQUIRE_MSG(read(fd, buf, sizeof(buf)) > 0, + FMT_ERR("read")); + rd = true; + } + if (FD_ISSET(fd, &fds[1])) { + ATF_REQUIRE_MSG(write(fd, buf, sizeof(buf)) > 0, + FMT_ERR("write")); + wr = true; + } + } + close(fd); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, poll_kqueue); + ATF_TP_ADD_TC(tp, poll_poll); + ATF_TP_ADD_TC(tp, poll_select); + + return (atf_no_error()); +} From nobody Tue Nov 18 00:51:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzl595Gz6HH3j; Tue, 18 Nov 2025 00:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzl212hz3xTq; Tue, 18 Nov 2025 00:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQrNPOdtUCD9rNvoQZ+hYN6QOzzu+/svRVju19uUb20=; b=fSagQtg28rGruIxhfdsndZDRuT6XjEayhzyrH5TwsGg6Yq9uIinXafzajydzRsbGJ8T3BK lzB9ulfcpy07KDuREOIY5+nl3f+7b+iMnKnHaojhHpfwnKzWva5tleFjiv+R1tuigLGL76 KK5iO6v5Mv2w8S0oTrr6V4XlXY1fZ/Uio5hi1/pLjW1m1lCndbdv1HU0RvRl/okrwE97fH LzFWQwAwQ3DU47uFzb5Ie6wM8ZmNmlzqtQeBJNlnPOxp8HKx6MBquz8znxASp6AaSXGAdg vjGbfxBY06AH2trSPNOegrJW1dzEpqwMZk7xozXgwsjhRRM75UN3LE7W9YemSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eQrNPOdtUCD9rNvoQZ+hYN6QOzzu+/svRVju19uUb20=; b=ZUxZyofcofD2wMVhJ9IiuJMB8MwQc1oVRHgnCHirfKpMNwV2NhPHmUvx4Xx9T1t5l0ueV5 jsmV0zGnjes5Z48fBoPLaBTkbvWJ4723Qa7fyxhXAxG+c/sjjpAaGEnbXYHc98wHmbEP9y WbQ/pfUJNIcL0Vi/dCLuvQwRihjhwCRtquorLHarSpmUFLZyXIP7fx4xdRHfckl9r0PcX7 lvpuJq/kuUrBk1XyHO/+oKRUyVfQK+NC1IGs5wD8RkLQv10DaCNkR2t/C4v38L1naURZzZ Sy9OpU52demm6biWoZ5CZb/qM5mVwl8MotGCBQYM6t8TLhQq79zCS3mcQoeJNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427107; a=rsa-sha256; cv=none; b=Op9atA0S1CxRYphYSLsF5ffpDNLKEGpwUhpWNVas0HRWjs0rPwQf3tBCi/Gl64i85VB44O wWXhdYSKRU9EWclXBQvuQxFVnjMmara1qstfswgpDQo3Shumappia8a/Znfuufr9P9qqbW FZhud07ZS1nHPB/wOL99qnX8F2Jrqz5L0ecOEhp4xfyx25c24PE/r0L26NQJTqKn2Y07lC 1Bz7uD4MtmnMHLxbE4H7IVdxJOWpF1bpt0Y1q/xUoWppsmyW8m4Poi8hc3ptMoAcV9bOPX sqCjv9EEnJDF2OcnUTxoMOtw3ZiFrYwBfERiJusdyzVDDCJwHkddb460ggFkZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzl0qzTzXZy; Tue, 18 Nov 2025 00:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0plVa044746; Tue, 18 Nov 2025 00:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pl2X044743; Tue, 18 Nov 2025 00:51:47 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:47 GMT Message-Id: <202511180051.5AI0pl2X044743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: c58e41d899a7 - stable/15 - sound: Clarify userland/vchan relationship in sndstat feeder chain List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c58e41d899a785abf1f075dfef3ed9c045d5ca23 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c58e41d899a785abf1f075dfef3ed9c045d5ca23 commit c58e41d899a785abf1f075dfef3ed9c045d5ca23 Author: Christos Margiolis AuthorDate: 2025-11-10 16:15:36 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:21 +0000 sound: Clarify userland/vchan relationship in sndstat feeder chain When vchans are enabled, the primary channels do not interact with userland, but with the vchans. With vchans enabled: $ sndctl feederchain dsp0.play.0.feederchain=[vchans -> [...] -> hardware] dsp0.record.0.feederchain=[hardware -> [...] -> vchans] With vchans disabled: $ sndctl feederchain dsp0.play.0.feederchain=[userland -> [...] -> hardware] dsp0.record.0.feederchain=[hardware -> [...] -> userland] Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53504 (cherry picked from commit 59d7865d3c20e86b3c42096f4a8c06a5e2eebd29) --- sys/dev/sound/pcm/sndstat.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 51d0fb3bb686..1a5bccd718b5 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -524,7 +524,8 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) c->parentchannel->name : "userland"); } else { sbuf_printf(&sb, "[%s", (c->direction == PCMDIR_REC) ? - "hardware" : "userland"); + "hardware" : + ((d->flags & SD_F_PVCHANS) ? "vchans" : "userland")); } sbuf_printf(&sb, " -> "); f = c->feeder; @@ -561,7 +562,8 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) "userland" : c->parentchannel->name); } else { sbuf_printf(&sb, "%s]", (c->direction == PCMDIR_REC) ? - "userland" : "hardware"); + ((d->flags & SD_F_RVCHANS) ? "vchans" : "userland") : + "hardware"); } CHN_UNLOCK(c); @@ -1320,7 +1322,8 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) c->parentchannel->name : "userland"); } else { sbuf_printf(s, "\t{%s}", (c->direction == PCMDIR_REC) ? - "hardware" : "userland"); + "hardware" : + ((d->flags & SD_F_PVCHANS) ? "vchans" : "userland")); } sbuf_printf(s, " -> "); f = c->feeder; @@ -1358,7 +1361,8 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) "userland" : c->parentchannel->name); } else { sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC) ? - "userland" : "hardware"); + ((d->flags & SD_F_RVCHANS) ? "vchans" : "userland") : + "hardware"); } CHN_UNLOCK(c); From nobody Tue Nov 18 00:51:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzm4T97z6HGmv; Tue, 18 Nov 2025 00:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzm1qDpz3xRy; Tue, 18 Nov 2025 00:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WjIvWYq579YTd4ekOyI4UQFg1aTd2LnRmzE/zLuIk4=; b=HYnpBUUJLOoxYc0ixZx1fLdW1XaZHeoi0Qg0TGKqFJpOrxM2TdfEM5gkABTsbU3qO+TDTC LN+p3/CnuMbwAFl1dUXTR/NFioIyXIIwNtErB+IWdEYs6nI3/8rwr7/WylqR0RmOrflpQB nqXmb6ZR9tfbnOmCPSSmGBfwRwn2pYDudnu0M0jrYMpM0xFiohwLHlEPoK9/MsV4WttXIH 27Ve+z0ofr5OkHavGVfVHFTxmUgs34Eh+q5QCZ3o8P/3HRaoSnTEuLbLpaOKO9F/xH+RVm mpF4DS9Rk6oeOdkCgt7DgcZK1xuEH8m4pVBaR1nUoiIGnaWM21wlKUw8JkoRRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7WjIvWYq579YTd4ekOyI4UQFg1aTd2LnRmzE/zLuIk4=; b=DbWbB6D/OgBlBH7d+bHHfGQvR4+v74DodQxRUxoVdK8g9A0HOuz++wqv2BkuaHuzkpUXMB 3OonJse8Qg25WFJH+DeyPQ9soLDVMRRB38qpV+krQck1e+ziW35ruq3KUEZcWIrde5uwjQ zGb2/eDU/aNcha6cReTyNToMvtyozyK/HzRm1wVKZvo6vYVF48gSAccs7D24lsY2dW+6pf AcKvLJezr6kbKL9yYleIkjMJgsnFzUX+4jSlIiOKiF/zE0CR615dEttZ8lsrknunsYEvCp TEJVMoJIbsXYsA/QwOPMfu507eh4k/M4EposkWF7GoUEVWXXKI3o2SwbgebGhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427108; a=rsa-sha256; cv=none; b=olhuRY2SsJt0M6BTSq1yE/bsU+ciTsAVhcKXxwncu9OYhZq4/Aiy6utY47ALTd66hBPz65 q797xp16ro5Boy671h4qatmUmwGzJGHmfzGQtfjLNsHcx+GPYqBowQDHXaFhWTX8bVTA3h +PB9uCtvQVWfy4NKD7nUttAsIMpEsD14jKfIlJ864K0FtExvRoJi4fueecIeKtXTm5v2To l7YvxrCbYP9p4znvLC8qFSkzlhEPDJxdcS3oiW3jwJZ/jLNcSnFomtAgGQc5MKU2BhnqQH U98cX7U5XPECuLfCVx5tm7zJUhEyTiBMpxKWIi4LUzCEW2vr1jFsyjduuw7PBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzm1Q2PzXdH; Tue, 18 Nov 2025 00:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pmtA044780; Tue, 18 Nov 2025 00:51:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pmVW044777; Tue, 18 Nov 2025 00:51:48 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:48 GMT Message-Id: <202511180051.5AI0pmVW044777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 65c1264625e3 - stable/15 - sound: Retire unused snd_dbuf->dir List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 65c1264625e3bcde278d5069e7a973a03795737a Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=65c1264625e3bcde278d5069e7a973a03795737a commit 65c1264625e3bcde278d5069e7a973a03795737a Author: Christos Margiolis AuthorDate: 2025-11-11 12:04:58 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:21 +0000 sound: Retire unused snd_dbuf->dir Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53518 (cherry picked from commit 3ba4e3d352e5fbc550645a76064ca16460616d86) --- sys/dev/sound/pcm/buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index ddf4083ec19f..841bfb85af3c 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -41,7 +41,7 @@ struct snd_dbuf { volatile int rl; /* length of ready area */ volatile int hp; volatile u_int64_t total, prev_total; - int dmachan, dir; /* dma channel */ + int dmachan; /* dma channel */ u_int32_t fmt, spd, bps, align; unsigned int blksz, blkcnt; int xrun; From nobody Tue Nov 18 00:51:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzn4sqKz6HGwQ; Tue, 18 Nov 2025 00:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzn38Fjz3xKK; Tue, 18 Nov 2025 00:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qe3zySG92RHpPhpsmSHjAQkogsfT/xn2BCpMrrUS/A=; b=mrAJGYGTEJBmxEkZA3CjRFqP+f/+hBIMM2m11Xk2mxaGEcPblOrF7MWUFl/AEYVWWUwFGf csRQ3b3KbEhwun9wW0jXhckX3Gjdy5kAGxKoOHQlXoAlYcPkzyrW0DGG5kU90J7Oft6IhF iAcGrbmSka44gMdXcg2gpUDrhGvHVNHFDlOf9lh5wJMIyA7PZyfyXmph9InRqL56YUZqO6 24y7yICnLVQWC8p+77IOsXYxDCaurFqpFKfLJa5S/dna9L0Wy74Clzyxg4eJdXEPyc5bu0 QNx+Tap+5Ub9ecAxlELiXSHY1mX4U8A9Gp7F3+TLIYS8Wf+ysm417izx6rgzZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qe3zySG92RHpPhpsmSHjAQkogsfT/xn2BCpMrrUS/A=; b=kpTYql5VfL6KgWlKpx/957c1ZUy4ESZhGs2BGJSmkFNTHhNNbFnSaNxTQxxyEKQsxAmAum tr8Z6QdsjmQ6C1V4shII0ZGbINDcgbqV9yH7HXLGOhTPHopwK0X3keV0wztyXweEDXyQXs 7ZH1Bzldy2MWcPWH/LblV62uOPwbW8K5OPGAIZmXmmiu8ms6lqor7hOoImJ+Utbpsj4Ri9 /Dx3s/pyfS+m4+RhMZf3zJEUBW2mBHCGuwoB6vo+7uaMhJRpUfT8NC78rrAbrREmp1msR/ BeCGWvcF3RAX1EfkjG25dhG42LABEmDvU7yL/UXNCR0M4PG10FpbjihNTYHaJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427109; a=rsa-sha256; cv=none; b=Q4dvOcWlDbM7oqB5dXN7aE2zqlLc5hkpPIwx4pQTvdsJygobdMa9UkUGscnDv/sK5S8T5M A/CtjTY6XvFh2TH1vgKK7x2vp4w5lgMa1s3hiqZTTuangTcH0dQOlHjfNlDAkDBxuImNRr ghWvBOvSSTQmHlj3SyDGgonCm6yVKUg5zfPsVAiYwDu0/VKMVPLSh55Mvs9LT3bArqRZaB WFK+P/w6AGVRJMANKJTFbewcUoZlDpF+UEHz3eABzP7fHK931qgiUDn1LbDLG8HXIQm6u2 U5pUXG03Q83PTOGHHZ4G4h64JHl8mS0qxrdeQtcpgzZgzSFxrzWC64AJW77QRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzn22gDzXmp; Tue, 18 Nov 2025 00:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pnOF044818; Tue, 18 Nov 2025 00:51:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pnud044815; Tue, 18 Nov 2025 00:51:49 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:49 GMT Message-Id: <202511180051.5AI0pnud044815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: aabcb5d35b47 - stable/15 - sound: Retire snd_dbuf->dev List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: aabcb5d35b47d0c6fb4ed11a34dde3eec0434779 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=aabcb5d35b47d0c6fb4ed11a34dde3eec0434779 commit aabcb5d35b47d0c6fb4ed11a34dde3eec0434779 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:03 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Retire snd_dbuf->dev Redundant, and if we at some point really need this, we can fetch it from snd_dbuf->channel->dev. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53519 (cherry picked from commit 55540ebc33ad9a52bc4de121cb598243153981a8) --- sys/dev/sound/pcm/buffer.c | 5 ++--- sys/dev/sound/pcm/buffer.h | 3 +-- sys/dev/sound/pcm/channel.c | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index de535ec2dcba..0b77ab599aed 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -41,13 +41,12 @@ #include "snd_fxdiv_gen.h" struct snd_dbuf * -sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel) +sndbuf_create(char *drv, char *desc, struct pcm_channel *channel) { struct snd_dbuf *b; b = malloc(sizeof(*b), M_DEVBUF, M_WAITOK | M_ZERO); snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", drv, desc); - b->dev = dev; b->channel = channel; return b; @@ -72,7 +71,7 @@ sndbuf_setmap(void *arg, bus_dma_segment_t *segs, int nseg, int error) struct snd_dbuf *b = (struct snd_dbuf *)arg; if (snd_verbose > 3) { - device_printf(b->dev, "sndbuf_setmap %lx, %lx; ", + printf("sndbuf_setmap %lx, %lx; ", (u_long)segs[0].ds_addr, (u_long)segs[0].ds_len); printf("%p -> %lx\n", b->buf, (u_long)segs[0].ds_addr); } diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 841bfb85af3c..eaca6d8f313d 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -31,7 +31,6 @@ #define SNDBUF_NAMELEN 48 struct snd_dbuf { - device_t dev; u_int8_t *buf, *tmpbuf; u_int8_t *shadbuf; /**< shadow buffer used w/ S_D_SILENCE/SKIP */ volatile int sl; /**< shadbuf ready length in # of bytes */ @@ -55,7 +54,7 @@ struct snd_dbuf { char name[SNDBUF_NAMELEN]; }; -struct snd_dbuf *sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel); +struct snd_dbuf *sndbuf_create(char *drv, char *desc, struct pcm_channel *channel); void sndbuf_destroy(struct snd_dbuf *b); void sndbuf_dump(struct snd_dbuf *b, char *s, u_int32_t what); diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 062eeb251a5b..e7c0779ea2df 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1269,8 +1269,8 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, goto fail; } - b = sndbuf_create(c->dev, c->name, "primary", c); - bs = sndbuf_create(c->dev, c->name, "secondary", c); + b = sndbuf_create(c->name, "primary", c); + bs = sndbuf_create(c->name, "secondary", c); if (b == NULL || bs == NULL) { device_printf(d->dev, "%s(): failed to create %s buffer\n", __func__, b == NULL ? "hardware" : "software"); From nobody Tue Nov 18 00:51:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzq04xZz6HGwT; Tue, 18 Nov 2025 00:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzp40Bdz3xVM; Tue, 18 Nov 2025 00:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YdmatD7/pcibVtBWM79hyD/IjMcWhoe9D+rxF5Z/S24=; b=lAUeu3DruJwDieSQWQDXvP3gbRP8K7j/qxUFg8dGu9ohKKrUh7yCR6sBkX6iX9hgrL+t8G yH9FA92QAarAlB/JuPUA8WD3egE8nE2iLzEz00qyJr1fBpeurc0Xg+vHsKAAqc+G6fDiyj W2R0L4j1DC+06/9lQVA5NGGDq8ldEHZ3AcK519wox8e1gisTQJG67ntC312L18Mzviiqe1 HfWYvVdPfIOq43pM0Dk2Oc4euJ2hq+ygTYSbcNrpdThTJ6JFuWLSqsJzu+6WN+rD29uGvy QajoNCOOCd2fBEnRb5nKliE1FLUd7mUVDDEaW19vrUdO6ILyYoVXTruDguobSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YdmatD7/pcibVtBWM79hyD/IjMcWhoe9D+rxF5Z/S24=; b=sbi24J0f/WaPYLQm0MEEB0RoRS41JPYqZ1m7opvjpPhq+itLsxIZKPdRHuAu/7GvAWrkux n8dTO0bqBx0qlhvg9WcgA3so0NPhACYHD9ooMMAtL4obEhW+ZU6FYeHqWta+1pH/Zka2cE 3sEmStOH8wUpFiHW17Mst5pad/mXyCSYjNnCTETyYASXeEAh+H+KU6X372p5/ToPHUOJVv FOC9PeBLqu5aCrvb+hl33eD6fVnzLdgDZHVXuLtlT6uar8mglrTAozJVvxexmPrsby+AUA gkP82YtOMCwy/9MYK7P02fYv2VfRhL5+AC+Q/d/Qt33paMxtK16Ai9pt/4djAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427110; a=rsa-sha256; cv=none; b=ezCDVUT9KKws92SjwGPJGQ+TaeH+gXlxxBVnuERRziYUHQbFJjX2/0aCZ6Nf3OCKZK+BUY 9IudM4Ayv8gD8mILMelhiPfaduNWNVnJTa356OiihQpUOFI7aP9cIjf0Bznshe9Mz/WU1Z Wy4/jiDTxlVIoel4XV0g/VNvawJdJWPbufCvKKyn7n81MGo1Glw4j7jH67ZfnIA5FuabJS xC21Q1WKHZ2xFSmVE9SkljzSRREBBpWeg3M6wAFBFWsWo75Bjomj2LSXeZ/i8zQSYRkwWu FHXyT+YynNz2aSbqKQapjlBiIwwgi7W2yxuKd4s4S4jvpnIVj6R/dCYNFnfoDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzp3JzlzXdK; Tue, 18 Nov 2025 00:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0poag044855; Tue, 18 Nov 2025 00:51:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0poJg044852; Tue, 18 Nov 2025 00:51:50 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:50 GMT Message-Id: <202511180051.5AI0poJg044852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 155f24992674 - stable/15 - sound: Re-arrange sndbuf_create() arguments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 155f24992674be5d04c7606c81b113fcec456a73 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=155f24992674be5d04c7606c81b113fcec456a73 commit 155f24992674be5d04c7606c81b113fcec456a73 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:07 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Re-arrange sndbuf_create() arguments Since we always use the channel name as the "drv" argument, we can just get rid of it and fetch it in sndbuf_create(). Also, put the "channel" argument first, as it is more intuitive. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53520 (cherry picked from commit 482d0d97885506a5eb2b1f2501f65e7e4fca6fdc) --- sys/dev/sound/pcm/buffer.c | 4 ++-- sys/dev/sound/pcm/buffer.h | 2 +- sys/dev/sound/pcm/channel.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index 0b77ab599aed..b162da97f9e2 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -41,12 +41,12 @@ #include "snd_fxdiv_gen.h" struct snd_dbuf * -sndbuf_create(char *drv, char *desc, struct pcm_channel *channel) +sndbuf_create(struct pcm_channel *channel, const char *desc) { struct snd_dbuf *b; b = malloc(sizeof(*b), M_DEVBUF, M_WAITOK | M_ZERO); - snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", drv, desc); + snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", channel->name, desc); b->channel = channel; return b; diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index eaca6d8f313d..329a41d0b0a5 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -54,7 +54,7 @@ struct snd_dbuf { char name[SNDBUF_NAMELEN]; }; -struct snd_dbuf *sndbuf_create(char *drv, char *desc, struct pcm_channel *channel); +struct snd_dbuf *sndbuf_create(struct pcm_channel *channel, const char *desc); void sndbuf_destroy(struct snd_dbuf *b); void sndbuf_dump(struct snd_dbuf *b, char *s, u_int32_t what); diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index e7c0779ea2df..749ee4d9cdba 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1269,8 +1269,8 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, goto fail; } - b = sndbuf_create(c->name, "primary", c); - bs = sndbuf_create(c->name, "secondary", c); + b = sndbuf_create(c, "primary"); + bs = sndbuf_create(c, "secondary"); if (b == NULL || bs == NULL) { device_printf(d->dev, "%s(): failed to create %s buffer\n", __func__, b == NULL ? "hardware" : "software"); From nobody Tue Nov 18 00:51:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzq5gsLz6HGwV; Tue, 18 Nov 2025 00:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzq4fY9z3xHg; Tue, 18 Nov 2025 00:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njo7nTn1Zg6JwRumhA4U7jDoEDa6pFxC6kqH8qzXD2w=; b=igHJEOpJGkkEc9HBLhhvfuG0wzpWYz/VA9sbEoNkklTGZ/F8psDNnHMgn/LSQvhpNHal9V LbWvu4VlSy+KX6oJydbjD/1GCqVRfsIj0d00D0n/HvFGYgAZ5BeaDpFMyp32vGZBUhUOOf 7nu66cCPbsMWJwXUera55kXCn2RfE8gxAgkimY5FXJ3+yqamVxHLzUBqbFvKqcyFiDIO16 0g4LU0SSuychIct0jZaVocvYsv17ucQYwhMBnjmk3tr+Ew7+RDevnEODvFQbFBHfdjfoQv t1MAqy5ysftB0GLHTpmamdF6rX8y0SIMWKOHsnuIr+ZveEEpbj9qat8yO+RUJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njo7nTn1Zg6JwRumhA4U7jDoEDa6pFxC6kqH8qzXD2w=; b=yxhNNQWvrTP4qXgTQzXmBKT843je6yTknd3wIPIAZo40DeF+bFi28jJ3P1hdKEOcR5UZ3j PqStp+OwdXdltkOJadr23drHx+hR+dOz0wmHalskaxQ9XlwmqxSvICLqiFWtBLbkuzW0Jt 8X2rl2vgM4qMAxRVtONcxb48fZII9Ur16aTEQk1lDZp3wvjpH9oA3cvgIiw4dT6ACoZZGz /hBe6kLQwu86VB7SyA5w77qj1DGTYi7ZlgiI0fe4+WXWCzYbc43KpPsE4PE0qP2xjP8voZ 5wPrBZoxls2OaIUHOQXFe2X/NtTu0/Fk7pH4LQzhFgaHkmQV08w/ratcLRonlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427111; a=rsa-sha256; cv=none; b=oqn5hZpUDM3AYz70F5lY+wGsKf0r6kbzl9SzJBsI76etTQ2M4d+DvNvQvQXUh2gHOUAX2Q Gq39gV40Hi1YJu/BmPopJUUrbVQUB/v/iNmeJcAq7GQqZ8xCsvCogoyEuwFbD7OBPPrNCw W6GiCQqaEy2NS8JMr+i3nZ16QvdUZo0jfNGr8C1f9fV5m5S0yQ9wHBfPNQNnduB4+pdGsV XoPVQIFP/CtmICW2dVERfBfwVh3yuYbNLY/VQxtNWJUq9+HwqFvsumPh0f+G5ZaPZj9E+t bZW1N7LxFKtSuD2GNDgIw8Oq+B0Bm2XbRGsvHprfdOI1h71HilD3UKYT1gamOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzq4FJTzXhC; Tue, 18 Nov 2025 00:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0ppn1044889; Tue, 18 Nov 2025 00:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0ppO4044886; Tue, 18 Nov 2025 00:51:51 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:51 GMT Message-Id: <202511180051.5AI0ppO4044886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 7ac082ff1ad9 - stable/15 - sound: Define SNDBUF_F_MANAGED as 0x00000001 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7ac082ff1ad9fec8322f3ba1c8fe8444a3cd65ea Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7ac082ff1ad9fec8322f3ba1c8fe8444a3cd65ea commit 7ac082ff1ad9fec8322f3ba1c8fe8444a3cd65ea Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:12 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Define SNDBUF_F_MANAGED as 0x00000001 It's the only flag anyway. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D53521 (cherry picked from commit d159b023de52570800d5a5292318de4bce3c9978) --- sys/dev/sound/pcm/buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 329a41d0b0a5..1e1cfd570b36 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ -#define SNDBUF_F_MANAGED 0x00000008 +#define SNDBUF_F_MANAGED 0x00000001 #define SNDBUF_NAMELEN 48 From nobody Tue Nov 18 00:51:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzs3XB0z6HGyx; Tue, 18 Nov 2025 00:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzr5YPkz3xSm; Tue, 18 Nov 2025 00:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G7cAdxZdIYBVmruBM/yyjfSP7Dz41gzn+4G9CvCjbBM=; b=mVcpsM4DsUiX/C9m7GgDWnDQI88H+/REsZ4jWpyksvjbUjAIwCjdIFMv7+vkY4VW25+Qpj exchXFNT0Ri13SfXpTvBPiu9CwmNYnLCCAUM5aVO96VIyvwTKz3ldETfcc9gc5Iqnlf7ao WoVDP3y3sbfqrqLR8xIwMICnIRUIc7DbY3l8vmjZlCp1i+XDDBsh8yuxIhz50G8EYa1Mqj NYHkT9w1Ascvlraczk5lJdz1ytuluNOuilX5AtHz8IcfLMvsr9Eqfglku6+bXoyd+W/Zhr 6MglH60KMWB/H0YR1f2DVH30XgHM99Y41Z1ZGnRSqClNZnbjDvzGorzomBuPhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G7cAdxZdIYBVmruBM/yyjfSP7Dz41gzn+4G9CvCjbBM=; b=Jn+O0xiU/+ZHCKX1USg6KAVqMFoSbs5ZTp2XfKBFuY+Ilaktkjz6fYp+fpFC8lG2rX3pxu 48QIMdRuE/sGSnGRlG7o03fC8wX4foX/zSCbPESGIcEykev/H0bFdDA68Fy9lWZEuB7RXC 3Tvo0JshS9wFslm1K+e6/0VBX9DbgzvKSIbGLcMBPNnrcwwBJY1kyGzw60NRcS0rORrdTX OXEV72+CMKl12NOilWZw1wZ/Ab3qb0IdvdTlNPGg336dIGrBagdw7srrbFEq7yTbxUKQel 50DPHq9BhxV30t4bNECioH64H/K65g1xNZGiCF7KltTTo2/X3c5qM4YW8Ai7kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427112; a=rsa-sha256; cv=none; b=RQq6/LogB1i/ngxbcb/lgogLhftrTmbIsz23oL27bU0suYF5aMMZjds33ZXBEPFIZKcqto VfGOCL5kI2tZ67HdODA3Q2K/HWbmv0ftBf0zYYXuWK7ITq3b4KeCbT6XUtGEQw8QXkohFj 1dnvbr+hEsmPJQhZX0ReHuGur8OBhz/O7fy0Qmj85aaPfSBeSuQsJYEWRrOH2MSDbwXufe eMmzBFhIoZGFv8Z4RuI67eB2mIH9yIbyP5/9JIBM017BsPdRBUiFveQ92CGHzR6OUhTKTl 80CVRcZlBMXb0TRTbjAJBe+DzDAO7JGXXDpsRVcO71g80ocJwQ7dQ1i/8SwAoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzr57zhzXmq; Tue, 18 Nov 2025 00:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pqnD044924; Tue, 18 Nov 2025 00:51:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pqLe044921; Tue, 18 Nov 2025 00:51:52 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:52 GMT Message-Id: <202511180051.5AI0pqLe044921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 6bb6be4eef58 - stable/15 - sound: Retire unused sndbuf_dump() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6bb6be4eef581a68e710087f7f2706fb2cbf4db0 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6bb6be4eef581a68e710087f7f2706fb2cbf4db0 commit 6bb6be4eef581a68e710087f7f2706fb2cbf4db0 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:16 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Retire unused sndbuf_dump() Fixes: e4e61333ffa4e90360de2dd1e4e0146f7cbf0afb Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D53522 (cherry picked from commit 6d6eb25d0b19443089749e288f091bf26fc58f70) --- sys/dev/sound/pcm/buffer.c | 20 -------------------- sys/dev/sound/pcm/buffer.h | 2 -- 2 files changed, 22 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index b162da97f9e2..ab3c8d447b21 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -694,26 +694,6 @@ sndbuf_feed(struct snd_dbuf *from, struct snd_dbuf *to, struct pcm_channel *chan return (0); } -/************************************************************/ - -void -sndbuf_dump(struct snd_dbuf *b, char *s, u_int32_t what) -{ - printf("%s: [", s); - if (what & 0x01) - printf(" bufsize: %d, maxsize: %d", b->bufsize, b->maxsize); - if (what & 0x02) - printf(" dl: %d, rp: %d, rl: %d, hp: %d", b->dl, b->rp, b->rl, b->hp); - if (what & 0x04) - printf(" total: %ju, prev_total: %ju, xrun: %d", (uintmax_t)b->total, (uintmax_t)b->prev_total, b->xrun); - if (what & 0x08) - printf(" fmt: 0x%x, spd: %d", b->fmt, b->spd); - if (what & 0x10) - printf(" blksz: %d, blkcnt: %d, flags: 0x%x", b->blksz, b->blkcnt, b->flags); - printf(" ]\n"); -} - -/************************************************************/ u_int32_t sndbuf_getflags(struct snd_dbuf *b) { diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 1e1cfd570b36..6c16c0c1f2d5 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -57,8 +57,6 @@ struct snd_dbuf { struct snd_dbuf *sndbuf_create(struct pcm_channel *channel, const char *desc); void sndbuf_destroy(struct snd_dbuf *b); -void sndbuf_dump(struct snd_dbuf *b, char *s, u_int32_t what); - int sndbuf_alloc(struct snd_dbuf *b, bus_dma_tag_t dmatag, int dmaflags, unsigned int size); int sndbuf_setup(struct snd_dbuf *b, void *buf, unsigned int size); void sndbuf_free(struct snd_dbuf *b); From nobody Tue Nov 18 00:51:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzt0f4nz6HGkn; Tue, 18 Nov 2025 00:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzs6SC8z3xR9; Tue, 18 Nov 2025 00:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4HwRFIurN3TtsdJZYV3JViNPuUVwyHdlnNMtFiEoC4=; b=eR6ya7WwHCc8wIyEE0/gs1TCzo7tZ94yP/+nvTzZ5ZDeLZlU29iDHVil7B6/kAfa17HQ4P 7mzEu31DLqSh4hyi/5pPHdxHEVeUHeFCSzG4Hvre8QYiqCmVF3fO0AvfDb3eoN6xS4pa3W dH35C98lOJe64QVuP9I1E5WejtjTIRPS7jRf4NR9z53Qg0PeAWBIgoRHrLwcJ/HE8OI2V8 25dly9it5m0dVD9t8Js1KVR+6wC+p+KrUrvCPCplNE9HigGveJYwDE2qLT0mFQAxinZX30 Q4m7b9zGHEBAy857W7GYIkDwBY/Pib05qPgTN/j1XrMmjN85ZnCcpRPEa+oufA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4HwRFIurN3TtsdJZYV3JViNPuUVwyHdlnNMtFiEoC4=; b=A556nXLW733EySpkwGwgI8OdifXYt9cJnOykwPF1uykzlL4NS4eAssVQ0hVxbG/1SSnDZk If2TJthmT5DU1S79wJGnLT9j1ymx/XDSFq+6U0tvg82CQ2ZV8vWa/bcM7r4sG70t6uZehI +WHVEwHu38bqIhpRCkBG7cJf/tKkCYnVWeKqeMw9y90b5Ev6yYAuAJpvu5Eu16ogfNiy9Z N6DeGN1HFcJNkNmy7nkL6BfFDbGSjaWgX2MgoXKUqhAumFGHduU0iWBqma/Y/C9ZoiNhwq Boo11d9Ot4I58F0HROKTUHug02Nd2BfS/PWBBe4iTjW/GxHrXxKRQLui1zVy5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427113; a=rsa-sha256; cv=none; b=gz6yJxlFb3RRG/12Ai/gwpC6qo7OvJ/jUnDflmYj6zLEyjSyxuJgsf3+m+s1XgvQkiHb+J o3Cw7uGnP3BPx6uFvG1Fa8xbgOxU3W9y0kxZ+FOq+t+QezitocCJr0gBSYtDDmv0nvFM1t 2PiPc3Be2h708pz0UElB98SLfy1UAcSmurZwTkvA0rSpMTkNUdfRcACirkpri8Ra/mvomW vroD1FHDYeg58MKy2TWOQV7XNVNdPvmF0pg8RirGp6T9KwsTWY76Axy0PovAZnp2vksONd GvN4AOqpQpKkEit8eBasrNMMz18amdkvSTnPWxfxDoTAPMZBaweSqwWJJI4fPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzs5z6RzXhD; Tue, 18 Nov 2025 00:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0prO5044961; Tue, 18 Nov 2025 00:51:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0prD1044958; Tue, 18 Nov 2025 00:51:53 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:53 GMT Message-Id: <202511180051.5AI0prD1044958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 418c7be1760d - stable/15 - sound: Retire unused sndbuf_getflags() and sndbuf_setflags() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 418c7be1760df3b004e04361333e9b2c8e12be98 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=418c7be1760df3b004e04361333e9b2c8e12be98 commit 418c7be1760df3b004e04361333e9b2c8e12be98 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:20 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Retire unused sndbuf_getflags() and sndbuf_setflags() Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53525 (cherry picked from commit 06eb65e11d7a66caec358966dcf892c9f4c2e411) --- sys/dev/sound/pcm/buffer.c | 14 -------------- sys/dev/sound/pcm/buffer.h | 3 --- 2 files changed, 17 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index ab3c8d447b21..e3d2f27f9f81 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -694,20 +694,6 @@ sndbuf_feed(struct snd_dbuf *from, struct snd_dbuf *to, struct pcm_channel *chan return (0); } -u_int32_t -sndbuf_getflags(struct snd_dbuf *b) -{ - return b->flags; -} - -void -sndbuf_setflags(struct snd_dbuf *b, u_int32_t flags, int on) -{ - b->flags &= ~flags; - if (on) - b->flags |= flags; -} - /** * @brief Clear the shadow buffer by filling with samples equal to zero. * diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 6c16c0c1f2d5..421db261566d 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -111,9 +111,6 @@ int sndbuf_acquire(struct snd_dbuf *b, u_int8_t *from, unsigned int count); int sndbuf_dispose(struct snd_dbuf *b, u_int8_t *to, unsigned int count); int sndbuf_feed(struct snd_dbuf *from, struct snd_dbuf *to, struct pcm_channel *channel, struct pcm_feeder *feeder, unsigned int count); -u_int32_t sndbuf_getflags(struct snd_dbuf *b); -void sndbuf_setflags(struct snd_dbuf *b, u_int32_t flags, int on); - #ifdef OSSV4_EXPERIMENT void sndbuf_getpeaks(struct snd_dbuf *b, int *lp, int *rp); #endif From nobody Tue Nov 18 00:51:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzv3968z6HH1n; Tue, 18 Nov 2025 00:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzt7457z3xnW; Tue, 18 Nov 2025 00:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSXZPcS8Hu/B+cM23OKQMtS627JVkpbeY0Z7yAAENfg=; b=JbmJaiBviCJUHytUmljs0P8YR4A9JSdmWHYi52wBv9cA0x4KdZ6V9K7eq5CtuqTItfh4sQ 0CdbCQEiGdX0vywAF4ln3ygW7+jsv7KpR+6xuSX3NoQaOWi+vIIimCg/QyVXbH5WTYInCr PIVYwlc9WrmEmpTWaObEDDTusfWfaJkmhgPvEsxGCPThQjecJeIrJ+RMvosiazIBtbPoAA FzhPkKDh00L/BA1+LvVAZYT3RokEMTwMNlP2ZHrVPYpaGZy9veYLmMSuwuADlTaYPLMOMA gqDnqm1HNI1PBWWKQgfTQ2Ch6zz+Szqb4rpP6zV5fErBG9f1dcj9FFvidkAM/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSXZPcS8Hu/B+cM23OKQMtS627JVkpbeY0Z7yAAENfg=; b=vM+srSrUArAE7HvffxGHPE1ueYxjbytPvY+4b/XFx/Cqwe3Lyp5NIoyM2s/gi81erkc7KN 0Va2r3+dlG+CKvuaqoQEnNH/PKeLH9U1JetgKrcToNgbSNQaKXq8Ot6/sHWmI+MzzI2R/8 p9YDINm/pU12VvMOg86OSOgLwt1bnvRRBSOL0GXaJu/1ggnWnjdsToIStPO+yxODMNls5Q jkWqTUmxf6U/pRXv6XX9uHyxS35TSWKP7H94yTFPVS35WiiV+vwcdabW92yzF8d4YhRdYk dN1NR2Q88p1T8wYA1fZWemdyf4Iy92GDnpIOWdnsYljnW5JJQHhlmggN90uFvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427115; a=rsa-sha256; cv=none; b=bXEroekdni5W0zM0GgUSKxGIdWXLxZ1k3hD01oSooeeCgQG2SGMQUrEqGym7VD0beICqdh yxOHZejS7fDMwB9RAsyBCAYhai54umOoiiMsicP502VbY2bK8f9LLe3M1GCC2WW6GhEMje UFcQAIbQReIBO9ETaKy+KtztudaTx752hasGpE3p39d/Mab5bb9TeF0i6G6OqbcWPMoh0m OxIFyLuImHqKSNQsGcZQFnXBYW6giGH1g8O654+YApV7oFNoWghxOXNR5XqTWXZZTiu6fm 4g7uh9rJ5sEYWwlgbtVNh30UA/HunikzZOlsXSMVEfU0nnbKoNLbvDUpDxQL3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzt6dLhzXmr; Tue, 18 Nov 2025 00:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0psln045000; Tue, 18 Nov 2025 00:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0psSL044997; Tue, 18 Nov 2025 00:51:54 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:54 GMT Message-Id: <202511180051.5AI0psSL044997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d5024179b8dd - stable/15 - sound: Simplify sndbuf_clear() loop List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d5024179b8dd1c1779adff1c762f6f6c0abae557 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d5024179b8dd1c1779adff1c762f6f6c0abae557 commit d5024179b8dd1c1779adff1c762f6f6c0abae557 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:24 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Simplify sndbuf_clear() loop Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53526 (cherry picked from commit c0e96595a4da90d890be88881a5dc3381da59dd7) --- sys/dev/sound/pcm/buffer.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index e3d2f27f9f81..0cfa04fc3167 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -276,16 +276,10 @@ sndbuf_clear(struct snd_dbuf *b, unsigned int length) length = b->bufsize; data = sndbuf_zerodata(b->fmt); - i = sndbuf_getfreeptr(b); p = sndbuf_getbuf(b); - while (length > 0) { - p[i] = data; - length--; - i++; - if (i >= b->bufsize) - i = 0; - } + for (; length > 0; length--, i++) + p[i % b->bufsize] = data; } /** From nobody Tue Nov 18 00:51:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzw5fVyz6HH07; Tue, 18 Nov 2025 00:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzw1Nycz3xYX; Tue, 18 Nov 2025 00:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pQBgQTaPyc9Kmwgzw1jg2PU4yHYG+S8EKwm4X1DnTF4=; b=ZEYMsRO29/YXaHRdDESbgV2YnT0NedaGron9zOy3pz6sy7oFLRl/Rms2ccypRCz0NP+0y6 0dzkKjtE7Psj9nHGmT2VY+pAzOseP2CAgDELq1CSdXYhr+ApTLWGULdqjEilEMCG0eKGz9 TJHTIJyjM7W7F4fIQ89blIhh0B1kwByXSpsld+3R+sa3RNDubsZQEP2KX0yvphwFjdXFAn PVcrd7KHBZBr9dKTT5+VMma/pbNh9uQgnzGKifFzAcFymj3C4SjxHWkFqLwLhh2Cy7VHov kt/hugWBspvDtw7WPCXfnywXYAZh8RCMVvU0X74C1p3h2QJDTw+ZRmYcwrQ+bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pQBgQTaPyc9Kmwgzw1jg2PU4yHYG+S8EKwm4X1DnTF4=; b=jYZKtBnHbpbLRuDLwfWt6iuR2fXFt1EaEwuIwm0p4RZGCgdECUtxHhABnHCeoObd8aTBBJ m3xsvq2/j7J37N7bYOkoZ5C/OywmEuASglVg6fOm/RTXrFsypxG2KT4RBB0oTXVWvU9Nkl NfIO58jFoLsJySjSR/8yfzi1IrTOpOa5d1Mv6e8L/1p1qTU5u9nwPVb9KxjyRtI1OIyZwq K9KdQFTyaZzyRK6pmtEFg7MbsH51Lx0ymLgRSxoYGWzIZr8TvO+y3issYjhgteim/ydMT3 0b53+YXtvTVVboTPIsGsGBiVKRb1ocEBbN6o3NIMMNFxm2HH/JUYrGaGO3M2lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427116; a=rsa-sha256; cv=none; b=Y1c6/1rSyijhQd+qVhvikEkVUD/L91sajdG+JPWSNS1MRNRdA5DB8Eor4+FJVr3Y2G9lxy hBKRMfkKiQWGMpA7j5WB1+u7+LREvIRViQBzzeTFwLfyt+pld4LLJlQmODbt5N5fIqOhkC Kwj+Tx7lVw3tBZkeo4tZwh+wlnoP08ydNiJcM8s/CpNCy/TX+y5Evq0/u6FYmUSA6XbwEC mJ4vL+Pzf6dEq8/9hk/8Cx8Qou+ZC07aOVRVCJOuCoxH7R/p5fIcpRl3vwk9SKKiAbNb+Z fYrG/cOjhToyaiTkfVOXHN6TCQobmdlqj+ML4sfeuWvH5UYREvSLnXTglQUvXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzw0nHCzY9P; Tue, 18 Nov 2025 00:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0puko045043; Tue, 18 Nov 2025 00:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pujX045040; Tue, 18 Nov 2025 00:51:56 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:56 GMT Message-Id: <202511180051.5AI0pujX045040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 7ed840e33127 - stable/15 - sound: Remove redundant sndbuf_free() in chn_kill() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7ed840e33127296d31b1098372aa6a23a7518fe5 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7ed840e33127296d31b1098372aa6a23a7518fe5 commit 7ed840e33127296d31b1098372aa6a23a7518fe5 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:30 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Remove redundant sndbuf_free() in chn_kill() If b exists, it will get destroyed by sndbuf_destroy() (which calls sndbuf_free()) a few lines below, so the additional sndbuf_free() here is redundant. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53527 (cherry picked from commit ad28c6a13a45746f32cbc832b3fe58748fae0d19) --- sys/dev/sound/pcm/channel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 749ee4d9cdba..54d8976d46bf 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1373,8 +1373,8 @@ chn_kill(struct pcm_channel *c) } free_unr(chn_getunr(d, c->type), c->unit); feeder_remove(c); - if (c->devinfo && CHANNEL_FREE(c->methods, c->devinfo)) - sndbuf_free(b); + if (c->devinfo) + CHANNEL_FREE(c->methods, c->devinfo); if (bs) { knlist_clear(&bs->sel.si_note, 0); knlist_destroy(&bs->sel.si_note); From nobody Tue Nov 18 00:51:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzx3vKwz6HGhp; Tue, 18 Nov 2025 00:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzx2F2Xz3xnp; Tue, 18 Nov 2025 00:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tadKTGwadEG1a98fuADK57E2rrIwheh/Dg8iKi0WS+o=; b=U33Sbn/TkiViQCB2Tz5K77TbLuZuEZdmTXNLKgkA9GD/wH5Erkzrzn7/7ip8KSgbxszcB1 tsGr0mqvHeWKK4vfUKSWgu9RnYgqEEBpit1za8pB5zqsEIGEVHkZpEiR42wKXd0+7oz7UB qInNzhitHUBbDli2KC7zdDHkl7pY2D07SKfIR0C9pSXTdMxLQqUFT6u+JVVBhe/a/b4iQm D//FP0nOFf/3PVletDUdIQogRyDUCA9mseFI0w8ZPNvmr5M1PfaMfco2fqC/iDOZVQs5vZ P+4vQmNshTVX1PISHw0c6Vna0+dHiU/s7lijTU+EbQIj2ZPiSDbwcyWQgRq/PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tadKTGwadEG1a98fuADK57E2rrIwheh/Dg8iKi0WS+o=; b=SJR2X5EJ3501fiIIwuXoSgJDXpqWJyoLvP7CK6J2f+5bQeRWAHNH25Yh0qKcRC11QiRF4s uRLwqqvlHnDGkwQVtxKcdb2pIAAt6R7abaoqr33Uvmycuv0uUsA/gRAUzxEOfVtYsrPYq6 0SPn/Kh79D2MH5OgeWbDVHH4WVRBwiufbhJsSqQ29WwzX+Sb4kTHUQ7xEgUGj8/pFsx1/Z 3wBe3pObLYPyBpH7Tlr0An0moiRT2pE5FtFsgkKYRQ0obmXduZMKDxmY2SdjRH2XvlVH/9 BQzCX/si1+2UXjIVfDQB9YqcugCBpr5kFU0ckaxi2NRp4rGtsI95ukNYy0xq4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427117; a=rsa-sha256; cv=none; b=T49TnUeRDf3QR9K0ieoWY2sWLlTQFhx4y0+Tb1BgXJiv3+XosHLJM+LzqMsGrQQsjCDD2G YG+lBwPvE9N29T7FBTXbp+/R9h8iQYb9O3MLqYAZskGKwucKqzRyFMlH+K5N/OOFLq7bsk qryg2Y6wD+DEBFxcKwAgbj77HndvjUPzIp125JMZ2yZep4d5gLomX5uYv8W9hGf2/mgGls XA4hSkceGbg+AJ5iuz0MrwNgpSwmkZFSYV3nA0amywoMBffZnrgq1vTLe0SJFoyraZEzr1 1PSveTYGWKsmTDldvns0+vDfGGr2v+U1mRijYVfDI8OpNzS02nD9EC8uNIlgLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzx1gJGzXhG; Tue, 18 Nov 2025 00:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pvOm045081; Tue, 18 Nov 2025 00:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pvLK045078; Tue, 18 Nov 2025 00:51:57 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:57 GMT Message-Id: <202511180051.5AI0pvLK045078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 1d9f05bd46bc - stable/15 - sound: Get rid of useless sndbuf getters and setters List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1d9f05bd46bc496d695ed883274ee599fdde5538 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1d9f05bd46bc496d695ed883274ee599fdde5538 commit 1d9f05bd46bc496d695ed883274ee599fdde5538 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:34 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Get rid of useless sndbuf getters and setters No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53528 (cherry picked from commit 78c5026ae13b2d30b479f9bc892ecdb6f5a5bc0b) --- sys/arm/allwinner/a10_codec.c | 2 +- sys/arm/allwinner/aw_i2s.c | 8 +- sys/arm/broadcom/bcm2835/bcm2835_audio.c | 9 +- sys/arm/freescale/imx/imx6_ssi.c | 10 +-- sys/arm/freescale/vybrid/vf_sai.c | 2 +- sys/arm64/rockchip/rk_i2s.c | 8 +- sys/dev/sound/dummy.c | 8 +- sys/dev/sound/fdt/audio_soc.c | 2 +- sys/dev/sound/macio/aoa.c | 4 +- sys/dev/sound/pci/als4000.c | 10 +-- sys/dev/sound/pci/atiixp.c | 25 +++--- sys/dev/sound/pci/cmi.c | 6 +- sys/dev/sound/pci/cs4281.c | 8 +- sys/dev/sound/pci/csapcm.c | 8 +- sys/dev/sound/pci/emu10k1.c | 8 +- sys/dev/sound/pci/emu10kx-pcm.c | 12 +-- sys/dev/sound/pci/es137x.c | 24 +++--- sys/dev/sound/pci/fm801.c | 2 +- sys/dev/sound/pci/hda/hdaa.c | 18 ++-- sys/dev/sound/pci/hdsp-pcm.c | 2 +- sys/dev/sound/pci/hdspe-pcm.c | 2 +- sys/dev/sound/pci/ich.c | 16 ++-- sys/dev/sound/pci/maestro3.c | 20 ++--- sys/dev/sound/pci/neomagic.c | 2 +- sys/dev/sound/pci/solo.c | 3 +- sys/dev/sound/pci/t4dwave.c | 10 +-- sys/dev/sound/pci/via8233.c | 26 +++--- sys/dev/sound/pci/via82c686.c | 6 +- sys/dev/sound/pci/vibes.c | 12 +-- sys/dev/sound/pcm/buffer.c | 144 ++----------------------------- sys/dev/sound/pcm/buffer.h | 22 ----- sys/dev/sound/pcm/channel.c | 133 ++++++++++++++-------------- sys/dev/sound/pcm/dsp.c | 44 +++++----- sys/dev/sound/pcm/feeder.c | 8 +- sys/dev/sound/pcm/feeder_chain.c | 4 +- sys/dev/sound/pcm/feeder_mixer.c | 14 +-- sys/dev/sound/pcm/sndstat.c | 55 ++++++------ sys/dev/sound/pcm/vchan.c | 4 +- sys/dev/sound/pcm/vchan.h | 4 +- 39 files changed, 272 insertions(+), 433 deletions(-) diff --git a/sys/arm/allwinner/a10_codec.c b/sys/arm/allwinner/a10_codec.c index 12d389d24243..0a4ba7aa31b2 100644 --- a/sys/arm/allwinner/a10_codec.c +++ b/sys/arm/allwinner/a10_codec.c @@ -680,7 +680,7 @@ a10codec_dmaintr(void *priv) struct a10codec_chinfo *ch = priv; unsigned bufsize; - bufsize = sndbuf_getsize(ch->buffer); + bufsize = ch->buffer->bufsize; ch->pos += ch->blocksize; if (ch->pos >= bufsize) diff --git a/sys/arm/allwinner/aw_i2s.c b/sys/arm/allwinner/aw_i2s.c index 87dfb109363f..31c6d9854171 100644 --- a/sys/arm/allwinner/aw_i2s.c +++ b/sys/arm/allwinner/aw_i2s.c @@ -530,10 +530,10 @@ aw_i2s_dai_intr(device_t dev, struct snd_dbuf *play_buf, struct snd_dbuf *rec_bu val = I2S_READ(sc, DA_FSTA); empty = DA_FSTA_TXE_CNT(val); count = sndbuf_getready(play_buf); - size = sndbuf_getsize(play_buf); + size = play_buf->bufsize; readyptr = sndbuf_getreadyptr(play_buf); - samples = (uint8_t*)sndbuf_getbuf(play_buf); + samples = play_buf->buf; written = 0; if (empty > count / 2) empty = count / 2; @@ -556,9 +556,9 @@ aw_i2s_dai_intr(device_t dev, struct snd_dbuf *play_buf, struct snd_dbuf *rec_bu available = DA_FSTA_RXA_CNT(val); count = sndbuf_getfree(rec_buf); - size = sndbuf_getsize(rec_buf); + size = rec_buf->bufsize; freeptr = sndbuf_getfreeptr(rec_buf); - samples = (uint8_t*)sndbuf_getbuf(rec_buf); + samples = rec_buf->buf; recorded = 0; if (available > count / 2) available = count / 2; diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index 13f309dd3f11..4b138de58238 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -537,7 +537,7 @@ bcm2835_audio_worker(void *data) continue; count = sndbuf_getready(ch->buffer); - size = sndbuf_getsize(ch->buffer); + size = ch->buffer->bufsize; readyptr = sndbuf_getreadyptr(ch->buffer); BCM2835_AUDIO_LOCK(sc); @@ -550,11 +550,12 @@ bcm2835_audio_worker(void *data) if (count < VCHIQ_AUDIO_PACKET_SIZE) continue; - buf = (uint8_t*)sndbuf_getbuf(ch->buffer) + readyptr; + buf = ch->buffer->buf + readyptr; bcm2835_audio_write_samples(ch, buf, count); BCM2835_AUDIO_LOCK(sc); - ch->unsubmittedptr = (ch->unsubmittedptr + count) % sndbuf_getsize(ch->buffer); + ch->unsubmittedptr = (ch->unsubmittedptr + count) % + ch->buffer->bufsize; ch->available_space -= count; ch->submitted_samples += count; KASSERT(ch->available_space >= 0, ("ch->available_space == %d\n", ch->available_space)); @@ -623,7 +624,7 @@ bcmchan_free(kobj_t obj, void *data) struct bcm2835_audio_chinfo *ch = data; void *buffer; - buffer = sndbuf_getbuf(ch->buffer); + buffer = ch->buffer->buf; if (buffer) free(buffer, M_DEVBUF); diff --git a/sys/arm/freescale/imx/imx6_ssi.c b/sys/arm/freescale/imx/imx6_ssi.c index cb77f1454e63..5a0e671f15a2 100644 --- a/sys/arm/freescale/imx/imx6_ssi.c +++ b/sys/arm/freescale/imx/imx6_ssi.c @@ -398,7 +398,7 @@ ssichan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) setup_dma(scp); - return (sndbuf_getblksz(ch->buffer)); + return (ch->buffer->blksz); } uint32_t @@ -415,7 +415,7 @@ ssi_dma_intr(void *arg, int chn) sc = scp->sc; conf = sc->conf; - bufsize = sndbuf_getsize(ch->buffer); + bufsize = ch->buffer->bufsize; sc->pos += conf->period; if (sc->pos >= bufsize) @@ -487,8 +487,8 @@ setup_dma(struct sc_pcminfo *scp) conf->saddr = sc->buf_base_phys; conf->daddr = rman_get_start(sc->res[0]) + SSI_STX0; conf->event = sc->sdma_ev_tx; /* SDMA TX event */ - conf->period = sndbuf_getblksz(ch->buffer); - conf->num_bd = sndbuf_getblkcnt(ch->buffer); + conf->period = ch->buffer->blksz; + conf->num_bd = ch->buffer->blkcnt; /* * Word Length @@ -497,7 +497,7 @@ setup_dma(struct sc_pcminfo *scp) * SSI supports 24 at max. */ - fmt = sndbuf_getfmt(ch->buffer); + fmt = ch->buffer->fmt; if (fmt & AFMT_16BIT) { conf->word_length = 16; diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index e895529c4810..9c0125768fee 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -369,7 +369,7 @@ saichan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) sndbuf_resize(ch->buffer, sc->dma_size / blocksize, blocksize); - sc->period = sndbuf_getblksz(ch->buffer); + sc->period = ch->buffer->blksz; return (sc->period); } diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c index 5f1b6bbdeabf..856fa20e6ce4 100644 --- a/sys/arm64/rockchip/rk_i2s.c +++ b/sys/arm64/rockchip/rk_i2s.c @@ -403,10 +403,10 @@ rk_i2s_dai_intr(device_t dev, struct snd_dbuf *play_buf, struct snd_dbuf *rec_bu count = sndbuf_getready(play_buf); if (count > FIFO_SIZE - 1) count = FIFO_SIZE - 1; - size = sndbuf_getsize(play_buf); + size = play_buf->bufsize; readyptr = sndbuf_getreadyptr(play_buf); - samples = (uint8_t*)sndbuf_getbuf(play_buf); + samples = play_buf->buf; written = 0; for (; level < count; level++) { val = (samples[readyptr++ % size] << 0); @@ -426,9 +426,9 @@ rk_i2s_dai_intr(device_t dev, struct snd_dbuf *play_buf, struct snd_dbuf *rec_bu uint8_t *samples; uint32_t count, size, freeptr, recorded; count = sndbuf_getfree(rec_buf); - size = sndbuf_getsize(rec_buf); + size = rec_buf->bufsize; freeptr = sndbuf_getfreeptr(rec_buf); - samples = (uint8_t*)sndbuf_getbuf(rec_buf); + samples = rec_buf->buf; recorded = 0; if (level > count / 4) level = count / 4; diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 39214a141bf9..0a2717ec418c 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -105,8 +105,8 @@ dummy_chan_io(void *arg) if (!ch->run) continue; if (ch->dir == PCMDIR_PLAY) { - ch->ptr += sndbuf_getblksz(ch->buf); - ch->ptr %= sndbuf_getsize(ch->buf); + ch->ptr += ch->buf->blksz; + ch->ptr %= ch->buf->bufsize; } else sndbuf_fillsilence(ch->buf); snd_mtxunlock(sc->lock); @@ -123,7 +123,7 @@ dummy_chan_free(kobj_t obj, void *data) struct dummy_chan *ch =data; uint8_t *buf; - buf = sndbuf_getbuf(ch->buf); + buf = ch->buf->buf; if (buf != NULL) free(buf, M_DEVBUF); @@ -190,7 +190,7 @@ dummy_chan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) { struct dummy_chan *ch = data; - return (sndbuf_getblksz(ch->buf)); + return (ch->buf->blksz); } static int diff --git a/sys/dev/sound/fdt/audio_soc.c b/sys/dev/sound/fdt/audio_soc.c index c2bdea399364..84867cb3d781 100644 --- a/sys/dev/sound/fdt/audio_soc.c +++ b/sys/dev/sound/fdt/audio_soc.c @@ -249,7 +249,7 @@ audio_soc_chan_free(kobj_t obj, void *data) ausoc_chan = (struct audio_soc_channel *)data; - buffer = sndbuf_getbuf(ausoc_chan->buf); + buffer = ausoc_chan->buf->buf; if (buffer) free(buffer, M_DEVBUF); diff --git a/sys/dev/sound/macio/aoa.c b/sys/dev/sound/macio/aoa.c index 9861bbd92a0c..e0a6206c19a6 100644 --- a/sys/dev/sound/macio/aoa.c +++ b/sys/dev/sound/macio/aoa.c @@ -73,8 +73,8 @@ aoa_dma_set_program(struct aoa_dma *dma) u_int32_t addr; int i; - addr = (u_int32_t) sndbuf_getbufaddr(dma->buf); - KASSERT(dma->bufsz == sndbuf_getsize(dma->buf), ("bad size")); + addr = (u_int32_t)dma->buf->buf_addr; + KASSERT(dma->bufsz == dma->buf->bufsize, ("bad size")); dma->slots = dma->bufsz / dma->blksz; diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 9d86713b379e..75fbefe27633 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -281,7 +281,7 @@ alschan_getptr(kobj_t obj, void *data) snd_mtxlock(sc->lock); pos = als_gcr_rd(ch->parent, ch->gcr_fifo_status) & 0xffff; snd_mtxunlock(sc->lock); - sz = sndbuf_getsize(ch->buffer); + sz = ch->buffer->bufsize; return (2 * sz - pos - 1) % sz; } @@ -348,8 +348,8 @@ als_playback_start(struct sc_chinfo *ch) struct sc_info *sc = ch->parent; u_int32_t buf, bufsz, count, dma_prog; - buf = sndbuf_getbufaddr(ch->buffer); - bufsz = sndbuf_getsize(ch->buffer); + buf = ch->buffer->buf_addr; + bufsz = ch->buffer->bufsize; count = bufsz / 2; if (ch->format & AFMT_16BIT) count /= 2; @@ -451,8 +451,8 @@ als_capture_start(struct sc_chinfo *ch) struct sc_info *sc = ch->parent; u_int32_t buf, bufsz, count, dma_prog; - buf = sndbuf_getbufaddr(ch->buffer); - bufsz = sndbuf_getsize(ch->buffer); + buf = ch->buffer->buf_addr; + bufsz = ch->buffer->bufsize; count = bufsz / 2; if (ch->format & AFMT_16BIT) count /= 2; diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 90e5742e6523..30f061fd9388 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -535,8 +535,8 @@ atiixp_chan_setfragments(kobj_t obj, void *data, blksz &= ATI_IXP_BLK_ALIGN; - if (blksz > (sndbuf_getmaxsize(ch->buffer) / ATI_IXP_DMA_CHSEGS_MIN)) - blksz = sndbuf_getmaxsize(ch->buffer) / ATI_IXP_DMA_CHSEGS_MIN; + if (blksz > (ch->buffer->maxsize / ATI_IXP_DMA_CHSEGS_MIN)) + blksz = ch->buffer->maxsize / ATI_IXP_DMA_CHSEGS_MIN; if (blksz < ATI_IXP_BLK_MIN) blksz = ATI_IXP_BLK_MIN; if (blkcnt > ATI_IXP_DMA_CHSEGS_MAX) @@ -544,7 +544,7 @@ atiixp_chan_setfragments(kobj_t obj, void *data, if (blkcnt < ATI_IXP_DMA_CHSEGS_MIN) blkcnt = ATI_IXP_DMA_CHSEGS_MIN; - while ((blksz * blkcnt) > sndbuf_getmaxsize(ch->buffer)) { + while ((blksz * blkcnt) > ch->buffer->maxsize) { if ((blkcnt >> 1) >= ATI_IXP_DMA_CHSEGS_MIN) blkcnt >>= 1; else if ((blksz >> 1) >= ATI_IXP_BLK_MIN) @@ -553,14 +553,14 @@ atiixp_chan_setfragments(kobj_t obj, void *data, break; } - if ((sndbuf_getblksz(ch->buffer) != blksz || - sndbuf_getblkcnt(ch->buffer) != blkcnt) && + if ((ch->buffer->blksz != blksz || + ch->buffer->blkcnt != blkcnt) && sndbuf_resize(ch->buffer, blkcnt, blksz) != 0) device_printf(sc->dev, "%s: failed blksz=%u blkcnt=%u\n", __func__, blksz, blkcnt); - ch->blksz = sndbuf_getblksz(ch->buffer); - ch->blkcnt = sndbuf_getblkcnt(ch->buffer); + ch->blksz = ch->buffer->blksz; + ch->blkcnt = ch->buffer->blkcnt; return (0); } @@ -583,7 +583,7 @@ atiixp_buildsgdt(struct atiixp_chinfo *ch) uint32_t addr, blksz, blkcnt; int i; - addr = sndbuf_getbufaddr(ch->buffer); + addr = ch->buffer->buf_addr; if (sc->polling != 0) { blksz = ch->blksz * ch->blkcnt; @@ -610,7 +610,7 @@ atiixp_dmapos(struct atiixp_chinfo *ch) volatile uint32_t ptr; reg = ch->dt_cur_bit; - addr = sndbuf_getbufaddr(ch->buffer); + addr = ch->buffer->buf_addr; sz = ch->blkcnt * ch->blksz; retry = ATI_IXP_DMA_RETRY_MAX; @@ -739,8 +739,7 @@ atiixp_chan_trigger(kobj_t obj, void *data, int go) ch->ptr = 0; ch->prevptr = 0; pollticks = ((uint64_t)hz * ch->blksz) / - ((uint64_t)sndbuf_getalign(ch->buffer) * - sndbuf_getspd(ch->buffer)); + ((uint64_t)ch->buffer->align * ch->buffer->spd); pollticks >>= 2; if (pollticks > hz) pollticks = hz; @@ -781,8 +780,8 @@ atiixp_chan_trigger(kobj_t obj, void *data, int go) else ch = &sc->rch; pollticks = ((uint64_t)hz * ch->blksz) / - ((uint64_t)sndbuf_getalign(ch->buffer) * - sndbuf_getspd(ch->buffer)); + ((uint64_t)ch->buffer->align * + ch->buffer->spd); pollticks >>= 2; if (pollticks > hz) pollticks = hz; diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 22f1e76a4d1f..a1356f58b567 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -255,10 +255,10 @@ cmi_dma_prog(struct sc_info *sc, struct sc_chinfo *ch, u_int32_t base) { u_int32_t s, i, sz; - ch->phys_buf = sndbuf_getbufaddr(ch->buffer); + ch->phys_buf = ch->buffer->buf_addr; cmi_wr(sc, base, ch->phys_buf, 4); - sz = (u_int32_t)sndbuf_getsize(ch->buffer); + sz = (u_int32_t)ch->buffer->bufsize; s = sz / ch->bps - 1; cmi_wr(sc, base + 4, s, 2); @@ -525,7 +525,7 @@ cmichan_getptr(kobj_t obj, void *data) } snd_mtxunlock(sc->lock); - sz = sndbuf_getsize(ch->buffer); + sz = ch->buffer->bufsize; bufptr = (physptr - ch->phys_buf + sz - ch->bps) % sz; return bufptr; diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index 7a25f7f4c08d..af2b4da76aba 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -328,7 +328,7 @@ cs4281chan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channe ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); ch->spd = DSP_DEFAULT_SPEED; ch->bps = 1; - ch->blksz = sndbuf_getsize(ch->buffer); + ch->blksz = ch->buffer->bufsize; ch->dma_chan = (dir == PCMDIR_PLAY) ? CS4281_DMA_PLAY : CS4281_DMA_REC; ch->dma_setup = 0; @@ -412,7 +412,7 @@ cs4281chan_getptr(kobj_t obj, void *data) u_int32_t dba, dca, ptr; int sz; - sz = sndbuf_getsize(ch->buffer); + sz = ch->buffer->bufsize; dba = cs4281_rd(sc, CS4281PCI_DBA(ch->dma_chan)); dca = cs4281_rd(sc, CS4281PCI_DCA(ch->dma_chan)); ptr = (dca - dba + sz) % sz; @@ -493,9 +493,9 @@ adcdac_prog(struct sc_chinfo *ch) if (!ch->dma_setup) { go = adcdac_go(ch, 0); cs4281_wr(sc, CS4281PCI_DBA(ch->dma_chan), - sndbuf_getbufaddr(ch->buffer)); + ch->buffer->buf_addr); cs4281_wr(sc, CS4281PCI_DBC(ch->dma_chan), - sndbuf_getsize(ch->buffer) / ch->bps - 1); + ch->buffer->bufsize / ch->bps - 1); ch->dma_setup = 1; adcdac_go(ch, go); } diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index a966a2e66402..688aee6400d8 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -483,7 +483,7 @@ csa_setupchan(struct csa_chinfo *ch) if (ch->dir == PCMDIR_PLAY) { /* direction */ - csa_writemem(resp, BA1_PBA, sndbuf_getbufaddr(ch->buffer)); + csa_writemem(resp, BA1_PBA, ch->buffer->buf_addr); /* format */ csa->pfie = csa_readmem(resp, BA1_PFIE) & ~0x0000f03f; @@ -512,7 +512,7 @@ csa_setupchan(struct csa_chinfo *ch) csa_setplaysamplerate(resp, ch->spd); } else if (ch->dir == PCMDIR_REC) { /* direction */ - csa_writemem(resp, BA1_CBA, sndbuf_getbufaddr(ch->buffer)); + csa_writemem(resp, BA1_CBA, ch->buffer->buf_addr); /* format */ csa_writemem(resp, BA1_CIE, (csa_readmem(resp, BA1_CIE) & ~0x0000003f) | 0x00000001); @@ -602,11 +602,11 @@ csachan_getptr(kobj_t obj, void *data) resp = &csa->res; if (ch->dir == PCMDIR_PLAY) { - ptr = csa_readmem(resp, BA1_PBA) - sndbuf_getbufaddr(ch->buffer); + ptr = csa_readmem(resp, BA1_PBA) - ch->buffer->buf_addr; if ((ch->fmt & AFMT_U8) != 0 || (ch->fmt & AFMT_S8) != 0) ptr >>= 1; } else { - ptr = csa_readmem(resp, BA1_CBA) - sndbuf_getbufaddr(ch->buffer); + ptr = csa_readmem(resp, BA1_CBA) - ch->buffer->buf_addr; if ((ch->fmt & AFMT_U8) != 0 || (ch->fmt & AFMT_S8) != 0) ptr >>= 1; } diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index e4b2c22f4f07..a85031977f4b 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -413,7 +413,7 @@ emu_settimer(struct sc_info *sc) for (i = 0; i < sc->nchans; i++) { pch = &sc->pch[i]; if (pch->buffer) { - tmp = (pch->spd * sndbuf_getalign(pch->buffer)) + tmp = (pch->spd * pch->buffer->align) / pch->blksz; if (tmp > rate) rate = tmp; @@ -423,7 +423,7 @@ emu_settimer(struct sc_info *sc) for (i = 0; i < 3; i++) { rch = &sc->rch[i]; if (rch->buffer) { - tmp = (rch->spd * sndbuf_getalign(rch->buffer)) + tmp = (rch->spd * rch->buffer->align) / rch->blksz; if (tmp > rate) rate = tmp; @@ -838,7 +838,7 @@ emupchan_free(kobj_t obj, void *data) int r; snd_mtxlock(sc->lock); - r = emu_memfree(sc, sndbuf_getbuf(ch->buffer)); + r = emu_memfree(sc, ch->buffer->buf); snd_mtxunlock(sc->lock); return r; @@ -985,7 +985,7 @@ emurchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, return NULL; else { snd_mtxlock(sc->lock); - emu_wrptr(sc, 0, ch->basereg, sndbuf_getbufaddr(ch->buffer)); + emu_wrptr(sc, 0, ch->basereg, ch->buffer->buf_addr); emu_wrptr(sc, 0, ch->sizereg, 0); /* off */ snd_mtxunlock(sc->lock); return ch; diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c index c280b64892f6..a93d48ba71b1 100644 --- a/sys/dev/sound/pci/emu10kx-pcm.c +++ b/sys/dev/sound/pci/emu10kx-pcm.c @@ -773,7 +773,7 @@ emupchan_setblocksize(kobj_t obj __unused, void *c_devinfo, uint32_t blocksize) blocksize = ch->pcm->bufsz; snd_mtxlock(sc->lock); ch->blksz = blocksize; - emu_timer_set(sc->card, ch->timer, ch->blksz / sndbuf_getalign(ch->buffer)); + emu_timer_set(sc->card, ch->timer, ch->blksz / ch->buffer->align); snd_mtxunlock(sc->lock); return (ch->blksz); } @@ -795,7 +795,8 @@ emupchan_trigger(kobj_t obj __unused, void *c_devinfo, int go) else emu_vroute(sc->card, &(sc->rt_mono), ch->master); emu_vwrite(sc->card, ch->master); - emu_timer_set(sc->card, ch->timer, ch->blksz / sndbuf_getalign(ch->buffer)); + emu_timer_set(sc->card, ch->timer, ch->blksz / + ch->buffer->align); emu_timer_enable(sc->card, ch->timer, 1); } /* PCM interrupt handler will handle PCMTRIG_STOP event */ @@ -878,7 +879,7 @@ emurchan_init(kobj_t obj __unused, void *devinfo, struct snd_dbuf *b, struct pcm return (NULL); else { ch->timer = emu_timer_create(sc->card); - emu_wrptr(sc->card, 0, ch->basereg, sndbuf_getbufaddr(ch->buffer)); + emu_wrptr(sc->card, 0, ch->basereg, ch->buffer->buf_addr); emu_wrptr(sc->card, 0, ch->sizereg, 0); /* off */ return (ch); } @@ -930,7 +931,8 @@ emurchan_setblocksize(kobj_t obj __unused, void *c_devinfo, uint32_t blocksize) * (and use) timer interrupts. Otherwise channel will be marked dead. */ if (ch->blksz < (ch->pcm->bufsz / 2)) { - emu_timer_set(sc->card, ch->timer, ch->blksz / sndbuf_getalign(ch->buffer)); + emu_timer_set(sc->card, ch->timer, ch->blksz / + ch->buffer->align); emu_timer_enable(sc->card, ch->timer, 1); } else { emu_timer_enable(sc->card, ch->timer, 0); @@ -1059,7 +1061,7 @@ emufxrchan_init(kobj_t obj __unused, void *devinfo, struct snd_dbuf *b, struct p if (sndbuf_alloc(ch->buffer, emu_gettag(sc->card), 0, sc->bufsz) != 0) return (NULL); else { - emu_wrptr(sc->card, 0, ch->basereg, sndbuf_getbufaddr(ch->buffer)); + emu_wrptr(sc->card, 0, ch->basereg, ch->buffer->buf_addr); emu_wrptr(sc->card, 0, ch->sizereg, 0); /* off */ return (ch); } diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index 3c1bea09b5d1..eb546de81f65 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -508,21 +508,21 @@ eschan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, es_wr(es, ES1370_REG_MEMPAGE, ES1370_REG_DAC1_FRAMEADR >> 8, 1); es_wr(es, ES1370_REG_DAC1_FRAMEADR & 0xff, - sndbuf_getbufaddr(ch->buffer), 4); + ch->buffer->buf_addr, 4); es_wr(es, ES1370_REG_DAC1_FRAMECNT & 0xff, (ch->bufsz >> 2) - 1, 4); } else { es_wr(es, ES1370_REG_MEMPAGE, ES1370_REG_DAC2_FRAMEADR >> 8, 1); es_wr(es, ES1370_REG_DAC2_FRAMEADR & 0xff, - sndbuf_getbufaddr(ch->buffer), 4); + ch->buffer->buf_addr, 4); es_wr(es, ES1370_REG_DAC2_FRAMECNT & 0xff, (ch->bufsz >> 2) - 1, 4); } } else { es_wr(es, ES1370_REG_MEMPAGE, ES1370_REG_ADC_FRAMEADR >> 8, 1); es_wr(es, ES1370_REG_ADC_FRAMEADR & 0xff, - sndbuf_getbufaddr(ch->buffer), 4); + ch->buffer->buf_addr, 4); es_wr(es, ES1370_REG_ADC_FRAMECNT & 0xff, (ch->bufsz >> 2) - 1, 4); } @@ -637,8 +637,8 @@ eschan_setfragments(kobj_t obj, void *data, uint32_t blksz, uint32_t blkcnt) blksz &= ES_BLK_ALIGN; - if (blksz > (sndbuf_getmaxsize(ch->buffer) / ES_DMA_SEGS_MIN)) - blksz = sndbuf_getmaxsize(ch->buffer) / ES_DMA_SEGS_MIN; + if (blksz > (ch->buffer->maxsize / ES_DMA_SEGS_MIN)) + blksz = ch->buffer->maxsize / ES_DMA_SEGS_MIN; if (blksz < ES_BLK_MIN) blksz = ES_BLK_MIN; if (blkcnt > ES_DMA_SEGS_MAX) @@ -646,7 +646,7 @@ eschan_setfragments(kobj_t obj, void *data, uint32_t blksz, uint32_t blkcnt) if (blkcnt < ES_DMA_SEGS_MIN) blkcnt = ES_DMA_SEGS_MIN; - while ((blksz * blkcnt) > sndbuf_getmaxsize(ch->buffer)) { + while ((blksz * blkcnt) > ch->buffer->maxsize) { if ((blkcnt >> 1) >= ES_DMA_SEGS_MIN) blkcnt >>= 1; else if ((blksz >> 1) >= ES_BLK_MIN) @@ -655,15 +655,15 @@ eschan_setfragments(kobj_t obj, void *data, uint32_t blksz, uint32_t blkcnt) break; } - if ((sndbuf_getblksz(ch->buffer) != blksz || - sndbuf_getblkcnt(ch->buffer) != blkcnt) && + if ((ch->buffer->blksz != blksz || + ch->buffer->blkcnt != blkcnt) && sndbuf_resize(ch->buffer, blkcnt, blksz) != 0) device_printf(es->dev, "%s: failed blksz=%u blkcnt=%u\n", __func__, blksz, blkcnt); - ch->bufsz = sndbuf_getsize(ch->buffer); - ch->blksz = sndbuf_getblksz(ch->buffer); - ch->blkcnt = sndbuf_getblkcnt(ch->buffer); + ch->bufsz = ch->buffer->bufsize; + ch->blksz = ch->buffer->blksz; + ch->blkcnt = ch->buffer->blkcnt; return (0); } @@ -762,7 +762,7 @@ eschan_trigger(kobj_t obj, void *data, int go) return 0; ES_LOCK(es); - cnt = (ch->blksz / sndbuf_getalign(ch->buffer)) - 1; + cnt = (ch->blksz / ch->buffer->align) - 1; if (ch->fmt & AFMT_16BIT) b |= 0x02; if (AFMT_CHANNEL(ch->fmt) > 1) diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 3537c7807ded..39d12f8505d1 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -440,7 +440,7 @@ fm801ch_trigger(kobj_t obj, void *data, int go) { struct fm801_chinfo *ch = data; struct fm801_info *fm801 = ch->parent; - u_int32_t baseaddr = sndbuf_getbufaddr(ch->buffer); + u_int32_t baseaddr = ch->buffer->buf_addr; u_int32_t k1; DPRINT("fm801ch_trigger go %d , ", go); diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index 5dbb5c4f4453..14231107e17a 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -2081,10 +2081,10 @@ hdaa_channel_setfragments(kobj_t obj, void *data, { struct hdaa_chan *ch = data; - blksz -= blksz % lcm(HDA_DMA_ALIGNMENT, sndbuf_getalign(ch->b)); + blksz -= blksz % lcm(HDA_DMA_ALIGNMENT, ch->b->align); - if (blksz > (sndbuf_getmaxsize(ch->b) / HDA_BDL_MIN)) - blksz = sndbuf_getmaxsize(ch->b) / HDA_BDL_MIN; + if (blksz > (ch->b->maxsize / HDA_BDL_MIN)) + blksz = ch->b->maxsize / HDA_BDL_MIN; if (blksz < HDA_BLK_MIN) blksz = HDA_BLK_MIN; if (blkcnt > HDA_BDL_MAX) @@ -2092,7 +2092,7 @@ hdaa_channel_setfragments(kobj_t obj, void *data, if (blkcnt < HDA_BDL_MIN) blkcnt = HDA_BDL_MIN; - while ((blksz * blkcnt) > sndbuf_getmaxsize(ch->b)) { + while ((blksz * blkcnt) > ch->b->maxsize) { if ((blkcnt >> 1) >= HDA_BDL_MIN) blkcnt >>= 1; else if ((blksz >> 1) >= HDA_BLK_MIN) @@ -2101,14 +2101,14 @@ hdaa_channel_setfragments(kobj_t obj, void *data, break; } - if ((sndbuf_getblksz(ch->b) != blksz || - sndbuf_getblkcnt(ch->b) != blkcnt) && + if ((ch->b->blksz != blksz || + ch->b->blkcnt != blkcnt) && sndbuf_resize(ch->b, blkcnt, blksz) != 0) device_printf(ch->devinfo->dev, "%s: failed blksz=%u blkcnt=%u\n", __func__, blksz, blkcnt); - ch->blksz = sndbuf_getblksz(ch->b); - ch->blkcnt = sndbuf_getblkcnt(ch->b); + ch->blksz = ch->b->blksz; + ch->blkcnt = ch->b->blkcnt; return (0); } @@ -2169,7 +2169,7 @@ hdaa_channel_start(struct hdaa_chan *ch) ch->dir == PCMDIR_PLAY ? 1 : 0, ch->sid); HDAC_STREAM_START(device_get_parent(devinfo->dev), devinfo->dev, ch->dir == PCMDIR_PLAY ? 1 : 0, ch->sid, - sndbuf_getbufaddr(ch->b), ch->blksz, ch->blkcnt); + ch->b->buf_addr, ch->blksz, ch->blkcnt); ch->flags |= HDAA_CHN_RUNNING; return (0); } diff --git a/sys/dev/sound/pci/hdsp-pcm.c b/sys/dev/sound/pci/hdsp-pcm.c index 5ac571e64fde..bc11199f15e8 100644 --- a/sys/dev/sound/pci/hdsp-pcm.c +++ b/sys/dev/sound/pci/hdsp-pcm.c @@ -971,7 +971,7 @@ hdspchan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) hdsp_write_4(sc, HDSP_FREQ_REG, hdsp_freq_reg_value(sc->speed)); end: - return (sndbuf_getblksz(ch->buffer)); + return (ch->buffer->blksz); } static uint32_t hdsp_bkp_fmt[] = { diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index 09bbbe22dacf..1c0a92e45b7a 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -962,7 +962,7 @@ hdspechan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) (sc->period * 4)); end: - return (sndbuf_getblksz(ch->buffer)); + return (ch->buffer->blksz); } static uint32_t hdspe_bkp_fmt[] = { diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index 500d6d95daac..53f4db3332a8 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -301,15 +301,15 @@ ich_filldtbl(struct sc_chinfo *ch) uint32_t base; int i; - base = sndbuf_getbufaddr(ch->buffer); - if ((ch->blksz * ch->blkcnt) > sndbuf_getmaxsize(ch->buffer)) - ch->blksz = sndbuf_getmaxsize(ch->buffer) / ch->blkcnt; - if ((sndbuf_getblksz(ch->buffer) != ch->blksz || - sndbuf_getblkcnt(ch->buffer) != ch->blkcnt) && + base = ch->buffer->buf_addr; + if ((ch->blksz * ch->blkcnt) > ch->buffer->maxsize) + ch->blksz = ch->buffer->maxsize / ch->blkcnt; + if ((ch->buffer->blksz != ch->blksz || + ch->buffer->blkcnt != ch->blkcnt) && sndbuf_resize(ch->buffer, ch->blkcnt, ch->blksz) != 0) device_printf(sc->dev, "%s: failed blksz=%u blkcnt=%u\n", __func__, ch->blksz, ch->blkcnt); - ch->blksz = sndbuf_getblksz(ch->buffer); + ch->blksz = ch->buffer->blksz; for (i = 0; i < ICH_DTBL_LENGTH; i++) { ch->dtbl[i].buffer = base + (ch->blksz * (i % ch->blkcnt)); @@ -491,7 +491,7 @@ ichchan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) ); if (sc->flags & ICH_HIGH_LATENCY) - blocksize = sndbuf_getmaxsize(ch->buffer) / ch->blkcnt; + blocksize = ch->buffer->maxsize / ch->blkcnt; if (blocksize < ICH_MIN_BLKSZ) blocksize = ICH_MIN_BLKSZ; @@ -734,7 +734,7 @@ ich_calibrate(void *arg) ch->blkcnt = 2; sc->flags |= ICH_CALIBRATE_DONE; ICH_UNLOCK(sc); - ichchan_setblocksize(0, ch, sndbuf_getmaxsize(ch->buffer) >> 1); + ichchan_setblocksize(0, ch, ch->buffer->maxsize >> 1); ICH_LOCK(sc); sc->flags &= ~ICH_CALIBRATE_DONE; diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index 2d102fcd6dbe..ee39f5f3c90d 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -444,10 +444,10 @@ m3_pchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel return (NULL); } M3_LOCK(sc); - ch->bufsize = sndbuf_getsize(ch->buffer); + ch->bufsize = ch->buffer->bufsize; /* host dma buffer pointers */ - bus_addr = sndbuf_getbufaddr(ch->buffer); + bus_addr = ch->buffer->buf_addr; if (bus_addr & 3) { device_printf(sc->dev, "m3_pchan_init unaligned bus_addr\n"); bus_addr = (bus_addr + 4) & ~3; @@ -595,7 +595,7 @@ m3_pchan_setblocksize(kobj_t kobj, void *chdata, u_int32_t blocksize) M3_DEBUG(CHANGE, ("m3_pchan_setblocksize(dac=%d, blocksize=%d)\n", ch->dac_idx, blocksize)); - return (sndbuf_getblksz(ch->buffer)); + return (ch->buffer->blksz); } static int @@ -709,7 +709,7 @@ m3_pchan_getptr_internal(struct sc_pchinfo *ch) struct sc_info *sc = ch->parent; u_int32_t hi, lo, bus_base, bus_crnt; - bus_base = sndbuf_getbufaddr(ch->buffer); + bus_base = ch->buffer->buf_addr; hi = m3_rd_assp_data(sc, ch->dac_data + CDATA_HOST_SRC_CURRENTH); lo = m3_rd_assp_data(sc, ch->dac_data + CDATA_HOST_SRC_CURRENTL); bus_crnt = lo | (hi << 16); @@ -823,10 +823,10 @@ m3_rchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel return (NULL); } M3_LOCK(sc); - ch->bufsize = sndbuf_getsize(ch->buffer); + ch->bufsize = ch->buffer->bufsize; /* host dma buffer pointers */ - bus_addr = sndbuf_getbufaddr(ch->buffer); + bus_addr = ch->buffer->buf_addr; if (bus_addr & 3) { device_printf(sc->dev, "m3_rchan_init unaligned bus_addr\n"); bus_addr = (bus_addr + 4) & ~3; @@ -968,7 +968,7 @@ m3_rchan_setblocksize(kobj_t kobj, void *chdata, u_int32_t blocksize) M3_DEBUG(CHANGE, ("m3_rchan_setblocksize(adc=%d, blocksize=%d)\n", ch->adc_idx, blocksize)); - return (sndbuf_getblksz(ch->buffer)); + return (ch->buffer->blksz); } static int @@ -1061,7 +1061,7 @@ m3_rchan_getptr_internal(struct sc_rchinfo *ch) struct sc_info *sc = ch->parent; u_int32_t hi, lo, bus_base, bus_crnt; - bus_base = sndbuf_getbufaddr(ch->buffer); + bus_base = ch->buffer->buf_addr; hi = m3_rd_assp_data(sc, ch->adc_data + CDATA_HOST_SRC_CURRENTH); lo = m3_rd_assp_data(sc, ch->adc_data + CDATA_HOST_SRC_CURRENTL); bus_crnt = lo | (hi << 16); @@ -1162,7 +1162,7 @@ m3_handle_channel_intr: pch->ptr = m3_pchan_getptr_internal(pch); delta = pch->bufsize + pch->ptr - pch->prevptr; delta %= pch->bufsize; - if (delta < sndbuf_getblksz(pch->buffer)) + if (delta < pch->buffer->blksz) continue; pch->prevptr = pch->ptr; M3_UNLOCK(sc); @@ -1176,7 +1176,7 @@ m3_handle_channel_intr: rch->ptr = m3_rchan_getptr_internal(rch); delta = rch->bufsize + rch->ptr - rch->prevptr; delta %= rch->bufsize; - if (delta < sndbuf_getblksz(rch->buffer)) + if (delta < rch->buffer->blksz) continue; rch->prevptr = rch->ptr; M3_UNLOCK(sc); diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index d7824c990a52..1fee943d9364 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -362,7 +362,7 @@ nmchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c sndbuf_setup(ch->buffer, (u_int8_t *)rman_get_virtual(sc->buf) + chnbuf, NM_BUFFSIZE); if (bootverbose) device_printf(sc->dev, "%s buf %p\n", (dir == PCMDIR_PLAY)? - "play" : "rec", sndbuf_getbuf(ch->buffer)); + "play" : "rec", ch->buffer->buf); ch->parent = sc; ch->channel = c; ch->dir = dir; diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index 90dd2e26ad41..8229b0cffdae 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -584,7 +584,8 @@ esschan_trigger(kobj_t obj, void *data, int go) ess_lock(sc); switch (go) { case PCMTRIG_START: - ess_dmasetup(sc, ch->hwch, sndbuf_getbufaddr(ch->buffer), sndbuf_getsize(ch->buffer), ch->dir); + ess_dmasetup(sc, ch->hwch, ch->buffer->buf_addr, + ch->buffer->bufsize, ch->dir); ess_dmatrigger(sc, ch->hwch, 1); ess_start(ch); break; diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index 07b9e1004573..874d1c7a2e2a 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -555,9 +555,9 @@ trpchan_trigger(kobj_t obj, void *data, int go) ch->fms = 0; ch->ec = 0; ch->alpha = 0; - ch->lba = sndbuf_getbufaddr(ch->buffer); + ch->lba = ch->buffer->buf_addr; ch->cso = 0; - ch->eso = (sndbuf_getsize(ch->buffer) / sndbuf_getalign(ch->buffer)) - 1; + ch->eso = (ch->buffer->bufsize / ch->buffer->align) - 1; ch->rvol = ch->cvol = 0x7f; ch->gvsel = 0; ch->pan = 0; @@ -581,7 +581,7 @@ trpchan_getptr(kobj_t obj, void *data) struct tr_chinfo *ch = data; tr_rdch(ch); - return ch->cso * sndbuf_getalign(ch->buffer); + return ch->cso * ch->buffer->align; } static struct pcmchan_caps * @@ -680,7 +680,7 @@ trrchan_trigger(kobj_t obj, void *data, int go) i = tr_rd(tr, TR_REG_DMAR11, 1) & 0x03; tr_wr(tr, TR_REG_DMAR11, i | 0x54, 1); /* set up base address */ - tr_wr(tr, TR_REG_DMAR0, sndbuf_getbufaddr(ch->buffer), 4); + tr_wr(tr, TR_REG_DMAR0, ch->buffer->buf_addr, 4); /* set up buffer size */ i = tr_rd(tr, TR_REG_DMAR4, 4) & ~0x00ffffff; tr_wr(tr, TR_REG_DMAR4, i | (sndbuf_runsz(ch->buffer) - 1), 4); @@ -703,7 +703,7 @@ trrchan_getptr(kobj_t obj, void *data) struct tr_info *tr = ch->parent; /* return current byte offset of channel */ - return tr_rd(tr, TR_REG_DMAR0, 4) - sndbuf_getbufaddr(ch->buffer); + return tr_rd(tr, TR_REG_DMAR0, 4) - ch->buffer->buf_addr; } static struct pcmchan_caps * diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 243353805b94..47caa7ea4459 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -385,7 +385,7 @@ via_buildsgdt(struct via_chinfo *ch) uint32_t phys_addr, flag; int i; - phys_addr = sndbuf_getbufaddr(ch->buffer); + phys_addr = ch->buffer->buf_addr; for (i = 0; i < ch->blkcnt; i++) { flag = (i == ch->blkcnt - 1) ? VIA_DMAOP_EOL : VIA_DMAOP_FLAG; @@ -568,8 +568,8 @@ via8233chan_setfragments(kobj_t obj, void *data, blksz &= VIA_BLK_ALIGN; - if (blksz > (sndbuf_getmaxsize(ch->buffer) / VIA_SEGS_MIN)) - blksz = sndbuf_getmaxsize(ch->buffer) / VIA_SEGS_MIN; + if (blksz > (ch->buffer->maxsize / VIA_SEGS_MIN)) + blksz = ch->buffer->maxsize / VIA_SEGS_MIN; if (blksz < VIA_BLK_MIN) blksz = VIA_BLK_MIN; if (blkcnt > VIA_SEGS_MAX) @@ -577,7 +577,7 @@ via8233chan_setfragments(kobj_t obj, void *data, if (blkcnt < VIA_SEGS_MIN) *** 1197 LINES SKIPPED *** From nobody Tue Nov 18 00:51:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzz0bq3z6HH5x; Tue, 18 Nov 2025 00:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzy3JGrz3xrR; Tue, 18 Nov 2025 00:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TfBLbcTcbWGtoazTOWYAvqDS4hOlB45FQlNY5yrtZco=; b=mFI6IkJ1RFOuPGNOH4n9WfpH9ehuegDDK/fXz8U/XLRqK3f/PSKU+B6JRYykTX10iq1mJ+ AzhCJWbh+uMukb0Z55Jkt4zQI9VoVxEVuLHbWOGvo50txEgkcWKFpnCapOW2bvW9/5ps2T 3Fw43TVahfdUW1PeMq15fCS6oNdx+EyqT5w/DINmOo2YPrM5HxUOmz1p4nw9VA4Dg45UCY UhTnZpgGr1N88iQyuqs+v3L06MInwxJhBU03o4k22+XioKV+xieAsYo5Y2tTMvk2gVzWeM A9krsx4oI81KiqBBniB1GDug+/g3NJ6HSU0PX4V7/RpYTxnotMtSbhAALzu+Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TfBLbcTcbWGtoazTOWYAvqDS4hOlB45FQlNY5yrtZco=; b=aXIC4Y+rO8lA0Pj5LBWHOvAtD10Lt7zminjykIkDhQ+WR7wrFCoct8ONvS5chPe68kL/s6 kMxv+YiBZkN1ylmIl8vCx75mt4EdCoNW1RJSPq8hMKcqrSn5SVrib9gWPNMUHPXXYCZ/03 L+Kf2a9jfkrUTz0dxWOOu+JKkwuMbWk2/0+vUGatHigAJR87jSmPRsLgX5vUOTX0uHu+h0 PZKZeUhMjjULq8aQi2dJtUyl+DSt+uxHL6n0j422qMk5A/KOCihqRJ0u7jcSYcbpIcX7hF P1x334u/nH3ach1fZAVhlD4V/1BQ1fWBxKeWWPDJZLXMaEmpNoq5f75g7T6Z6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427118; a=rsa-sha256; cv=none; b=a5yxTDHWQ4NeBN8+bMaxbjO3kWBCDcPxfLmuKYf7a2vCf2tahoTggl6ayUh+nCXQtxq6bt X3SkoFl+P2iowD/YxcHfHFAm9y7woOfO6jvMDo/0l2Kx8rZz7NAzftyQA5xZuNgXrrsO84 cJjvx/zVYTcFnN2WbI57vAS6hJKA2bVg21EYPEUb/rrWpSWYRyHI04s9DTiLNYCBPqTTB/ EbT8lxKuNIPhkZBx/MpCEGfJhn5bm9H9IVyzhtraQgFBZ3VcsinZ+6UifFZkIj4jVWAgjJ bQiqbm/erCXixrxsD3eZNonW33jHteTZ4TgfzCl+QglnsuIdoSSFyV1/2H9Oaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzy2cwszYKT; Tue, 18 Nov 2025 00:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pwUB045116; Tue, 18 Nov 2025 00:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pwAZ045113; Tue, 18 Nov 2025 00:51:58 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:58 GMT Message-Id: <202511180051.5AI0pwAZ045113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: aa214f899a40 - stable/15 - sound: Add to pcm/buffer.* copyright List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: aa214f899a4002f37557be18fe5571a278d31bce Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=aa214f899a4002f37557be18fe5571a278d31bce commit aa214f899a4002f37557be18fe5571a278d31bce Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:37 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Add to pcm/buffer.* copyright Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 4e2bf54d9f2e9a2a51dbdcebf079089615102f1c) --- sys/dev/sound/pcm/buffer.c | 4 ++++ sys/dev/sound/pcm/buffer.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index 841fc5b0d8a9..eb2cbe667bf3 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -5,6 +5,10 @@ * Portions Copyright (c) Ryan Beasley - GSoC 2006 * Copyright (c) 1999 Cameron Grant * All rights reserved. + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 5509256ea433..371ba2dd94ce 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -3,6 +3,10 @@ * * Copyright (c) 1999 Cameron Grant * All rights reserved. + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions From nobody Tue Nov 18 00:52:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0068srz6HGtH; Tue, 18 Nov 2025 00:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R004nFdz3xpK; Tue, 18 Nov 2025 00:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c0R0TRzPvcCSQyc3ECdhKxkIszmZz9xaV2JcyAEFGnc=; b=eJnIpxyCIkzfm6mEx79VmUYckgH9AzPNAnCit48KvayYK3sM9lcmjUhoLTfcn+XqVHSI9H DAkzmc+/s4ijrE+8wo0xcOe7WJD9gixSPY/jfn9hw/1Dyu+vw8bSX8LtbWUgyo5KyaSp18 xcRhhy3BQjgSdRTLC8ImK3CI2gZKAX0BZfuwg93sAuAwyDXjbYg9nb85jrW2auJVSHiMlb Df/D/Mfm6Qd21hJnLmJixXT7DJ0XOgy4KpMVshQ6InUs57NwLdKQks5l5j4GHeQRKuDt8Z rmuRqUrub9/8TLoDJvjLDyTvV4PlYdbxTE0ookTFpXriOmfyNdUOz8/4wI/Clg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c0R0TRzPvcCSQyc3ECdhKxkIszmZz9xaV2JcyAEFGnc=; b=q8e9v2fbt4Tx+WpNrFqwe6EZjyRVJSi+uOLEPy7NIVQqwCtnwb6h8xetZY0heAvdKE3Bdb l4L9iWNTxzdRyyH8nZ/GsH7uYTp7c4K7Irh7cb9e8SmYCgAtoyKVUB9QwMahbVS24XxkT3 q8u7SqOxMGEtrbn9+zxO2ZPF8zRhIwvjCH1amITmHqcBaa5K3yxyYirYGb5CXuitxf88bn +kAwoUfA/E8o+e8PmAHgdKCyvJKSFiy+wmaNvxk9nzyCpw/jDFoXyN7RUZpxv85Qpqn3iG rO2aVqJrR4vh6YGsHbNiO22b0cr8DdB36bl2A6Ml812OhB3dlaYB21xb711LWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427120; a=rsa-sha256; cv=none; b=XnRiNd4LoxnotZlLowbQSDP0dFYkD218qFT2W3NW09z6RmIlSzykBOH0G9F9dTVWbO1wVr ZKxqMS+1XRg41Pup8LOlQKkt+tTBJvSrRLkt9OTPB/Wlb7iI6qLegduc6k71KX0JbJNabi r56aeVUc2LbVXxXxEjjGHBoH1pHcx8V5o4EX2ja3uppo0sYIdQP8Yda5ErydWu2B2Tk3Bn nBJXl4mODx/lGBHPKjszUGgUgRDzeJthfWXg7/m/203w62PlAC9q2fHzVjL1PNMs+g7EwG 2naGwM72jOn+Maydoflco3NWUgBEQYQf1Af2aaVdXnZx1HsQdMFOnojgwZNrvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R004NltzXdV; Tue, 18 Nov 2025 00:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q0ST045195; Tue, 18 Nov 2025 00:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q0W7045192; Tue, 18 Nov 2025 00:52:00 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:00 GMT Message-Id: <202511180052.5AI0q0W7045192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ebe59a72abf7 - stable/15 - sound: Retire MAXFEEDERS and feedercnt List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ebe59a72abf7c71e0ef5091e91ecd36e6771422c Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ebe59a72abf7c71e0ef5091e91ecd36e6771422c commit ebe59a72abf7c71e0ef5091e91ecd36e6771422c Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:47 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire MAXFEEDERS and feedercnt Apart from the fact that it's unrealistic to reach MAXFEEDERS (256), since sound(4) comes with maximum 7 feeders (including feeder_root), there is also no reason to cap it. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53549 (cherry picked from commit 84282785cc497c3fb798502899f880e15d063233) --- sys/dev/sound/pcm/feeder.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 3f6b35c9197d..2e19577bfde3 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -42,15 +42,12 @@ static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); -#define MAXFEEDERS 256 - struct feedertab_entry { SLIST_ENTRY(feedertab_entry) link; struct feeder_class *feederclass; struct pcm_feederdesc *desc; }; static SLIST_HEAD(, feedertab_entry) feedertab; -static int feedercnt = 0; /*****************************************************************************/ @@ -60,7 +57,6 @@ feeder_register_root(void *p) struct feeder_class *fc = p; struct feedertab_entry *fte; - MPASS(feedercnt == 0); KASSERT(fc->desc == NULL, ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); @@ -68,7 +64,6 @@ feeder_register_root(void *p) fte->feederclass = fc; fte->desc = NULL; SLIST_INSERT_HEAD(&feedertab, fte, link); - feedercnt++; } void @@ -85,18 +80,13 @@ feeder_register(void *p) * translations being unavailable */ i = 0; - while ((feedercnt < MAXFEEDERS) && (fc->desc[i].type > 0)) { + while (fc->desc[i].type > 0) { fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; fte->desc = &fc->desc[i]; SLIST_INSERT_HEAD(&feedertab, fte, link); i++; } - feedercnt++; - if (feedercnt >= MAXFEEDERS) { - printf("MAXFEEDERS (%d >= %d) exceeded\n", - feedercnt, MAXFEEDERS); - } } static void From nobody Tue Nov 18 00:51:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Qzz62Dmz6HH6D; Tue, 18 Nov 2025 00:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzz3fbZz3xWj; Tue, 18 Nov 2025 00:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6T0PlKS1y8fZe0wgpgK0RoR9tY59DbWx/uwmA5r+nq0=; b=WgkjsPvCTUMH+inxR7pFuuu7nL9JjNVEpTtgJYqxuIZ4jk7gMnjCbqb7a8j9nz+bX/XziG XVmX5skQcB8izpD8jMcQRTADYckDDyPwzCfyXLRz/wBZwppShq1iAceQXfuZwnhSfvqFmZ WwBufxS+nv7T/zDpYa89rG0yq/DAsKbPyqU69eyLrAt08JrF4BfbzRVRsWx5538yTQG2tt KM5OzEICnt+2P3fIsg54pyFlvyfqiOKDXicv7PlbdFN3NZv61KwUCwh2haaxhFUyj0cr2o xOCQ8elCUh+hcSkyU3NSAVGLcj5JF7+QHX2PouLo6GETCYh9B05wIaD78aapwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6T0PlKS1y8fZe0wgpgK0RoR9tY59DbWx/uwmA5r+nq0=; b=Q2JAw8mHNzRRLHWxzZeEaRH3p8rw5AVvkuq1xJ/xhWoRscR65k6gMTe102pT5Q8XqLeA9d ICefcg6hjOsu5OuVNcbUI0tuajvVZIPykHhCI107qenarOnwyP/EIx9N41x2Ra/U/yEeNO 1t+MojnIa8pAaxmrXUVYzfhPX9x0p7S59Q3Uk8vxt2/QFxB/bYusC8EPUV4fQmCOrXCBro GPkTNttayl4C3puJ3zVrC73MSMaf86gq22TWBx+3/0qEiFMkQHCBPunLTNzfkOuXq2pZs3 WYe9Fuu5NjyRYvK7s0WpsxMlSdPKja5eP+9Ps6jAltx2mIbsJWWI0yD983BRIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427119; a=rsa-sha256; cv=none; b=GZHXprb7/AXqQbykcCrnwWcK3Xve8mOZU4gdu+nlyiQG0IbVgqdJknix+RaAh0772Fu90M Qr+UCktNHZOeh5nnr2RFG7/WlWNyu+eUGoTO3IgGWoxRIYQrAq9syrVoNnplSVCEVg+nkF 6BC0kXnbTd2Sh6tIGYbw9TqgZNsVMm8kZ0KnA/BK/Ln2oYKSgW4n3t8mTJTvAyRvVENyT3 PrtPofc9jHhyfsfUdl18eBqGcVxc2hlFvE1jWCq38eD0dKn6qW6cm4IKvXnKPOqqUHk/sL qT7VZlSDfmMvNJ40C2KkBbu8y/u3B4JMvWaQgeuAG+XPFFhQOY5HdXhs8DPQbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Qzz387NzXdQ; Tue, 18 Nov 2025 00:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0pxOD045155; Tue, 18 Nov 2025 00:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pxD3045151; Tue, 18 Nov 2025 00:51:59 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:59 GMT Message-Id: <202511180051.5AI0pxD3045151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0c61ba36895a - stable/15 - sound: Retire unused {pcm_feederdesc,feedertab_entry}->idx List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0c61ba36895aed8cc9eca50b549948235b4d5b21 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0c61ba36895aed8cc9eca50b549948235b4d5b21 commit 0c61ba36895aed8cc9eca50b549948235b4d5b21 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:42 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:22 +0000 sound: Retire unused {pcm_feederdesc,feedertab_entry}->idx Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53547 (cherry picked from commit f1157508b37d66c0e038b2a3346858999bcd5984) --- sys/dev/sound/pcm/feeder.c | 8 +------- sys/dev/sound/pcm/feeder.h | 1 - sys/dev/sound/pcm/feeder_eq.c | 4 ++-- sys/dev/sound/pcm/feeder_format.c | 4 ++-- sys/dev/sound/pcm/feeder_matrix.c | 4 ++-- sys/dev/sound/pcm/feeder_mixer.c | 4 ++-- sys/dev/sound/pcm/feeder_rate.c | 4 ++-- sys/dev/sound/pcm/feeder_volume.c | 4 ++-- 8 files changed, 13 insertions(+), 20 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 2ec0ee6fb3fd..3f6b35c9197d 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -48,8 +48,6 @@ struct feedertab_entry { SLIST_ENTRY(feedertab_entry) link; struct feeder_class *feederclass; struct pcm_feederdesc *desc; - - int idx; }; static SLIST_HEAD(, feedertab_entry) feedertab; static int feedercnt = 0; @@ -69,7 +67,6 @@ feeder_register_root(void *p) fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; fte->desc = NULL; - fte->idx = feedercnt; SLIST_INSERT_HEAD(&feedertab, fte, link); feedercnt++; } @@ -92,8 +89,6 @@ feeder_register(void *p) fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; fte->desc = &fc->desc[i]; - fte->idx = feedercnt; - fte->desc->idx = feedercnt; SLIST_INSERT_HEAD(&feedertab, fte, link); i++; } @@ -156,7 +151,6 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) f->desc->in = 0; f->desc->out = 0; f->desc->flags = 0; - f->desc->idx = 0; } err = FEEDER_INIT(f); @@ -394,7 +388,7 @@ feeder_printchain(struct pcm_feeder *head) printf("feeder chain (head @%p)\n", head); f = head; while (f != NULL) { - printf("%s/%d @ %p\n", f->class->name, f->desc->idx, f); + printf("%s @ %p\n", f->class->name, f); f = f->source; } printf("[end]\n\n"); diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 60b8280e59ef..e417d68fea71 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -31,7 +31,6 @@ struct pcm_feederdesc { u_int32_t type; u_int32_t in, out; u_int32_t flags; - int idx; }; struct feeder_class { diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 23e27b922486..88a083a3bfd1 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -420,8 +420,8 @@ feed_eq_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_eq_desc[] = { - { FEEDER_EQ, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_EQ, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_eq_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 0feac43374b8..c9679cfeba44 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -173,8 +173,8 @@ feed_format_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_format_desc[] = { - { FEEDER_FORMAT, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_FORMAT, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_format_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 43258a311d82..a0af32b887ce 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -399,8 +399,8 @@ feed_matrix_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_matrix_desc[] = { - { FEEDER_MATRIX, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_MATRIX, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_matrix_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index ab67a14711d3..028e9366aa8e 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -359,8 +359,8 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_mixer_desc[] = { - { FEEDER_MIXER, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_MIXER, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_mixer_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 9c29142b9d6b..166165e95e65 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1706,8 +1706,8 @@ z_resampler_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_rate_desc[] = { - { FEEDER_RATE, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 }, + { FEEDER_RATE, 0, 0, 0 }, + { 0, 0, 0, 0 }, }; static kobj_method_t feeder_rate_methods[] = { diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index ddcbf29804f3..119ab1b288d8 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -307,8 +307,8 @@ feed_volume_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, } static struct pcm_feederdesc feeder_volume_desc[] = { - { FEEDER_VOLUME, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { FEEDER_VOLUME, 0, 0, 0 }, + { 0, 0, 0, 0 } }; static kobj_method_t feeder_volume_methods[] = { From nobody Tue Nov 18 00:52:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R020dPbz6HH0P; Tue, 18 Nov 2025 00:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R015TpHz3y0Z; Tue, 18 Nov 2025 00:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCCBpjt+M4O+TeNH16k3dlHXel5MXfj/7wrOj1iwzw8=; b=admhfAq5VvL78haXeQSVaCPPRiI8fLdX5AGlBHy05jpSZBI6yKDFZu1DWSL7rI20nsplZD PGy+gMTiGtX+lGTypBIH5PftXPVvegEZ0zbXBejLfEtTUMYbMg1sVLTCUE0DB+GDQUPHEY PlAZ/LMQrLsEQpPPgK/aPvMQM5pnl+2bjCMUZ1/+gcdgu7gRhz6lwbyQ17zfbSljmKubnk T9XIYGgx83kArLr7tD+DYwGpg1dafb/LeTBaedXRXyQzxOsGLMyh2Gal1xUbpjwcb1ZQCR cP0MQL5em9anx08O/R/DEyYUQ/Rmwi8jaDDhk7NNWTK6ns5eofAxgnOyfudDCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCCBpjt+M4O+TeNH16k3dlHXel5MXfj/7wrOj1iwzw8=; b=rbXV3ksRehZT/S2hRVdNlIkYvez8w2BpgGepZd2gKh/9kCKhjb0Fejeq9FX9AGx193sF1/ fHi62xoUonUgea9Y6N4eXPB2gcAmrtgu+ZMGVbY1rqZPdKaMT8ZU3OOEOdAkHprjSVevgN Tql5MsnjTptMO9j8W7eem15pM0+flAwavAX0oC7CTbNBDXKDmXRMMnLZeLzki8Xzev7/tf qubDN0ng4eTyp/nKo33BOIrAYs+5L6k03Y8ZKOX9geazWgJhB2U1XBVFajisRj/rc5uK2w 4Wv7Mm31NVEd5MZGEFtoIUQpahUIVI8ATtrQV1Wbo/xc/uLDD2YZxTef2z1WMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427121; a=rsa-sha256; cv=none; b=ckWAbuwzdDLcKRdL5Lip2ARGfDZ2WNIO9nY5KMH11b8rR2JqBUOJKNOtLFwljRHb58G2wc 1mqqrYMSW2J9ip7sFpBWjEJBQ+6ce/qtYLBf809cmNnbMkcWRKa2XSEkzryXze2LAMQJv6 BRtPzSaGy+l9DrMgY0nf428NxUFTBL3/80rfdMhyyWDhrFXiSInmsFLBuG5qm7K0x/9Gkl u1H97TX+krf7wQkJrzyfO8lblbwQTxTBbEYGLre7YFRDA+Ww0PIY2pGxbxeGtuKRKgPosb uFjDdYuBtftnmViwwGnhivighiZ+3NOW1c4+tOmIXFVQr27sdahFDcqacw3bSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0153zvzXb1; Tue, 18 Nov 2025 00:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q1Vl045231; Tue, 18 Nov 2025 00:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q1L3045228; Tue, 18 Nov 2025 00:52:01 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:01 GMT Message-Id: <202511180052.5AI0q1L3045228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 1619adaf77ad - stable/15 - sound: Remove unnecessary pcm/vchan.h include from pcm/feeder.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1619adaf77ad18056edc6968ef7fbbfef3890d23 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1619adaf77ad18056edc6968ef7fbbfef3890d23 commit 1619adaf77ad18056edc6968ef7fbbfef3890d23 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:51 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Remove unnecessary pcm/vchan.h include from pcm/feeder.c Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53550 (cherry picked from commit 6049209f35c39823f6f9a756953b361d52658812) --- sys/dev/sound/pcm/feeder.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 2e19577bfde3..e94e742b263f 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -36,7 +36,6 @@ #endif #include -#include #include "feeder_if.h" From nobody Tue Nov 18 00:52:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0324fMz6HHF7; Tue, 18 Nov 2025 00:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R026hXhz3xvS; Tue, 18 Nov 2025 00:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFe4r/MjF61xxlRsgtBy1PKtcktvMua/ZW/oxNwDrYw=; b=kVIeAh7jmZpBxap5adUVRJQOrI3I8mxYs0b9TAqnYyzRgXWrQ1Ho+qBwtZscCfkuuiVV8t D2uqaWWE9XRfBZF/1CAnr4/sAJOkopip2xbaY/MRdwGkyAk0pOnJ4J+Tt+fUzoHp9JIRpM CWJOiT6IXKa9Rt63lIv706uINbLehED5m0FWrfroWc/rmvO/cnV6ZdmdjTRJGvQiryp3ng fbIixDSU5fgqjM61CLkBMGH0tJhLf2vKwWF7zB1OhVT5sEARjYozPGmnopwOzb9TCy0yI8 xjAeqoVbQw1kKJ4jGyTfxR+c9hCdWg7XNURkV6vuzPb3/Ug6bMGd1JKvJ6s/tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFe4r/MjF61xxlRsgtBy1PKtcktvMua/ZW/oxNwDrYw=; b=GWt8zLs60ozaMIBMzpPryiJp70n9j+GjJ2nLuXq56ETmqU9AJY2H6zi2lEFNBS+Rf89O/d ZKcauMMb44mh94zqVgJlbTp/Q7lPhngvteIk+PNMUCr++aetPE/qW42yfKhdvl5PJy77Yx tXmV62caNhulwPR+M7/6YTYRyo+kmebNkbIcxPrEC36vcnn/y6fzdZmgpSiuxyOA+gfFgk uTx0nD9/x9YcmTHyWZqinKacYfFqZhJds6cun0d7ofZRZwRyQovXLMdHmCOn0al+ocs1I8 vyzkkZRvfKme3Y4NsOdQQSNf7aD1Zl4TtDNUmwCmj3Se/hMTRwHJplhcqXTl0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427122; a=rsa-sha256; cv=none; b=KtqyA1Mvipp4csM1ez9fRrFn6OacFUHBl28ks+p75FfMfpozZCPCNlLPbItNwlmVSR5O+n AMvDCbyBKUihtnO2pTAQu8kYY23b+NWuXiBYHx5MdvS4pZGrHlln2ASDz6LTN2Hm47Lec+ ptiIlJg+4e7oEvFIjjhblwsY6OzZPHn2nppDv4FJfFSTj/Vse5BkgVYMwA8TsqRGSnR+BR X533Pd5yS/8c7ncyNN5YdCCxrMmRBoPIxVWa968Uux1SW+lulv+wajEk1T3YwFVE/Wq0tX 1mCXITbg7j2ISQibMp3mydPC2ikxOKI3jQHw6TLpK26c3y8Rd61tYP5uXZFKzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R026G7CzXVN; Tue, 18 Nov 2025 00:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q2XY045271; Tue, 18 Nov 2025 00:52:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q2tK045268; Tue, 18 Nov 2025 00:52:02 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:02 GMT Message-Id: <202511180052.5AI0q2tK045268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0a566f2fe96b - stable/15 - sound: Simplify pcm_feederdesc initialization List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0a566f2fe96ba29eec84bc365de65dc4352c2cd1 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0a566f2fe96ba29eec84bc365de65dc4352c2cd1 commit 0a566f2fe96ba29eec84bc365de65dc4352c2cd1 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:01 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Simplify pcm_feederdesc initialization Currently we initialize a pcm_feederdesc array for every feeder, which is then used by FEEDER_DECLARE(). However, there is no reason for this to be an array, as each feeder has only one description. Additionally, since the only thing we define in that array is the feeder type, remove the pcm_feederdesc definitions altogether, and instead pass their type to FEEDER_DECLARE() directly, which will then initialize the pcm_feederdesc. This also simplifies feeder_register(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53551 (cherry picked from commit 7d33c3d651901c97a683689916c810cf4e26a057) --- sys/dev/sound/pcm/feeder.c | 23 +++++++---------------- sys/dev/sound/pcm/feeder.h | 6 +++--- sys/dev/sound/pcm/feeder_eq.c | 7 +------ sys/dev/sound/pcm/feeder_format.c | 7 +------ sys/dev/sound/pcm/feeder_matrix.c | 7 +------ sys/dev/sound/pcm/feeder_mixer.c | 7 +------ sys/dev/sound/pcm/feeder_rate.c | 7 +------ sys/dev/sound/pcm/feeder_volume.c | 7 +------ 8 files changed, 16 insertions(+), 55 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index e94e742b263f..0dddfa84543d 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -70,22 +70,13 @@ feeder_register(void *p) { struct feeder_class *fc = p; struct feedertab_entry *fte; - int i; - KASSERT(fc->desc != NULL, ("feeder '%s' has no descriptor", fc->name)); - - /* - * beyond this point failure is non-fatal but may result in some - * translations being unavailable - */ - i = 0; - while (fc->desc[i].type > 0) { - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); - fte->feederclass = fc; - fte->desc = &fc->desc[i]; - SLIST_INSERT_HEAD(&feedertab, fte, link); - i++; - } + KASSERT(fc->desc.type != 0, ("feeder '%s' has no descriptor", fc->name)); + + fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); + fte->feederclass = fc; + fte->desc = &fc->desc; + SLIST_INSERT_HEAD(&feedertab, fte, link); } static void @@ -442,7 +433,7 @@ static struct feeder_class feeder_root_class = { .name = "feeder_root", .methods = feeder_root_methods, .size = sizeof(struct pcm_feeder), - .desc = NULL, + .desc = { 0 }, .data = NULL, }; /* diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index e417d68fea71..d8760f1c87ab 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -35,7 +35,7 @@ struct pcm_feederdesc { struct feeder_class { KOBJ_CLASS_FIELDS; - struct pcm_feederdesc *desc; + struct pcm_feederdesc desc; void *data; }; @@ -64,12 +64,12 @@ struct pcm_feeder *feeder_find(struct pcm_channel *c, u_int32_t type); void feeder_printchain(struct pcm_feeder *head); int feeder_chain(struct pcm_channel *); -#define FEEDER_DECLARE(feeder, pdata) \ +#define FEEDER_DECLARE(feeder, type, pdata) \ static struct feeder_class feeder ## _class = { \ .name = #feeder, \ .methods = feeder ## _methods, \ .size = sizeof(struct pcm_feeder), \ - .desc = feeder ## _desc, \ + .desc = { type, 0, 0, 0 }, \ .data = pdata, \ }; \ SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \ diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 88a083a3bfd1..05f5a5b82290 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -419,11 +419,6 @@ feed_eq_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (dst - b); } -static struct pcm_feederdesc feeder_eq_desc[] = { - { FEEDER_EQ, 0, 0, 0 }, - { 0, 0, 0, 0 } -}; - static kobj_method_t feeder_eq_methods[] = { KOBJMETHOD(feeder_init, feed_eq_init), KOBJMETHOD(feeder_free, feed_eq_free), @@ -432,7 +427,7 @@ static kobj_method_t feeder_eq_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_eq, NULL); +FEEDER_DECLARE(feeder_eq, FEEDER_EQ, NULL); static int32_t feed_eq_scan_preamp_arg(const char *s) diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index c9679cfeba44..21b54fcafcd7 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -172,11 +172,6 @@ feed_format_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (dst - b); } -static struct pcm_feederdesc feeder_format_desc[] = { - { FEEDER_FORMAT, 0, 0, 0 }, - { 0, 0, 0, 0 } -}; - static kobj_method_t feeder_format_methods[] = { KOBJMETHOD(feeder_init, feed_format_init), KOBJMETHOD(feeder_free, feed_format_free), @@ -185,4 +180,4 @@ static kobj_method_t feeder_format_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_format, NULL); +FEEDER_DECLARE(feeder_format, FEEDER_FORMAT, NULL); diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index a0af32b887ce..69c7e5962268 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -398,11 +398,6 @@ feed_matrix_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (dst - b); } -static struct pcm_feederdesc feeder_matrix_desc[] = { - { FEEDER_MATRIX, 0, 0, 0 }, - { 0, 0, 0, 0 } -}; - static kobj_method_t feeder_matrix_methods[] = { KOBJMETHOD(feeder_init, feed_matrix_init), KOBJMETHOD(feeder_free, feed_matrix_free), @@ -410,7 +405,7 @@ static kobj_method_t feeder_matrix_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_matrix, NULL); +FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX, NULL); /* External */ int diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 028e9366aa8e..3c2a58ba145f 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -358,11 +358,6 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (rcnt); } -static struct pcm_feederdesc feeder_mixer_desc[] = { - { FEEDER_MIXER, 0, 0, 0 }, - { 0, 0, 0, 0 } -}; - static kobj_method_t feeder_mixer_methods[] = { KOBJMETHOD(feeder_init, feed_mixer_init), KOBJMETHOD(feeder_free, feed_mixer_free), @@ -371,4 +366,4 @@ static kobj_method_t feeder_mixer_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_mixer, NULL); +FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER, NULL); diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 166165e95e65..173a0c1fcd39 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1705,11 +1705,6 @@ z_resampler_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (count - left); } -static struct pcm_feederdesc feeder_rate_desc[] = { - { FEEDER_RATE, 0, 0, 0 }, - { 0, 0, 0, 0 }, -}; - static kobj_method_t feeder_rate_methods[] = { KOBJMETHOD(feeder_init, z_resampler_init), KOBJMETHOD(feeder_free, z_resampler_free), @@ -1719,4 +1714,4 @@ static kobj_method_t feeder_rate_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_rate, NULL); +FEEDER_DECLARE(feeder_rate, FEEDER_RATE, NULL); diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 119ab1b288d8..942f1a273edf 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -306,11 +306,6 @@ feed_volume_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, return (dst - b); } -static struct pcm_feederdesc feeder_volume_desc[] = { - { FEEDER_VOLUME, 0, 0, 0 }, - { 0, 0, 0, 0 } -}; - static kobj_method_t feeder_volume_methods[] = { KOBJMETHOD(feeder_init, feed_volume_init), KOBJMETHOD(feeder_free, feed_volume_free), @@ -319,7 +314,7 @@ static kobj_method_t feeder_volume_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_volume, NULL); +FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME, NULL); /* Extern */ From nobody Tue Nov 18 00:52:03 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R04347rz6HHK9; Tue, 18 Nov 2025 00:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R040jfGz3xyB; Tue, 18 Nov 2025 00:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uv/KpQ5vHC4C4SGk3QKtA2pklk2H250UQgCE5YgVVHI=; b=GXTstjFkc822e891IOVeavn66jjPHI3UlB2Apb4CRxzja76hss6uhxpTs18iXzoubIBvgS aJJRzTH0fCYuXkh4naB3ZzfjSS9j7mKD+dbXuGmK59Kcg1PtedBNdP+XpuiuXs/XDP7isl 92f7pVfYnI1g2MlwUH3gCk0SSmK55fbf33wzPowCoRLc2qIA+QkFV3YRmrvmHxvfKDNuSM CIelcMX60SHcHABLFqW1YVxLdta2ZOZVwc3N0n+1MprW5JRv3fHCmxMTdda2fFIVc/d/Um 5pqVonAgJHSR0OLbGgw8HBE1VhzFUBHwCZsjREXoj98YYHVDp39Jq1G3QwOMuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uv/KpQ5vHC4C4SGk3QKtA2pklk2H250UQgCE5YgVVHI=; b=uJ4D6MyMS21D697TsvPM8RAzsYVX7qhC23najXz+/HTwBAkCIU4JeZh2OtO/ILYE1K5cGO Yp8aR64Gj14zorOkserx5L4prygCEzez+84QSOKSIJz+WUZ+6nhM4z+51xTfwJAGHr60eR 99GaJQRYa52RnaxkIfeVfpSx9Vcs7Hu2rwRgMssZAbBwABHC0bG0tnG1FlNF56v92FOvep Sc3HCIIpq44764RBnljdSfXLsPVNZeCVH7czTzE2uUQmczENaMDHEbBlsrF1nl8ZuzKFZP Bg7XRFMSOfcnqEVP3Rcpsv8KC4HbFWluBjDZwQxouoqPxONgFKmWFewKWVVS9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427124; a=rsa-sha256; cv=none; b=NjAx43PsEwOPUPgbOlo0rhfQ1HHbT658MfkGuC8TIQnG6/JuDxUhPnmnaBlslb6DwUBlsS oOBgk2YGm68PLqCqcHZ92F8cuX6DQ8pQT3WLENrKyihLQkjxGgVwN3HdbOJxbv8iUcW9HS Lgw4zD0f/i7KBvI9kFwQc5xKpLkaMr+AEYtsgU3RarM96NLIArjbehXEckbkkIemWMmpIH 4PHDjNBWPudGqB/3KVRkDjl2QJDVlAePqkObeG8pQUUEVDtO7RZZNuGdRSc+SIWbh6xnKP BiYkMj+OqbyqKHMfY0cEVUPyBwDMP/KUOD5V/SC8BC+CSUVpPMRVo8WFz2xPkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0408KWzXdW; Tue, 18 Nov 2025 00:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q3fQ045306; Tue, 18 Nov 2025 00:52:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q3rx045304; Tue, 18 Nov 2025 00:52:03 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:03 GMT Message-Id: <202511180052.5AI0q3rx045304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: c0657096dbf6 - stable/15 - sound: Retire unused pcm_feederdesc->flags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c0657096dbf6fca849d880d0d3fd5e640c145f4b Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c0657096dbf6fca849d880d0d3fd5e640c145f4b commit c0657096dbf6fca849d880d0d3fd5e640c145f4b Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:05 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire unused pcm_feederdesc->flags Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53552 (cherry picked from commit 0e9e222518dc543e34f891c00d2a6a1dd93c3fc2) --- sys/dev/sound/pcm/feeder.c | 4 +--- sys/dev/sound/pcm/feeder.h | 3 +-- sys/dev/sound/pcm/feeder_chain.c | 6 ------ 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 0dddfa84543d..6b7c7f43903c 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -97,8 +97,7 @@ cmpdesc(struct pcm_feederdesc *n, struct pcm_feederdesc *m) { return ((n->type == m->type) && ((n->in == 0) || (n->in == m->in)) && - ((n->out == 0) || (n->out == m->out)) && - (n->flags == m->flags)); + ((n->out == 0) || (n->out == m->out))); } static void @@ -130,7 +129,6 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) f->desc->type = FEEDER_ROOT; f->desc->in = 0; f->desc->out = 0; - f->desc->flags = 0; } err = FEEDER_INIT(f); diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index d8760f1c87ab..86cabb3e9925 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -30,7 +30,6 @@ struct pcm_feederdesc { u_int32_t type; u_int32_t in, out; - u_int32_t flags; }; struct feeder_class { @@ -69,7 +68,7 @@ static struct feeder_class feeder ## _class = { \ .name = #feeder, \ .methods = feeder ## _methods, \ .size = sizeof(struct pcm_feeder), \ - .desc = { type, 0, 0, 0 }, \ + .desc = { type, 0, 0 }, \ .data = pdata, \ }; \ SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \ diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 8b5d50760b32..f5075bf76a49 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -147,7 +147,6 @@ feeder_build_format(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_FORMAT; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -220,7 +219,6 @@ feeder_build_rate(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_RATE; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -298,7 +296,6 @@ feeder_build_matrix(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_MATRIX; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -355,7 +352,6 @@ feeder_build_volume(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_VOLUME; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -423,7 +419,6 @@ feeder_build_eq(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_EQ; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { @@ -503,7 +498,6 @@ feeder_build_mixer(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->type = FEEDER_MIXER; desc->in = 0; desc->out = 0; - desc->flags = 0; fc = feeder_getclass(desc); if (fc == NULL) { From nobody Tue Nov 18 00:52:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R054dGTz6HHKH; Tue, 18 Nov 2025 00:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R051W6pz3xqJ; Tue, 18 Nov 2025 00:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LJlPci3lCQLlyb0wZrDT8bZWR6tr/Nfrxxsz3/Aj6Xo=; b=UdbSJJkQ05hRWrXcs/jiE0sERyQSizZJ/malEgXRwXv0FVlfJWPufcyrGC5ukHVbJn1wMA JjbfqB4vBzY6HZapPBOVaeRFgHzAnno4PmmN+6aDvyfqGIA3mjt1EsfNAQWpeOAEi2huGV mA1I5kKPQsJ5Bk0uBQbzsohYmjt166pFbzMx6corLk1J8PS0HnlIHe/mFalPTf7l0rHvYD HkrMYtYUV1ZNJ2qTK3qqFL4oUeaKPHkBmgoBnZP/19foL/P09/vm7oF9pFoAD5WZfp5fN2 Ol4VRdQOPRgF4CgjOJT4bKkf1L99PPFX0Y5jmc2VbRfnRtkXMPJlwpGaQr+naQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LJlPci3lCQLlyb0wZrDT8bZWR6tr/Nfrxxsz3/Aj6Xo=; b=bXHZ3ABZMkCGoXwCnklURvsm1Tp9KGhsWt6AdZ9SdSa7V5VElFs5+x2VXJ+7qJQi+njSDH Zu9Y670OE9VgFg9ER/1PdlAPnQGhX7NL7kBB8N7Od3p6aXS9WyPOGq6cx93oN6aPG0suHH vYZL2exQMCpPQrNatFrIfQxZ4EgTl62yiw4ftAUxTptPYsVrvlQNga9NqE1+sYJGwwKY8P OjgxhdBzh6VAozxccKsaAE5r//zeEvWDDvC/Wf39T/a3twSrFILGSk3WrXSZBgEKkN2mlx Oi4CW/j2j/k/oE1cSM+4+N1fx4Ue/kboEQDpra9zkbSYma1lECgwXsdVTlwXJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427125; a=rsa-sha256; cv=none; b=faUxj13fpBjh8ONtBWyP4UDmM5tRVYR2UQAdH4g2jllKFj/SMyeokOLP14zCJK4zCnUHQx 8zaIAOHdL4INV4wjRj9FkFwGlh8r5Z4+FDi8VY1ksPJ0VGrp4zqpfsaKqR69UxQWvrF7KR ThswIpibE1fH75fO0gOjq/d1HHZNuJ9IbqpQpC/64bL9ocUf5/v21rosu3lWivYWnGRjfO 2159NpvZ4Zr4E0EAQ14x1FBOHIXq+WQ9HUNdNCZrA1wJ8hjLuQNPZOGC+PJla0u8JBrTkx QR2NVdEl1qbfu3M5dBl0Z5B4FvJyTvhVG4/+6yxg+Q8ff6/ACqxQiztVm9ms1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R050vjgzXhJ; Tue, 18 Nov 2025 00:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q5kQ045340; Tue, 18 Nov 2025 00:52:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q5WF045337; Tue, 18 Nov 2025 00:52:05 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:05 GMT Message-Id: <202511180052.5AI0q5WF045337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 5dd90538ba4d - stable/15 - sound: Simplify feeder_getclass() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5dd90538ba4d13e0fe6633568412dfa11966fa39 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5dd90538ba4d13e0fe6633568412dfa11966fa39 commit 5dd90538ba4d13e0fe6633568412dfa11966fa39 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:09 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Simplify feeder_getclass() With the parameters we provide feeder_getclass(), the only thing we really care about is the feeder's class type. We can simplify (and make the code more readable) that by simply passing the type to feeder_getclass(). Apart from being simpler, we can now also retire feedertab_entry->desc and cmpdesc(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53553 (cherry picked from commit 441a411853e48719d4aa6a36bba0a4c4cbca3a4f) --- sys/dev/sound/pcm/channel.c | 2 +- sys/dev/sound/pcm/feeder.c | 26 +++++++------------------- sys/dev/sound/pcm/feeder.h | 2 +- sys/dev/sound/pcm/feeder_chain.c | 14 +++++++------- 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index fda4cd2314a6..f29a819ce0ae 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1257,7 +1257,7 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, chn_vpc_reset(c, SND_VOL_C_PCM, 1); CHN_UNLOCK(c); - fc = feeder_getclass(NULL); + fc = feeder_getclass(FEEDER_ROOT); if (fc == NULL) { device_printf(d->dev, "%s(): failed to get feeder class\n", __func__); diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 6b7c7f43903c..e818ed4a1a5d 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -44,7 +44,6 @@ static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); struct feedertab_entry { SLIST_ENTRY(feedertab_entry) link; struct feeder_class *feederclass; - struct pcm_feederdesc *desc; }; static SLIST_HEAD(, feedertab_entry) feedertab; @@ -56,12 +55,12 @@ feeder_register_root(void *p) struct feeder_class *fc = p; struct feedertab_entry *fte; - KASSERT(fc->desc == NULL, ("first feeder not root: %s", fc->name)); + KASSERT(fc->desc.type == FEEDER_ROOT, + ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; - fte->desc = NULL; SLIST_INSERT_HEAD(&feedertab, fte, link); } @@ -75,7 +74,6 @@ feeder_register(void *p) fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); fte->feederclass = fc; - fte->desc = &fc->desc; SLIST_INSERT_HEAD(&feedertab, fte, link); } @@ -92,14 +90,6 @@ feeder_unregisterall(void *p) } } -static int -cmpdesc(struct pcm_feederdesc *n, struct pcm_feederdesc *m) -{ - return ((n->type == m->type) && - ((n->in == 0) || (n->in == m->in)) && - ((n->out == 0) || (n->out == m->out))); -} - static void feeder_destroy(struct pcm_feeder *f) { @@ -143,17 +133,15 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) } struct feeder_class * -feeder_getclass(struct pcm_feederdesc *desc) +feeder_getclass(u_int32_t type) { struct feedertab_entry *fte; SLIST_FOREACH(fte, &feedertab, link) { - if ((desc == NULL) && (fte->desc == NULL)) - return fte->feederclass; - if ((fte->desc != NULL) && (desc != NULL) && cmpdesc(desc, fte->desc)) - return fte->feederclass; + if (fte->feederclass->desc.type == type) + return (fte->feederclass); } - return NULL; + return (NULL); } int @@ -431,7 +419,7 @@ static struct feeder_class feeder_root_class = { .name = "feeder_root", .methods = feeder_root_methods, .size = sizeof(struct pcm_feeder), - .desc = { 0 }, + .desc = { FEEDER_ROOT, 0, 0 }, .data = NULL, }; /* diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 86cabb3e9925..e883083f7504 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -49,7 +49,7 @@ struct pcm_feeder { }; void feeder_register(void *p); -struct feeder_class *feeder_getclass(struct pcm_feederdesc *desc); +struct feeder_class *feeder_getclass(u_int32_t type); u_int32_t snd_fmtscore(u_int32_t fmt); u_int32_t snd_fmtbestbit(u_int32_t fmt, u_int32_t *fmts); diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index f5075bf76a49..6d896364e3ca 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -148,7 +148,7 @@ feeder_build_format(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_FORMAT); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_format\n", __func__); @@ -220,7 +220,7 @@ feeder_build_rate(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_RATE); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_rate\n", __func__); @@ -297,7 +297,7 @@ feeder_build_matrix(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_MATRIX); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_matrix\n", __func__); @@ -353,7 +353,7 @@ feeder_build_volume(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_VOLUME); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_volume\n", __func__); @@ -420,7 +420,7 @@ feeder_build_eq(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_EQ); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_eq\n", __func__); @@ -462,7 +462,7 @@ feeder_build_root(struct pcm_channel *c, struct feeder_chain_desc *cdesc) struct feeder_class *fc; int ret; - fc = feeder_getclass(NULL); + fc = feeder_getclass(FEEDER_ROOT); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_root\n", __func__); @@ -499,7 +499,7 @@ feeder_build_mixer(struct pcm_channel *c, struct feeder_chain_desc *cdesc) desc->in = 0; desc->out = 0; - fc = feeder_getclass(desc); + fc = feeder_getclass(FEEDER_MIXER); if (fc == NULL) { device_printf(c->dev, "%s(): can't find feeder_mixer\n", __func__); From nobody Tue Nov 18 00:52:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0666dhz6HH0b; Tue, 18 Nov 2025 00:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R062bQHz3yDh; Tue, 18 Nov 2025 00:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxk6P9CCFJhxTkzwz6wTPUVMRbSdZWqaRij3bLFs/K8=; b=PXtedD/lRewcAP5eDnnW6E0IW6pdlgWrZ6VrE5w7S00TMPVnVYGF1MkPCnkCquhEkotcSF hIvlh/+w+bnpFeREbDdXGu5IBJ4N7BeODVUGqo+JW9NZxV0RP9OY7KcMXiP4+na37jMRij BpGxYG24yjEKQyIKq1Tn1SbyeWAPMnXoUsm2hLg4v0jy10bV9P+CzoRXMezP4uWvwGq7Ot pOtXYKNaj4VfHBTGx3HX01z+mim3+jWwq+a8C0VZzG8LKLFirktDX9QYo4GfhZgZE8UvcB OEKLn5ZmPmowwWSEyEq8mAltooPElKp0jMggz+jBDAwqQVeRLdppnQ3jNEUWuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxk6P9CCFJhxTkzwz6wTPUVMRbSdZWqaRij3bLFs/K8=; b=Zu93qvVXajA4wH2PQmkmVnH848D41THnbEk7EkWvv/fX/6E23qw2NQZcX7n6tqLAhKKwHo Dvjq5kAEFqzr4lX5xnhTVFo96kz+1GwcAc4f14uBqmMfhF0EGSxEAyohxvVeatloaTnSZF n1HxHsMDJuBIhFIng9GynGj7MpJOotdjvNnR4Ku7CWHztARA0B2WCwv9iQaBBoAEV2dwdz rbp4IUfLPAkHC8dqBiJPeFZQ7rh4O8mwM6MWhnPdxQnYpBlA77JDLGzy/7FwXgdlVmzOdf eyce4r4QwPvpAVU6FzBZkfSkrPNrbPCCxFlLMB83GYP0bdQNZhiKgGVBRMaR+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427126; a=rsa-sha256; cv=none; b=JOgUInqTt2wc6ERlUowBtwcXrYpZP2SxU4Q59CDf+FF/29amQNOrn7b4ULQHwCdSKcWRO+ FI7/pvZxtBv4SbjqTFITZhdLpAHwqLIwgo9zHgjor7L6Yi+xsgA5dTwxY7/XvUPrQAK8KI C2kA4qfcBZsCnPLnJhY7YYQOuXEEAlIA3J7ZE1iDuDKqI9mWDfxwTtAEg2WD++Cd+QzIHY syhtteObWtSKBH2TvdjpMI9Dpnt0MatlR8gW++e/YWv8ak3P4SuNPHmJt68tEc9bYHRTPs 5+d+ZBS9YpkeAEGbVlwLY6AO0QOWse5RvOLETs0Yh5XtuWp80xYYR2NyQJIbxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R061mczzXdb; Tue, 18 Nov 2025 00:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q6xD046078; Tue, 18 Nov 2025 00:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q6ZE046075; Tue, 18 Nov 2025 00:52:06 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:06 GMT Message-Id: <202511180052.5AI0q6ZE046075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 2acd16ce68be - stable/15 - sound: Retire feedertab_entry List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2acd16ce68be04755508d63c05d3eb15a5916c6f Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2acd16ce68be04755508d63c05d3eb15a5916c6f commit 2acd16ce68be04755508d63c05d3eb15a5916c6f Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:14 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire feedertab_entry Have an SLIST of feeder_class directly. This way we simplify the code, and also avoid the additional malloc()/free() for each entry. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53554 (cherry picked from commit c24ca02c4c85d0b691a6100fd3006b1f23061858) --- sys/dev/sound/pcm/feeder.c | 37 +++++++++---------------------------- sys/dev/sound/pcm/feeder.h | 1 + 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index e818ed4a1a5d..6f7b225af3b9 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -41,53 +41,34 @@ static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); -struct feedertab_entry { - SLIST_ENTRY(feedertab_entry) link; - struct feeder_class *feederclass; -}; -static SLIST_HEAD(, feedertab_entry) feedertab; - -/*****************************************************************************/ +static SLIST_HEAD(, feeder_class) feedertab; static void feeder_register_root(void *p) { struct feeder_class *fc = p; - struct feedertab_entry *fte; KASSERT(fc->desc.type == FEEDER_ROOT, ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); - fte->feederclass = fc; - SLIST_INSERT_HEAD(&feedertab, fte, link); + SLIST_INSERT_HEAD(&feedertab, fc, link); } void feeder_register(void *p) { struct feeder_class *fc = p; - struct feedertab_entry *fte; KASSERT(fc->desc.type != 0, ("feeder '%s' has no descriptor", fc->name)); - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); - fte->feederclass = fc; - SLIST_INSERT_HEAD(&feedertab, fte, link); + SLIST_INSERT_HEAD(&feedertab, fc, link); } static void -feeder_unregisterall(void *p) +feeder_unregisterall(void *p __unused) { - struct feedertab_entry *fte, *next; - - next = SLIST_FIRST(&feedertab); - while (next != NULL) { - fte = next; - next = SLIST_NEXT(fte, link); - free(fte, M_FEEDER); - } + SLIST_INIT(&feedertab); } static void @@ -135,11 +116,11 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) struct feeder_class * feeder_getclass(u_int32_t type) { - struct feedertab_entry *fte; + struct feeder_class *fc; - SLIST_FOREACH(fte, &feedertab, link) { - if (fte->feederclass->desc.type == type) - return (fte->feederclass); + SLIST_FOREACH(fc, &feedertab, link) { + if (fc->desc.type == type) + return (fc); } return (NULL); } diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index e883083f7504..5ac92bf13735 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -36,6 +36,7 @@ struct feeder_class { KOBJ_CLASS_FIELDS; struct pcm_feederdesc desc; void *data; + SLIST_ENTRY(feeder_class) link; }; struct pcm_feeder { From nobody Tue Nov 18 00:52:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R076M3xz6HHFM; Tue, 18 Nov 2025 00:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R073BZdz3y83; Tue, 18 Nov 2025 00:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7OP/LtYnMwL8TWE3OFAiHfv4XRHzdPtDyi1o7UIojgo=; b=APVGCOrjaf1Lbt1sZ9XRKp785hiDoBlpPc38pr1y1+tKtIfNgD1XhrNu5T/daPFDixm7Lq 2keCk87mow+KCvDfhdDKTS6hr+lv9w8W6bptTQb7VWjBoPTJyJkgigiAUEV3grPRG32pRq dzzX/XkgXxNEN/ujhOU30/vM214bg2cLdfVWrPzgoQh74A2Us1fmKyyUPaWGoEGlaSBdyC tYE8N2JsAkiP4KTKmk4fVdWpPlLy1nkkQ6vLsr55lOOGjFS/k7usGnNPkXRsqQ48xKoeNx 0dtGJ2W7jt/PC+WPJEGH9DBISuuRiJGKAtSiubiBV6NhvysGH4mGTQhoekJyQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7OP/LtYnMwL8TWE3OFAiHfv4XRHzdPtDyi1o7UIojgo=; b=hhXlft2mnyc+Qq+MH1oi+KoBh4UOHVwx02xPwFCM0O7o9DGnrXqKsjztzUkb9MUrBEl6qH EZYuWMrCrBgeRLa3pafQSffc4om0C3eqoYlvlajUsmGdWoPR/al9MglabGuPBdCrMOfadK g0O3N/7ldoorlwPS0zrBRMal7k25RSDmKutY+gFt42ImrRH6iTyOfSCa9WBuHG754ho2Wi I1zIuz7d6iflpISsW9W5EdtR+JyBccwNyPZyJ/XX2XGiYi1/OnZwMMeo402Ag6eFyX06ao /Oj7IcT3jULQwpfxOYIPzPSykP9BI9bx0RKET4Xc78h3VGTM9oyrcu22/JSl9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427127; a=rsa-sha256; cv=none; b=byooFRocvXDQJyZAXDdsh6u3rvH0xpsTetEufI6VsMB0BANKozySiTg+IODONXjnRowK4C GQSMLHDhtvdh6bGJ/H7jiedRKUTwXWvEhs+G2cWDMaLZKvCv7/UQXIJJvNExVRrgOl57w7 BkD8x0N0A7CcgFikc2/edihBTlOoAV1RJQU/iD61AKe/586xqVsvOs8iW7UFRoKUJuFRZj JbCVZ1S1x41fJEPGOGMhPq2jTXKBNkOaU+5P1teetm+0eq+e/M4jDu3PbuNq4+nqkm4W2b UAxmvDlDNIyATdaLtIr/3hhw6JnMAwVE7VvqZqrsyxQIO5TclTwQXM2Hd+7Fqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R072k5SzYMR; Tue, 18 Nov 2025 00:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q7SA046710; Tue, 18 Nov 2025 00:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q7Of046707; Tue, 18 Nov 2025 00:52:07 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:07 GMT Message-Id: <202511180052.5AI0q7Of046707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 3305f6e6317c - stable/15 - sound: Retire feeder_class->data List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3305f6e6317c3480804b8ddda83fa882efe6b745 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3305f6e6317c3480804b8ddda83fa882efe6b745 commit 3305f6e6317c3480804b8ddda83fa882efe6b745 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:18 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire feeder_class->data It's always NULL. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53555 (cherry picked from commit 762f8e6f515a33274503872cf597e0895ff706bc) --- sys/dev/sound/pcm/feeder.c | 3 +-- sys/dev/sound/pcm/feeder.h | 4 +--- sys/dev/sound/pcm/feeder_eq.c | 2 +- sys/dev/sound/pcm/feeder_format.c | 2 +- sys/dev/sound/pcm/feeder_matrix.c | 2 +- sys/dev/sound/pcm/feeder_mixer.c | 2 +- sys/dev/sound/pcm/feeder_rate.c | 2 +- sys/dev/sound/pcm/feeder_volume.c | 2 +- 8 files changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 6f7b225af3b9..f55c3e5992e1 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -88,7 +88,7 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) if (f == NULL) return NULL; - f->data = fc->data; + f->data = NULL; f->source = NULL; f->parent = NULL; f->class = fc; @@ -401,7 +401,6 @@ static struct feeder_class feeder_root_class = { .methods = feeder_root_methods, .size = sizeof(struct pcm_feeder), .desc = { FEEDER_ROOT, 0, 0 }, - .data = NULL, }; /* * Register the root feeder first so that pcm_addchan() and subsequent diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 5ac92bf13735..f89652ab9635 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -35,7 +35,6 @@ struct pcm_feederdesc { struct feeder_class { KOBJ_CLASS_FIELDS; struct pcm_feederdesc desc; - void *data; SLIST_ENTRY(feeder_class) link; }; @@ -64,13 +63,12 @@ struct pcm_feeder *feeder_find(struct pcm_channel *c, u_int32_t type); void feeder_printchain(struct pcm_feeder *head); int feeder_chain(struct pcm_channel *); -#define FEEDER_DECLARE(feeder, type, pdata) \ +#define FEEDER_DECLARE(feeder, type) \ static struct feeder_class feeder ## _class = { \ .name = #feeder, \ .methods = feeder ## _methods, \ .size = sizeof(struct pcm_feeder), \ .desc = { type, 0, 0 }, \ - .data = pdata, \ }; \ SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \ &feeder ## _class) diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 05f5a5b82290..3838328fb0bb 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -427,7 +427,7 @@ static kobj_method_t feeder_eq_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_eq, FEEDER_EQ, NULL); +FEEDER_DECLARE(feeder_eq, FEEDER_EQ); static int32_t feed_eq_scan_preamp_arg(const char *s) diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 21b54fcafcd7..d2c4d7618ab4 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -180,4 +180,4 @@ static kobj_method_t feeder_format_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_format, FEEDER_FORMAT, NULL); +FEEDER_DECLARE(feeder_format, FEEDER_FORMAT); diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 69c7e5962268..7319b10930de 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -405,7 +405,7 @@ static kobj_method_t feeder_matrix_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX, NULL); +FEEDER_DECLARE(feeder_matrix, FEEDER_MATRIX); /* External */ int diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 3c2a58ba145f..10de42ba727a 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -366,4 +366,4 @@ static kobj_method_t feeder_mixer_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER, NULL); +FEEDER_DECLARE(feeder_mixer, FEEDER_MIXER); diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 173a0c1fcd39..c2c232a97177 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -1714,4 +1714,4 @@ static kobj_method_t feeder_rate_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_rate, FEEDER_RATE, NULL); +FEEDER_DECLARE(feeder_rate, FEEDER_RATE); diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 942f1a273edf..a45003849034 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -314,7 +314,7 @@ static kobj_method_t feeder_volume_methods[] = { KOBJMETHOD_END }; -FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME, NULL); +FEEDER_DECLARE(feeder_volume, FEEDER_VOLUME); /* Extern */ From nobody Tue Nov 18 00:52:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R086C5cz6HH99; Tue, 18 Nov 2025 00:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0844PZz3yHV; Tue, 18 Nov 2025 00:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9VEzjh6lgcDZe65nkoEbb8LarN/SLoU075cWs6cIyfk=; b=Cu47wPRogP2pL5CNxUBrLO0hJCI/k9VYmnweBwyOwXnv4iJFeBrpQljeScxNF3QX7niZ3e ziKjrs7gzQ0v1Rbg44/jMHVHTz4H1VbpIZAQJuKBSQ4lX0ongDzkMTnZqtWMQep3I4f/8+ d8VvnRWGLplMnrFByl+t9dmIOa7dOOCSfwqNrHFktaT6/ZoWUldatBRXpxwy5DnUfDoF8p kGi9rw9JfwYwJW7XlkEiPPMldckUoPRwyCki9ygkx/0UF0+vPbvEnksGsbR+zbvgcL9Yi3 sZIWXabG1e2ZOufwNhxNi/zjLQYIHeiQlf/orm7t77LlcnbERuEzhqsmrRg8lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9VEzjh6lgcDZe65nkoEbb8LarN/SLoU075cWs6cIyfk=; b=vrGXSq8IqbacDEqmxu3XzjN/NoWETaN5U72ERtuHtGcpYWcmkPfg6uqjRD1P/D2SNna/XA K3XEOWNdMWnRcgZliGkEZLsFYG7X//5qePw3MIDpqr93zWBFKG9jP1YhDx7IC9DQeEcbgu fJ82tDiG41ptYhc3/WBl4+vG5LEy1IIYM9H2St7r3KrHlr72L/XWTbE82PY/o0KhHte36t bL0ltZ3CJjXae271d4gz+c7CzxgUcfIij+YuGQdQWlMbijlOyv5jhTCBO/3VoG9NDBilc1 TbaZPm5Mn2jxgFapHEGZK9DqX4jtu0gXh0YQ2T37kCx7FrZn5XmYh84EcEl6yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427128; a=rsa-sha256; cv=none; b=aRLQ5KpoqTg80ltIRKbx8FF9m/r/AvzzBQjAYDs4SLwQmtuqFTir0cVZKvLaCno3yIF3tX oLMrIPuU5YAVXSyaanR7HyffEZmZI/r61zamZKhUq6qUr90RCKcG98srCL0AhcboXvF1F5 II42/9fi/sN9aas7v7Idk3H4qGL+oWw0p7sh1Pv7YVnPyA5sgeYYdr0CsjnHeUockLM+Sj +viS6KseNANQO1HBsvL6adyMUQV1XZocbu7hR6mTOhz9a1QgZDymYInsZj9Xy68103WlMN j/2LMxHyT6SrzicvQQHmuLQLW4oCk42yZt9kQ8+3qq378bPK8SdLl+9+7fTWhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R083fQkzY7v; Tue, 18 Nov 2025 00:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q8DP046747; Tue, 18 Nov 2025 00:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q8KH046744; Tue, 18 Nov 2025 00:52:08 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:08 GMT Message-Id: <202511180052.5AI0q8KH046744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ae3cd550d257 - stable/15 - sound: Retire feeder_class->desc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ae3cd550d257e38ea21dee0915677f0c6aafbb3e Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ae3cd550d257e38ea21dee0915677f0c6aafbb3e commit ae3cd550d257e38ea21dee0915677f0c6aafbb3e Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:24 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire feeder_class->desc The only field we care about is pcm_feederdesc->type, so keep that one only and do not embed the whole pcm_feederdesc. While here, make the feeder type enum into a named one and use it as feeder_class->type's type. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53556 (cherry picked from commit 91fcc0132d0b192f07f9b67626c9af2ad8759857) --- sys/dev/sound/pcm/feeder.c | 8 ++++---- sys/dev/sound/pcm/feeder.h | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index f55c3e5992e1..acc9e374e718 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -48,7 +48,7 @@ feeder_register_root(void *p) { struct feeder_class *fc = p; - KASSERT(fc->desc.type == FEEDER_ROOT, + KASSERT(fc->type == FEEDER_ROOT, ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); @@ -60,7 +60,7 @@ feeder_register(void *p) { struct feeder_class *fc = p; - KASSERT(fc->desc.type != 0, ("feeder '%s' has no descriptor", fc->name)); + KASSERT(fc->type != 0, ("feeder '%s' has no descriptor", fc->name)); SLIST_INSERT_HEAD(&feedertab, fc, link); } @@ -119,7 +119,7 @@ feeder_getclass(u_int32_t type) struct feeder_class *fc; SLIST_FOREACH(fc, &feedertab, link) { - if (fc->desc.type == type) + if (fc->type == type) return (fc); } return (NULL); @@ -400,7 +400,7 @@ static struct feeder_class feeder_root_class = { .name = "feeder_root", .methods = feeder_root_methods, .size = sizeof(struct pcm_feeder), - .desc = { FEEDER_ROOT, 0, 0 }, + .type = FEEDER_ROOT, }; /* * Register the root feeder first so that pcm_addchan() and subsequent diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index f89652ab9635..171168d66e4e 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -27,6 +27,17 @@ * SUCH DAMAGE. */ +enum feeder_type { + FEEDER_ROOT, + FEEDER_FORMAT, + FEEDER_MIXER, + FEEDER_RATE, + FEEDER_EQ, + FEEDER_VOLUME, + FEEDER_MATRIX, + FEEDER_LAST, +}; + struct pcm_feederdesc { u_int32_t type; u_int32_t in, out; @@ -34,7 +45,7 @@ struct pcm_feederdesc { struct feeder_class { KOBJ_CLASS_FIELDS; - struct pcm_feederdesc desc; + enum feeder_type type; SLIST_ENTRY(feeder_class) link; }; @@ -63,27 +74,16 @@ struct pcm_feeder *feeder_find(struct pcm_channel *c, u_int32_t type); void feeder_printchain(struct pcm_feeder *head); int feeder_chain(struct pcm_channel *); -#define FEEDER_DECLARE(feeder, type) \ +#define FEEDER_DECLARE(feeder, ctype) \ static struct feeder_class feeder ## _class = { \ .name = #feeder, \ .methods = feeder ## _methods, \ .size = sizeof(struct pcm_feeder), \ - .desc = { type, 0, 0 }, \ + .type = ctype, \ }; \ SYSINIT(feeder, SI_SUB_DRIVERS, SI_ORDER_ANY, feeder_register, \ &feeder ## _class) -enum { - FEEDER_ROOT, - FEEDER_FORMAT, - FEEDER_MIXER, - FEEDER_RATE, - FEEDER_EQ, - FEEDER_VOLUME, - FEEDER_MATRIX, - FEEDER_LAST, -}; - /* feeder_format */ enum { FEEDFORMAT_CHANNELS From nobody Tue Nov 18 00:52:09 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0B0jQKz6HH0k; Tue, 18 Nov 2025 00:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0955DZz3y68; Tue, 18 Nov 2025 00:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0x1tZUbSlfrlu+WbMhuf72oWKpkKlvwN08jSzmXcg8=; b=VgUfYtMQ4wSzk4JfoB6kqzpL/vmuXfLGiOwZAKjhD9wStsx0sC0H2InTBQncFMuPV8zv2p ONBvehP4Z7KnhQs8YpBChdeWGZ2zsMeSZMVJmnJqDmIRrfXL9f4c+ztHBpLIF1Z7Px0I33 r0US/sqP/YpuvyZXOUhVc9hj+s2p90ru+JiNBsNb0wCrrdP0YsEMr9lSWeRU2IvydrLBdX DhlB1+34goRUG/MVPRC6zRiU4PSKuPig8vFsVcajqGHSmEg7ooj3JEai9rO7bmUu6IZ4kM JPMETFLp0fuM4MOccyvaJAYuDjPvgbDonsviiTlvLxBa8i2vb50zhT2V4Uq7qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0x1tZUbSlfrlu+WbMhuf72oWKpkKlvwN08jSzmXcg8=; b=ozgvuOaRKxmV6ZT+q2wEROzY2HLTkTvcZrWWwMuXVV+A1/3RIIUX1RPZbYA1qRz4NmG6pg kRPrv3j/1E927T8g6VGvtR1/x+NBWRJdPLW8XUkXUrV/mXasumqOfIE6J3nu0pVkRcldGg O0y1/xnDtJKmviG7vsrbvaWcrM2BMAAD73WRZtT2h0V4JoVzROKFJC/ikGnV1gBWzIRqJz zfR/4/tpsA3La6H79Fm/2B1uHSLNfd8XDELFenjShCMgbRmjJ3sfkow0Sm/Jm+HlHyYFoH PuW5PDrGzoR5wR603pHhHWQVpfnfy494wNpp1KnSsGVJX0l944Hws/ZPfHqdaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427129; a=rsa-sha256; cv=none; b=izvZy1kT+bBcKB2bDjNyiwRg+cdN9trgehgQB5ysCXNnFh6sP2FleQTmR67C9R5k5EIGwP pb4pfKO3sFd6upXbPPtPb/53bCO3sd07HYfwu9aFnRCTbLjOohYLDh4c+D8GMkEpHMhvH9 +Y99FxohSSz9BwK+b3E9ApIMizBD48PTxr1GbSkVJT/H4oC2I+6dzZNojGC0GLLGV2JCS9 37Z8ImMRxCjbGfgk6GQR1HFtoxVmJuJLs9QJ3ox6UqsGVXBIFeP5FuMG3GNyqr6Gw+CRlK VFLqc8QauwQnjkqiMlMR67Cje4osgMh0eLJEfy2eXUKDbZDT9BiDUMq5QNw/IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R094bbNzXb5; Tue, 18 Nov 2025 00:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q9iJ046781; Tue, 18 Nov 2025 00:52:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q94s046778; Tue, 18 Nov 2025 00:52:09 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:09 GMT Message-Id: <202511180052.5AI0q94s046778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: f709b2b59d44 - stable/15 - sound: Retire pcm_feederdesc->type List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f709b2b59d446b4eacb9d3221a49c5a2bbb75211 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f709b2b59d446b4eacb9d3221a49c5a2bbb75211 commit f709b2b59d446b4eacb9d3221a49c5a2bbb75211 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:28 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire pcm_feederdesc->type This is always accessed from pcm_feeder->desc->type. Instead of duplicating this field, we can remove it from pcm_feederdesc, and access it through pcm_feeder->class->type. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53557 (cherry picked from commit 92dcd20222a2674ba31ae09865da19d948992994) --- sys/dev/sound/pcm/feeder.c | 4 ++-- sys/dev/sound/pcm/feeder.h | 1 - sys/dev/sound/pcm/feeder_chain.c | 6 ------ sys/dev/sound/pcm/feeder_matrix.c | 2 +- sys/dev/sound/pcm/feeder_volume.c | 2 +- sys/dev/sound/pcm/sndstat.c | 12 ++++++------ 6 files changed, 10 insertions(+), 17 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index acc9e374e718..874148cd9ab0 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -97,7 +97,7 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) if (desc) { *(f->desc) = *desc; } else { - f->desc->type = FEEDER_ROOT; + f->class->type = FEEDER_ROOT; f->desc->in = 0; f->desc->out = 0; } @@ -162,7 +162,7 @@ feeder_find(struct pcm_channel *c, u_int32_t type) f = c->feeder; while (f != NULL) { - if (f->desc->type == type) + if (f->class->type == type) return f; f = f->source; } diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index 171168d66e4e..d191edd201e9 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -39,7 +39,6 @@ enum feeder_type { }; struct pcm_feederdesc { - u_int32_t type; u_int32_t in, out; }; diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 6d896364e3ca..32dd4ca14faf 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -144,7 +144,6 @@ feeder_build_format(struct pcm_channel *c, struct feeder_chain_desc *cdesc) int ret; desc = &(cdesc->desc); - desc->type = FEEDER_FORMAT; desc->in = 0; desc->out = 0; @@ -216,7 +215,6 @@ feeder_build_rate(struct pcm_channel *c, struct feeder_chain_desc *cdesc) return (ret); desc = &(cdesc->desc); - desc->type = FEEDER_RATE; desc->in = 0; desc->out = 0; @@ -293,7 +291,6 @@ feeder_build_matrix(struct pcm_channel *c, struct feeder_chain_desc *cdesc) return (ret); desc = &(cdesc->desc); - desc->type = FEEDER_MATRIX; desc->in = 0; desc->out = 0; @@ -349,7 +346,6 @@ feeder_build_volume(struct pcm_channel *c, struct feeder_chain_desc *cdesc) return (ret); desc = &(cdesc->desc); - desc->type = FEEDER_VOLUME; desc->in = 0; desc->out = 0; @@ -416,7 +412,6 @@ feeder_build_eq(struct pcm_channel *c, struct feeder_chain_desc *cdesc) return (ret); desc = &(cdesc->desc); - desc->type = FEEDER_EQ; desc->in = 0; desc->out = 0; @@ -495,7 +490,6 @@ feeder_build_mixer(struct pcm_channel *c, struct feeder_chain_desc *cdesc) int ret; desc = &(cdesc->desc); - desc->type = FEEDER_MIXER; desc->in = 0; desc->out = 0; diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 7319b10930de..2c7a3e04690d 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -413,7 +413,7 @@ feeder_matrix_setup(struct pcm_feeder *f, struct pcmchan_matrix *m_in, struct pcmchan_matrix *m_out) { - if (f == NULL || f->desc == NULL || f->desc->type != FEEDER_MATRIX || + if (f == NULL || f->desc == NULL || f->class->type != FEEDER_MATRIX || f->data == NULL) return (EINVAL); diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index a45003849034..101cc7ba003b 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -332,7 +332,7 @@ feeder_volume_apply_matrix(struct pcm_feeder *f, struct pcmchan_matrix *m) struct feed_volume_info *info; uint32_t i; - if (f == NULL || f->desc == NULL || f->desc->type != FEEDER_VOLUME || + if (f == NULL || f->desc == NULL || f->class->type != FEEDER_VOLUME || f->data == NULL || m == NULL || m->channels < SND_CHN_MIN || m->channels > SND_CHN_MAX) return (EINVAL); diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index b5e52aa13a19..a7c53ac85eb8 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -533,12 +533,12 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) f = f->source; while (f != NULL) { sbuf_printf(&sb, "%s", f->class->name); - if (f->desc->type == FEEDER_FORMAT) { + if (f->class->type == FEEDER_FORMAT) { snd_afmt2str(f->desc->in, buf, sizeof(buf)); sbuf_printf(&sb, "(%s -> ", buf); snd_afmt2str(f->desc->out, buf, sizeof(buf)); sbuf_printf(&sb, "%s)", buf); - } else if (f->desc->type == FEEDER_MATRIX) { + } else if (f->class->type == FEEDER_MATRIX) { sbuf_printf(&sb, "(%d.%dch -> %d.%dch)", AFMT_CHANNEL(f->desc->in) - AFMT_EXTCHANNEL(f->desc->in), @@ -546,7 +546,7 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) AFMT_CHANNEL(f->desc->out) - AFMT_EXTCHANNEL(f->desc->out), AFMT_EXTCHANNEL(f->desc->out)); - } else if (f->desc->type == FEEDER_RATE) { + } else if (f->class->type == FEEDER_RATE) { sbuf_printf(&sb, "(%d -> %d)", FEEDER_GET(f, FEEDRATE_SRC), FEEDER_GET(f, FEEDRATE_DST)); @@ -1328,10 +1328,10 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) f = f->source; while (f != NULL) { sbuf_printf(s, "%s", f->class->name); - if (f->desc->type == FEEDER_FORMAT) { + if (f->class->type == FEEDER_FORMAT) { sbuf_printf(s, "(0x%08x -> 0x%08x)", f->desc->in, f->desc->out); - } else if (f->desc->type == FEEDER_MATRIX) { + } else if (f->class->type == FEEDER_MATRIX) { sbuf_printf(s, "(%d.%d -> %d.%d)", AFMT_CHANNEL(f->desc->in) - AFMT_EXTCHANNEL(f->desc->in), @@ -1339,7 +1339,7 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) AFMT_CHANNEL(f->desc->out) - AFMT_EXTCHANNEL(f->desc->out), AFMT_EXTCHANNEL(f->desc->out)); - } else if (f->desc->type == FEEDER_RATE) { + } else if (f->class->type == FEEDER_RATE) { sbuf_printf(s, "(0x%08x q:%d %d -> %d)", f->desc->out, From nobody Tue Nov 18 00:52:10 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0C00r6z6HH0l; Tue, 18 Nov 2025 00:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0B5qJqz3yj0; Tue, 18 Nov 2025 00:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=140Pp7kS0bmz0YO2dhWwrdAR09JQ8QxigaE7raFgSR8=; b=jCb2AwB06R+L51tvTSenrEJNESIrv3ZQfCEhb4trRgYedWO+rESIfK/F/Eo4tj6u3jP9X1 xqnm6ss72+B2qte8m+jC6Aajhhs8QtyR5LLKT47u5Jvo/1pjIQ370wnCJmUtt/yj0tAQII dLNNFu4QfIXz0c1cas82CaO6BAk4JH38UoGrIDhazJWN/JYtmLrqpLksTXKEfO0nWUcsv5 I9umhRLMcNbXo9lW7GYWMPQ7Eh44N3/5P6wDx5OKSbAYyuXhxTtwzCoctByb8hpjEo/SxA lN71IPny6TY0ZHisHjgQXVFLpvs4yfD2TJGmNZCY6KVrVF8lweEIariN3IyOWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=140Pp7kS0bmz0YO2dhWwrdAR09JQ8QxigaE7raFgSR8=; b=GtX/DVxMlmKbuV0DJ4hG6GCpPEI6VkYSOafoghyPhw8d47zwf7WyRxm04O0+60CKqswC/+ 6VxwRa1hHITsGD9Y4B88vWW4jZ00MSa4tLMsTk7iuqYg4DD8oseFy7Y9aSZad0/Cs72ddC WL0YSYY4hqe0RHaLbP4Wi6NrFm6wYjD3A9ovzc8tDkKusR3bjtzI1++35Nx8xP1gcw6bHa qji1mTlHRfoZV2oRXgKpGBmAfUMNKwrSNusL+8h8q1YsSoedev2nQHvpDXMAZk9CLg9PwK xVXEtTrL0coWxDWXmnTpdnx+tXeh+XJ0kop4esG3q6uNmbtY3k5exKCrD75ZtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427130; a=rsa-sha256; cv=none; b=yEgK6vRR4Kse9zx0GSEosmXjLuUbo6JFZuO23bcwDB822i+nP5OmHKopjL29YHVqbmnFA8 7OHtPc7soZpSGfgvBXKeP62EmX5tFeBZTUGquZY2W9u/0aF6xW/RQze+oLflYKDRKnsvED 57G0X4x/jrzvJegMEv57KHCfv5XxgVfuh7ili0nzvb2JiBtRMwpfqpXX4Q/3W7WkqIePLQ PeW2uJclRmkeQvVXl7G1Px9NjTi9JZz4lFVyiXcsT5RqAmJ3hsxBQFD5Bjjhm+2vUgRqs+ shtr2najBjSRSoZJnnjhgH4lt7Vts9e5AY6IEE6iYKda2Q4rDnZnHfLoHCpAWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0B5R6DzY9V; Tue, 18 Nov 2025 00:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qAqU046815; Tue, 18 Nov 2025 00:52:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qAOm046812; Tue, 18 Nov 2025 00:52:10 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:10 GMT Message-Id: <202511180052.5AI0qAOm046812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ad348a08586f - stable/15 - sound: Remove unnecessary initializations in feeder_create() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ad348a08586f9244a363a7cb9098a395c772e448 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ad348a08586f9244a363a7cb9098a395c772e448 commit ad348a08586f9244a363a7cb9098a395c772e448 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:32 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 sound: Remove unnecessary initializations in feeder_create() We do not need to zero out fields since the struct is allocated with M_ZERO. Also we no longer need to have a special case for the root feeder. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53558 (cherry picked from commit 699fd108c50ccbd576476a2c95fa03e16492f2f9) --- sys/dev/sound/pcm/feeder.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 874148cd9ab0..75c0f0405040 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -88,19 +88,10 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) if (f == NULL) return NULL; - f->data = NULL; - f->source = NULL; - f->parent = NULL; f->class = fc; f->desc = &(f->desc_static); - - if (desc) { + if (desc != NULL) *(f->desc) = *desc; - } else { - f->class->type = FEEDER_ROOT; - f->desc->in = 0; - f->desc->out = 0; - } err = FEEDER_INIT(f); if (err) { From nobody Tue Nov 18 00:52:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0D0v45z6HHKS; Tue, 18 Nov 2025 00:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0C6KvJz3yf7; Tue, 18 Nov 2025 00:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTcHitxkzWL9I5UA51radnBOKBROAzHxNyWfIs5GXlo=; b=kkVI4mw4Tm3fsKMiRcueFFjl/sctBRAVzAVPP7KkYB67fkvZYkqU0CbwU3gMqoMA5SRUzw hUsUaRYIRizvk9kcpt0E3wjkzA6suPRmstsqEPkwXFmOGZvtr1FEp7z6cIf5JmOJtRvB20 twR8seDfybhoC3MmSD/vchLJnq3clMwr8bZF77vrTAqb1abssVI5XRBneO+qyEByKffwgO h4b/RgT467oKjyo82gFA2gl19urdl/H/gDuGATBD75zMD2TIUejrRa+mZ+FOmLNTzGgPPE XYuKHxq3bSF5RhN9PDyOHXfqqRc+u3EvV7iNc/+Jdl6nBV2yydywefzzNFV8DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTcHitxkzWL9I5UA51radnBOKBROAzHxNyWfIs5GXlo=; b=iCEMOU//GFmm1IKnGOX5ZySg/UctgwTQsTvAxKxGyGoh/bWKzWoEtsj1yAAFSQvXowoma+ mVJ9LWdBM38imOC62LKJHxQP+/Md6JoC5rBpgQ4HSvyeJuxzPC1C+AtHFXIsf306sCQsG6 56tA39vYGNdxtvG2ywOposSyH9rlSxkEOjeuAS2f3sFhJ+ZIRRY3XBI+i4Mnwrxvayep4s RVxJ8bkNyzMPmotyATR/iGBX+Y3km1vMMlkwIrWHZ4177f5cSUYQESwJ7kxZ/F7+m9JHIt QJMoNOaOuRGwF8rm5d63FggALE3x8jFosOoA0cv3eibDm7FnjOng0Cnb2WqM6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427131; a=rsa-sha256; cv=none; b=FFAfokZ2SrloKuODoTp/1PJTIAYovinWieAWC4FryyT4USESSfcY/biZAdlqDGnbY9cC5w hliuOPJTVp49Vt/9YmRTxwEDGqQhac+Ei/WnQkCAuJ80V4b2VhUm+cAzGCIawafsXq6pCU mXmjyUbe+EIom/V10PuZBFfrUYyL/bguru6iEAwkARuqo2SBZwFnS5EFo/Rs45EZ03RsIV 9caCxSv0h0DvrWlPC1wS8dKJ0Pz66fqcVPVPZvQ+uZMdaGZxFYZUIlILlX2MLPGW0EV6OT B6A5xu6aYNbP8yGvf1uxrouanxKjHJ4JzjF08r+8jexfne0+IIE/Hd3LkmMmHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0C5wZ8zY7x; Tue, 18 Nov 2025 00:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qBp7046847; Tue, 18 Nov 2025 00:52:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qBsN046844; Tue, 18 Nov 2025 00:52:11 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:11 GMT Message-Id: <202511180052.5AI0qBsN046844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d1a627f39a33 - stable/15 - sound: Retire unused feeder_printchain() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d1a627f39a33afb82de95fa24b027e8b3a5b93fe Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d1a627f39a33afb82de95fa24b027e8b3a5b93fe commit d1a627f39a33afb82de95fa24b027e8b3a5b93fe Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:37 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 sound: Retire unused feeder_printchain() We can print it with "sndctl feederchain". Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53559 (cherry picked from commit f4819a1b6c441f804d66d710678bf5558ee29eee) --- sys/dev/sound/pcm/feeder.c | 16 ---------------- sys/dev/sound/pcm/feeder.h | 1 - 2 files changed, 17 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 75c0f0405040..e2d05f307f4d 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -318,22 +318,6 @@ snd_fmtbest(u_int32_t fmt, u_int32_t *fmts) return best2; } -void -feeder_printchain(struct pcm_feeder *head) -{ - struct pcm_feeder *f; - - printf("feeder chain (head @%p)\n", head); - f = head; - while (f != NULL) { - printf("%s @ %p\n", f->class->name, f); - f = f->source; - } - printf("[end]\n\n"); -} - -/*****************************************************************************/ - static int feed_root(struct pcm_feeder *feeder, struct pcm_channel *ch, u_int8_t *buffer, u_int32_t count, void *source) { diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index d191edd201e9..f1c96d86fda0 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -70,7 +70,6 @@ int feeder_add(struct pcm_channel *c, struct feeder_class *fc, struct pcm_feederdesc *desc); void feeder_remove(struct pcm_channel *c); struct pcm_feeder *feeder_find(struct pcm_channel *c, u_int32_t type); -void feeder_printchain(struct pcm_feeder *head); int feeder_chain(struct pcm_channel *); #define FEEDER_DECLARE(feeder, ctype) \ From nobody Tue Nov 18 00:52:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0F3wyrz6HH9J; Tue, 18 Nov 2025 00:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0F0jkZz3yfh; Tue, 18 Nov 2025 00:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nm11j/KfSEwfWkvKTIttU8Y4IHSCAJFOzh4bykeKOg=; b=iDjoJKtH73G7dd3x8eE9bXrtX2iEDI3xLE/Xh488Tov9iQPyhzZ3gTn6B6Tmus2dLna8YU Xlyro9cd4omnHoV9l4OcZaM/UrNpIL4ZZU5Ie2fM0JpoSM+nZgNeoBkkmN81/mj2jJxHUq Ly6nWc8LJLZdsUFRhQAMmjJzQmW3uRQ6AXG8bjaWzK2pkIhyht4K2cG4A6mdx2gSxCVQcO eDpIhV7j5rrGO9ytcPPbFbT5QBPLBGXOZfSgW58EAsLuI/wffvdfZfnh9XIMpKdgPTT3La zQLp8/koaIZ+KaR1fBtNVHObhO1U2d345WeV51qAAnzdVkcdAkP248ETYv5jwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nm11j/KfSEwfWkvKTIttU8Y4IHSCAJFOzh4bykeKOg=; b=ZoUoFKupwn+9EMtY7B3D+iZs9Yz7mACQ3j9sJg5odFRelNALIi7TuN5iQcgwhYRMx03jC9 sEIIk6WcsmMsh8SVEiaUzZvBMEMRhpbpVj2VYBW355qjAmAFog3mOdwTwFbsJRxx78Au40 h3Wjfr+EQXHXjdvmSVVUNV3W6USiSqs2fgqhRvtOtSs3HxCxISQkQvOEh1oZ1e0YsNPTrG VxOpN2NMo93hnUjmE+hlTqlZnQJov46z5VQhDSaPCd1uxAJ4ldztq91K3kstojEQFWo5mY LrciCUIPv1vfHuaTLoRF2btkLAMDNJNKrpfRtnHupJDabnhPlpmkdCYXJtocaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427133; a=rsa-sha256; cv=none; b=N7rC05eEa4MOPKYzdx7Kyyu2MAzEEAsx9Zg9+eJndnc0u2H3SiAZj76MvndJfm3vldz0nL qI9WLiqdS5d5T6hNTQc6+QXZdScuC4TjBlX0heyZHURUfaovcFZ201h+ViPFOT5DwVD3Ga rnJUu7vLpaJJ9yqV8Mwi7lo84vVvTbEpBjlOWJ2NdGsxb6ryidBIhiNQG8r57f2DTMOT8B NBhfOV3c/Cq+89Iiwy/ILNsbPwuZVp/KGnaJJQiLF1Y+1XSWkU34ROjSVERI5gCP3+yxiK cXv1dM31rM+G1tcPog4JE0c4QouJffFix69rFbgi35/q36fp0mQcXdUDhPESFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0F03wtzXb6; Tue, 18 Nov 2025 00:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qC6L046879; Tue, 18 Nov 2025 00:52:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qCEn046876; Tue, 18 Nov 2025 00:52:12 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:12 GMT Message-Id: <202511180052.5AI0qCEn046876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ae879f73a03f - stable/15 - sound: Retire feeder_register_root() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ae879f73a03ff8f0657248e403576640ebf7d134 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ae879f73a03ff8f0657248e403576640ebf7d134 commit ae879f73a03ff8f0657248e403576640ebf7d134 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:41 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 sound: Retire feeder_register_root() We can now use feeder_register(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53560 (cherry picked from commit 2ba68208390a2c091039eb6731cdc2ebe280f89a) --- sys/dev/sound/pcm/feeder.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index e2d05f307f4d..fa4e4e16a133 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -41,27 +41,13 @@ static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); -static SLIST_HEAD(, feeder_class) feedertab; - -static void -feeder_register_root(void *p) -{ - struct feeder_class *fc = p; - - KASSERT(fc->type == FEEDER_ROOT, - ("first feeder not root: %s", fc->name)); - - SLIST_INIT(&feedertab); - SLIST_INSERT_HEAD(&feedertab, fc, link); -} +static SLIST_HEAD(, feeder_class) feedertab = SLIST_HEAD_INITIALIZER(feedertab); void feeder_register(void *p) { struct feeder_class *fc = p; - KASSERT(fc->type != 0, ("feeder '%s' has no descriptor", fc->name)); - SLIST_INSERT_HEAD(&feedertab, fc, link); } @@ -381,6 +367,6 @@ static struct feeder_class feeder_root_class = { * Register the root feeder first so that pcm_addchan() and subsequent * functions can use it. */ -SYSINIT(feeder_root, SI_SUB_DRIVERS, SI_ORDER_FIRST, feeder_register_root, +SYSINIT(feeder_root, SI_SUB_DRIVERS, SI_ORDER_FIRST, feeder_register, &feeder_root_class); SYSUNINIT(feeder_root, SI_SUB_DRIVERS, SI_ORDER_FIRST, feeder_unregisterall, NULL); From nobody Tue Nov 18 00:52:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0G4KhSz6HH9M; Tue, 18 Nov 2025 00:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0G1k4Dz3ypN; Tue, 18 Nov 2025 00:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35Ilraxo4BouqET7df6zHxiYnxqHJr3pD9vj6iEM8Xk=; b=nE7fq0Rs8UFaBkGlTArLRMdjWUxxMnPZJ/U0+E5Z/pHzNHXdeaoQR6/CGNd+kAgHrvlvwW m0ndPO8Jig2XlvmCpPatplAE7H6AxJYc8n3po5z59gjn1YGS4vxnawRkJD4KnQ6suGSsxA GIzz3sgTCkF7MkFEWa/YytyEAWoDiA77FRw8h1tupdapTxQwRkR+1W5vvDGeCjrxZKOBn0 YpidkPn3V+bcghUsD7hSdCHQpwMmGm9FVvRdpybK8wzQi7DUc65i/VTuoFzCMq+vHoxqkj G/WqYfJ6/oSRPWZ3+WRfq2FJJg4wwSANcWf1/+yuuoOd9H7b9ZJkNGUCFj3Veg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35Ilraxo4BouqET7df6zHxiYnxqHJr3pD9vj6iEM8Xk=; b=R5EPLcau1hrucAenmfHpHPioDMiSj1o7forLuiRE5BL3MSAUOsRrC//2ZgNRCzkFyRHwJT 0fHGSx7/AA333tPh1aHEbLTkAKwzXoiWTKjkZo4GdcuIR4mDgTpCB5S1RUtlJ9S6Weoddz JI1cYMLfRjICAPhTyyZY8y0RxZDkqd7TG8CIf+6ttnbk/xc4311n2NAPY5on2qKDHgeieY qRf6suL1hxyAcjyLjAN6E6k0+tA34a1rcw3qp2LJzP9TwWhq7b+sAa3R37kCH8UlMjj0nC FBVVGZvR8FIZSeCTLzgAR+xIUEXze4/CXiUKIxGVnwQ6o1CDPo8mxqzRruEBJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427134; a=rsa-sha256; cv=none; b=LjQquvewODBbJW0Y2/kqw9l/igQG+VdkRMPtOFi3QuaD9JL3nARehvdwZ9xh6D0srl8Cnb MXw4RmHsfkFG9pTRRJ6ChCgtBIyXTdfq1H+KYTLavxLqUJDGGqHdgajC4lrWw5Z5op1eqJ KqB9ydcxXTK5AsU7xY6o7X3FSII/zy5EbsoS1YtdWDto95b8U3Z2GCqkGonrh+STt1lWsY Gx8KcY/3jJKuzOEmAdYK2o9QhzSWgEyEXNUkjnom/BiJrAtj352TIZCNdF0X8QAc21dYqK 2VX/yF2+GeJbMfzDoGFKOOcU7fbQRAazFg6LgnztBhc7Vx3iowFvDtWPaOTXZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0G146CzXdk; Tue, 18 Nov 2025 00:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qEeF046911; Tue, 18 Nov 2025 00:52:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qEA5046908; Tue, 18 Nov 2025 00:52:14 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:14 GMT Message-Id: <202511180052.5AI0qEA5046908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 8517a76e34b6 - stable/15 - sound: Retire DSP_DEFAULT_SPEED List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8517a76e34b642cc11f4f16892e429b9c780bb53 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8517a76e34b642cc11f4f16892e429b9c780bb53 commit 8517a76e34b642cc11f4f16892e429b9c780bb53 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:47 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 sound: Retire DSP_DEFAULT_SPEED Only a few drivers use this, but this is not really our "default" speed. And even those drivers most likely override that value at some point once CHANNEL_SETSPEED() has been called. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53562 (cherry picked from commit 16ae4c2398c89dcc5c03f1aac72a2fce2a60e724) --- sys/dev/sound/pci/als4000.c | 2 +- sys/dev/sound/pci/cmi.c | 2 +- sys/dev/sound/pci/cs4281.c | 2 +- sys/dev/sound/pci/es137x.c | 2 +- sys/dev/sound/pci/maestro3.c | 4 ++-- sys/dev/sound/pci/vibes.c | 2 +- sys/dev/sound/pcm/sound.h | 2 -- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 75fbefe27633..a8c3303af74f 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -221,7 +221,7 @@ alschan_init(kobj_t obj, void *devinfo, ch->channel = c; ch->bps = 1; ch->format = SND_FORMAT(AFMT_U8, 1, 0); - ch->speed = DSP_DEFAULT_SPEED; + ch->speed = 8000; ch->buffer = b; snd_mtxunlock(sc->lock); diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index a1356f58b567..28427d449c8d 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -352,7 +352,7 @@ cmichan_init(kobj_t obj, void *devinfo, ch->channel = c; ch->bps = 1; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; ch->buffer = b; ch->dma_active = 0; if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index af2b4da76aba..5b0b229a021b 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -326,7 +326,7 @@ cs4281chan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channe ch->channel = c; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; ch->bps = 1; ch->blksz = ch->buffer->bufsize; diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index eb546de81f65..6b2093e16246 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -987,7 +987,7 @@ es1370_init(struct es_info *es) es->escfg = ES_SET_FIXED_RATE(es->escfg, fixed_rate); else { es->escfg = ES_SET_FIXED_RATE(es->escfg, 0); - fixed_rate = DSP_DEFAULT_SPEED; + fixed_rate = 8000; } if (single_pcm) es->escfg = ES_SET_SINGLE_PCM_MIX(es->escfg, 1); diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index ee39f5f3c90d..bad2b4eee1cd 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -437,7 +437,7 @@ m3_pchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel ch->parent = sc; ch->channel = c; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; M3_UNLOCK(sc); /* XXX */ if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { device_printf(sc->dev, "m3_pchan_init chn_allocbuf failed\n"); @@ -816,7 +816,7 @@ m3_rchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel ch->parent = sc; ch->channel = c; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; M3_UNLOCK(sc); /* XXX */ if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { device_printf(sc->dev, "m3_rchan_init chn_allocbuf failed\n"); diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index 6df76306b28f..1b7353464503 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -204,7 +204,7 @@ svchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c } ch->buffer = b; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; ch->dma_active = ch->dma_was_active = 0; return ch; diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 6bd435d0ea25..19da1a22871a 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -148,8 +148,6 @@ struct snd_mixer; #define RANGE(var, low, high) (var) = \ (((var)<(low))? (low) : ((var)>(high))? (high) : (var)) -#define DSP_DEFAULT_SPEED 8000 - extern int snd_unit; extern int snd_verbose; extern devclass_t pcm_devclass; From nobody Tue Nov 18 00:52:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0H5ZZvz6HH6s; Tue, 18 Nov 2025 00:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0H2ZBbz3yj6; Tue, 18 Nov 2025 00:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=946Y3JN5ZSw9LsZxym8ndG6k+vKV2H+uTllgIKSLT5s=; b=q7KIwkuzYrIsMX7geUlf70CQnoEpazcGpV9bKzxQQ9SYMG0XAWvM1DKUIQf44rrC4lZqpr KhAV8b86BhqfvIBvqeaOFatIdLrCSeaogwejhJT+QZwaxFqDh7hBqgD6vJ8ONxGsYVEQYb iPib9ji3PKh4fphnG5+dDhjAcDbcTsmF09cY/xOf/pZPkO91zXd6YyPmQAjrMbib3CQNJf pFAtbIK8WlhapXEdYgfrNCXtQREUUwsl41vf24JwsDiUR3DXG1wDxZeNP5DUstNFPCKJGm GMR5oLRTAfuMpJ8wJPC8vk7DNeLYv2L8oNNuCGilMiBR4qZMhvJhkpToS5vcwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=946Y3JN5ZSw9LsZxym8ndG6k+vKV2H+uTllgIKSLT5s=; b=BvZH5CLlV4b1VxaC0mhLxZREItczb6x/l8EuzwWDAKv739Zu57mqH9UskQcr2iJXax0CVb MVednvMaQ97TUVPR0hGgTjZE98+fxhoQBM4Qsxxo2FQBE6weSGMQzjmk5peEklg1SIE6pP EJ9Ntk9ABwb9bfAUVlBdX9GUv7eBM6vbPyl/fUqLDiXd+8moUndXqWP45l9gzHn2hOMnWa awAtR20xzRr5WpkVzlLAU8ZsQ5qalvuSJ5/18DoBoq51BTOfPx3mMHTVF6OKNBPlucUNE5 YCJL+eV3wPyUxQc/4AaQgNBSUQxhQl237mzxAJepwqfw1BQD3+8+AlxZXv5SxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427135; a=rsa-sha256; cv=none; b=VB0vor+MEBFVKsPr9YWCeueCZMIvB64zKeWZJjSdhbhG7YtomsmmfgMCFDgqGqy4dd6qIQ bTMvxTUT/o6uiuB8mQroI2mojv1yrQCIZkrbFIXezQvdFBlAW0Qr+oVY3cyYTkm9PkPRM9 GHQQO6jLUc/spcNqFhgh5w8ozOl4IZodsQNjDaASXE7KL8zdy4/xdk/WTOazh58XUFTjzP Nob3SfckAxAv9rFkWSQtM6jqO40BJURBmrYltKCUQiXuAREHeBC6TI2kg+0iyEakZCjXDw YcD90wZAlwgjf+DxJ7RMCrpeV1xJnAGO5mftTCFFXqHraLawDOzMPXCfhwdmFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0H20hLzY7y; Tue, 18 Nov 2025 00:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qFZr046949; Tue, 18 Nov 2025 00:52:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qFe9046946; Tue, 18 Nov 2025 00:52:15 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:15 GMT Message-Id: <202511180052.5AI0qFe9046946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b4c210f241b3 - stable/15 - sound: Retire unused SCF_SYNTH List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b4c210f241b3b7bf07842d85342f9852d9f2dc6c Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b4c210f241b3b7bf07842d85342f9852d9f2dc6c commit b4c210f241b3b7bf07842d85342f9852d9f2dc6c Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:55 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 sound: Retire unused SCF_SYNTH Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 7dc58828f494ae8fc06ef014b01b2dbea855091b) --- sys/dev/sound/pcm/sound.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 19da1a22871a..75fb57e33733 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -184,7 +184,6 @@ int sndstat_unregister(device_t dev); enum { SCF_PCM, SCF_MIDI, - SCF_SYNTH, }; /* From nobody Tue Nov 18 00:52:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0J5QPQz6HHPF; Tue, 18 Nov 2025 00:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0J3B68z401Z; Tue, 18 Nov 2025 00:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zbzs6D0nPh/UASixhCC3Na1SLG/0D6iPUNIk/7KpCYo=; b=I1RA19e8D2YVjwnd/hsyJWaE/wxbhwtruBG7nroWKUDsUL0DASPKd6Qce24nyWfFqkFYp3 5a5dbgLEU/i5IKuqIk/beOl06O3xt1etTWRZMCYfAf2fMvZyTAjFYLeLDWPUfKEa4DX26t SNS2AehorUbsGpsKT6Oot/VuCiVWayFnY/SsY62Gz0XUfzHc8i5Tm9YMHpzsYWeHsMco2g 8wbp8ICS11CGXtb8WTWdM2P6ZDzQ+cOjK1Ir6dnXeRGfWI+oFlydH+l7oxwbO/6ycSGdoP Ja+cqPgqsBzAGoMNexYB+XEuC/45WWT6gQeFJSYr7NXtTd5UxaYdwWVXQhYFhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zbzs6D0nPh/UASixhCC3Na1SLG/0D6iPUNIk/7KpCYo=; b=bB6tVCuCIFHGshTp3+4ca8WniKgk3aeeqCxH/ycj7Cu65kKtWKKTMwszIlFh8ora3VohP9 3QlE81dbBW/k2Gin8Izw2v6sFWSABZnshmebUEZG0Hbu0lHfFfHz1ctOudh7n0RmxiGYh6 qyFmGL7mjkeS9xh5V1ve1M1wWdRRx2NHY2DZml27rbf8M9f1Rdri4zVKomIuHyCfGF1bZr quyvDF8oi2EzQQhS9sCNO2kpO9iUHjvFYoYZjxqKkdAOY47zDW6s46ej8XVi3q9JT1XY8M d/ifBrYsNuCeds6Xwl42irQgIJsTBGL8jqPTu9qlRa9mh5nztPETr3REzIo94A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427136; a=rsa-sha256; cv=none; b=RxDG0XNnuMHL6mEDTUCrCrgdcY5nl8gxM2W5p+j/8dy8V7N9zrWRMqsYtSHzuIwWgPqeMr 9P5CijKRZFnzDGTv+vx2N2tRlvhNoOc7RO4LBlsfbGcY9KMkUTzYBveeCw4eeiP7AanyId IlHpHo4Lzo7lUfyRFJvzBct6D7gUB1UrT6vxn+XNBmYcLCD5BUsmFqISqZACUXOp0TILCp oQHBBHmfX2h9Zrba1X+FV+esGKrZMQmOkcXd0tp4C9Fn7mbsik8mBBoopqZ1nWyU/fPdHR bp7qrObiAvYxr63nGtAjqznQr54hk0y3OosuTLu1dTjVnKQIO17SD1xWkeCwOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0J2hyDzXhN; Tue, 18 Nov 2025 00:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qGmX046981; Tue, 18 Nov 2025 00:52:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qGoq046978; Tue, 18 Nov 2025 00:52:16 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:16 GMT Message-Id: <202511180052.5AI0qGoq046978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 29e5f29fc0c9 - stable/15 - rc: virtual_oss: Use required_modules instead of load_kld List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 29e5f29fc0c9fa180b5ec07f8c80aa7428220bd7 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=29e5f29fc0c9fa180b5ec07f8c80aa7428220bd7 commit 29e5f29fc0c9fa180b5ec07f8c80aa7428220bd7 Author: Christos Margiolis AuthorDate: 2025-11-11 12:07:36 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 rc: virtual_oss: Use required_modules instead of load_kld Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: imp, markj, emaste Differential Revision: https://reviews.freebsd.org/D53616 (cherry picked from commit ac2aa9e869a16b28095364b2e14683df9885ac34) --- libexec/rc/rc.d/virtual_oss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/virtual_oss b/libexec/rc/rc.d/virtual_oss index b9c830617385..b8f1e7620582 100644 --- a/libexec/rc/rc.d/virtual_oss +++ b/libexec/rc/rc.d/virtual_oss @@ -20,6 +20,8 @@ start_cmd="${name}_start" stop_cmd="${name}_stop" status_cmd="${name}_status" +required_modules="cuse" + configs= pidpath="/var/run/${name}" virtual_oss_default_args="\ @@ -53,7 +55,6 @@ virtual_oss_pids() virtual_oss_precmd() { /usr/bin/install -d -m 0755 -o root "${pidpath}" - load_kld cuse } start_instance() From nobody Tue Nov 18 00:52:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0K6w3Cz6HHVG; Tue, 18 Nov 2025 00:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0K46y5z40CY; Tue, 18 Nov 2025 00:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/GoDrAgL6J51hLop+FGHNzpKx/UQwyd//gbZJf1HiY=; b=ypmneIikk2Vc/+skZgRU7n6bKVCO1FkLH4x9j/h1nCEf9RuFWgJvb1h9ALA3vtx4bxvAc1 0TsT8ZzoYGXnvVm7hoWq1/21HBsYJWTr9ZRRTo9zRbqUymVAwQKoyCM3lO1H2pB6DpWOyM xTTcg+oK+i7grpjjMxsJusfe5I/G4OgUhrPbC4kU4IwdE4yGFRZCjeCwYrGlbUamZ9Jivp 9oO3keT05o+63xbUPxpmoIOz6/pMtZO5nHapMmgUkK5IfRleOorUNyDxWDzUUQShr3lN3Y 1IepUIIeLQ4SU6b25vjtKHwb70P/KBA9TYLVbjb9Qe39mvFhZwV+wL+HiOVWzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/GoDrAgL6J51hLop+FGHNzpKx/UQwyd//gbZJf1HiY=; b=C5odIEozXI6VBr/OeEqgwnxe0kIClL2rbeUL5BjlQrVheuBnMU3qePwoAG1NHkt+SOkV2n OfzDnkHHhIkE+I54gZvA95z2wKRt5SSqKRrMEmKqDZjMJqlxfLfORK+DvRsTk+KPirQ5i+ BP4WnS1i8y26ADgemi6Q6ly8nc9i8TBmkSFuqYCEqSiw2nQzdRzxweUFNZulY/Y2YftSIY hgAm/ounwl60xgctHjNvZ/I+8s3RYOqut0EQQl/CoiUVIkoVKtjcG5riFmqm4f6gqczI7s 6WlY96hvsO7/H/QHrVHGmMNLaxxmrrCeTXcx2j3BrBlNU6YdaQFnWHXUPxwq8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427137; a=rsa-sha256; cv=none; b=BP/hP1TUowbKqtbX/hU+STw/Y++6Q1WZT/7pf1ELvssOdabeFnAIkXShBNcGhUD3o7JyCo TSEsD1OO+o20GyyTzk9UAJ4SR9jYRasWhGpiAas0iGM2SG2JsGUjvggQKq/pwezrQx2ovU Fbc3SRMgltlgKIjPV0GW+0jBo5vpXdudQNwdg+drZxZb2YRRAT/TQqPiVJmoTykl8qIVud ag8/SYNoIEjJRnUQVQovry9K6F4NoWZicPlW6KZ2MlY8U8J23SftAEgSr8OXBi5jBgaJUn BXeoCFU/LMhSbuY676bkKS5JLAMEMTKl3Sm5JwXYfANQIGSTY28qhJJzjZPKYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0K3gyfzXdl; Tue, 18 Nov 2025 00:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qHai047013; Tue, 18 Nov 2025 00:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qHZ1047010; Tue, 18 Nov 2025 00:52:17 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:17 GMT Message-Id: <202511180052.5AI0qHZ1047010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 4804bb0d4588 - stable/15 - virtual_oss(8): Use kldload(2) instead of system(3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4804bb0d4588d5e0a456b7009295c4e031aa7316 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4804bb0d4588d5e0a456b7009295c4e031aa7316 commit 4804bb0d4588d5e0a456b7009295c4e031aa7316 Author: Christos Margiolis AuthorDate: 2025-11-11 12:07:40 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 virtual_oss(8): Use kldload(2) instead of system(3) Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: imp, markj, emaste Differential Revision: https://reviews.freebsd.org/D53617 (cherry picked from commit 7bedc4634d893174b9cef06c7c13e5f1cb24808b) --- usr.sbin/virtual_oss/virtual_oss/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index afa4ad0727ca..f2fd085664ed 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -26,12 +26,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -2539,11 +2541,8 @@ main(int argc, char **argv) atomic_init(); - /* automagically load the cuse.ko module, if any */ - if (feature_present("cuse") == 0) { - if (system("kldload cuse") == -1) - warn("Failed to kldload cuse"); - } + if (kldload("cuse.ko") < 0 && errno != EEXIST) + err(1, "Failed to load cuse kernel module"); if (cuse_init() != 0) errx(EX_USAGE, "Could not connect to cuse module"); From nobody Tue Nov 18 00:52:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9R0M0cc9z6HH9P; Tue, 18 Nov 2025 00:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0L4sDSz40SQ; Tue, 18 Nov 2025 00:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iwx0YcsvRRSY7T7cIKxmcHxuDLnwvmwElKRxofon/uQ=; b=gy22hpjqSQoNRQ3pQRLrBVFZBPy5ekUtNn3YPgiWdO6kjeu6UG2+SAAEo9r0SxGK2plCvw Zr/1SMPVrhWaFwqAwqxuscxGRDIQVSpyHJG4EDsSbJ3c7a7xwltY2fjiOxTSLHt0m+5NM7 BKXms2FqiQWUPuGuRb8ds0ISKYUHVbsKQYj1kAnTwKEAMIetSKvn/KVH5XlUHCt9yEWRlV HVCHRjzpH9xZ04gzVb2AFi6htNGCOi6v2R440a3WW+yTzc2cBOjWHz0x0XKHai2J9a4nhQ 6zviwuLZStCmdDXdVuu0EvRLGStSjNjMdJ0p9LYwyV4AwzlfZpyombv213qiNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iwx0YcsvRRSY7T7cIKxmcHxuDLnwvmwElKRxofon/uQ=; b=PsKiJQ1b8iJ4PLoIf2DfiQHk3c20sruEkK1UX3PbD7A5S80uUewuvdGMdyciX0/dsWeHwq /CY5r8DyKhB4/1loVvLUoM0+gR5tYi6WG0WM4qY4WSxb4gqji0m67iVtV72QaX/0Dtm8Gv AnSnr3Wus26Ey0jb2viml2sVf3HzwsOs4AI4pWqgaz6rZ1eQfh7KPWXLxUAs6g9ugaa+t3 PTocq4z71Yco8MMuzPgok9F6PKu16XlIkhYI4qgsfm4i2OGszd4zKEwYwAUT0cgcF6hCxw Xt7K7Mb4P72AuzO7USp38ET6C6Pv5Pso7kfXXeS3HDx/Z/QfXRwUrfK98+KQvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427138; a=rsa-sha256; cv=none; b=Cyw8PVHwl0Ryt6/n2Ql7RpZ2AnYVeHukGwPB7hdLQoaG9dhzHFtKEHbYRuuc81qQ1plxBI d2up+mSJn1aX8hHi6MLlXmSQmjIL4NDKf4Yg9Dpb93eynQ+vykB5va/r82IMWbC2NLLJHs +VKj5kATVt2wGNWMnx6ppULh3o4mduWFyRFY9IYDBA0RvMFAlWX0EjXrPtaCqHceD3MK/3 T8/r2abOy2FyXs/H9C+ZGYADuCQInpaqNebxFQZZovxeoXaR+PWDvKTFM1DjEC4fZC1NmC b8Vyqr/M8HgtDJ9PemteVZgYFfSgoRdAwwjKnbk8h5PZ3VTBD8Xe4J5HgRa4TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9R0L4Pm6zXhQ; Tue, 18 Nov 2025 00:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0qIjS047045; Tue, 18 Nov 2025 00:52:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qI7V047042; Tue, 18 Nov 2025 00:52:18 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:18 GMT Message-Id: <202511180052.5AI0qI7V047042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ea9d875a6477 - stable/15 - virtual_oss(8): Improve hw.snd.basename_clone handling List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ea9d875a6477b5394b6687e6308783c4564fac22 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ea9d875a6477b5394b6687e6308783c4564fac22 commit ea9d875a6477b5394b6687e6308783c4564fac22 Author: Christos Margiolis AuthorDate: 2025-11-11 12:07:44 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 virtual_oss(8): Improve hw.snd.basename_clone handling If we request a /dev/dsp virtual_oss(8) device, we have to replace the sound(4) one by first disabling hw.snd.basename_clone. This sysctl tells sound(4) to not create the /dev/dsp alias for the default device. There are currently two issues with the way this is handled by virtual_oss(8), however: 1. It uses system(3) instead of sysctlbyname(3). 2. It does not restore hw.snd.basename_clone to its original value, so if prior to virtual_oss(8) running, hw.snd.basename_clone was enabled (which is the case by default), and it is closed at some point, hw.snd.basename_clone stays disabled, which is annoying, because users have to manually restore it, otherwise applications that open the default device (i.e., most) will not work. Fix both issues. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53621 (cherry picked from commit e5c0d7020f3d040b28dc7ca0cda9926e07e5aaf4) --- usr.sbin/virtual_oss/virtual_oss/main.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index f2fd085664ed..28095880c201 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -52,6 +53,8 @@ #include "int.h" #include "virtual_oss.h" +#define SYSCTL_BASECLONE "hw.snd.basename_clone" + pthread_mutex_t atomic_mtx; pthread_cond_t atomic_cv; @@ -1617,6 +1620,7 @@ volatile sig_atomic_t voss_exit = 0; static int voss_dsp_perm = 0666; static int voss_do_background; +static int voss_baseclone = 0; static const char *voss_pid_path; uint32_t voss_dsp_rx_refresh; @@ -1739,6 +1743,20 @@ usage(void) exit(EX_USAGE); } +/* + * Restore hw.snd.basename_clone if it was disabled by us. + */ +static void +restore_baseclone(void) +{ + if (voss_baseclone) { + if (sysctlbyname(SYSCTL_BASECLONE, NULL, NULL, &voss_baseclone, + sizeof(int)) < 0) + warn("Could not enable " SYSCTL_BASECLONE); + printf(SYSCTL_BASECLONE ": 0 -> %d\n", voss_baseclone); + } +} + static void init_compressor(struct virtual_profile *pvp) { @@ -1883,8 +1901,18 @@ dup_profile(vprofile_t *pvp, int *pamp, int pol, int rx_mute, * Detect /dev/dsp creation and try to disable system * basename cloning automatically: */ - if (strcmp(ptr->oss_name, "dsp") == 0) - system("sysctl hw.snd.basename_clone=0"); + if (strcmp(ptr->oss_name, "dsp") == 0) { + size_t size; + + x = 0; + size = sizeof(int); + if (sysctlbyname(SYSCTL_BASECLONE, &voss_baseclone, + &size, &x, size) < 0) + return ("Could not disable " SYSCTL_BASECLONE); + printf(SYSCTL_BASECLONE ": %d -> 0\n", voss_baseclone); + if (atexit(restore_baseclone) < 0) + return ("Could not set atexit callback"); + } /* create DSP character device */ pdev = cuse_dev_create(&vclient_oss_methods, ptr, NULL, From nobody Tue Nov 18 02:19:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Sx41TPlz6HQTh; Tue, 18 Nov 2025 02:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Sx40RxVz3R51; Tue, 18 Nov 2025 02:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FGHAWMXJf64YAx/l//kh3xXJIpiZi7MzzD4BgFrFPzk=; b=m6/sAVilf0hyn4qPmyasMCeGVhJ5xyYKG3UzQJrtYud0111q/kKRzJoXSh7ZR2oD0fKDKG bIqh0or/syw2PDaYB4Q1r3Nu2OdD88QcbXj8ggqDwzqDwt7LSpNMtm0vm1EMaDHUI7vYlh YGf/44d1fJfvJBYcZ1z/QbZNhsf4qlp/1gKrlFBoDkvFLufIUkvO4zpve1mjU2y/DMlmc2 N2YzmBDix8EqAViQ9wmR9tyMrjgx/vEWYKPzyLkJcrYMQ8Lk0bzc8nUjOmwDZoDxoEEFzl O7rzJB4lcZjaBKDzLo1CZCKMi3A6nvtNewRdcgehGwg0X9C/FwP3DitLY3fcYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FGHAWMXJf64YAx/l//kh3xXJIpiZi7MzzD4BgFrFPzk=; b=MoPq/lw6pEmDOPoiRVLPl8C5g+wOiM+ybvn1c0m4J7nnpfDB+yGUYkMj9mR3dp1ipyGU3/ tFfQlZRzkH3eTmStpCdy2val7STHWLEHhWeMZ8aE7my/OOdckyIR0mXKRj7Aw9wx9yyYV+ hfF5AzWeWptXspLydAedqIq7JFEysA09FD9/+0qPqqr9twSmgcZn0aX1+17AdYnGIn57Bx TGItRMcbhaA2j8uE5Ve5FnORhbvAulPr7J5Fl7G7ShAl8YkF+ZGUyFuH5jKcWJVCS1nW4Q DR7MGD05T/mmFlVA8asGn/fuAEHB66N+aTPecTFt0ngN06sIo1cBKILsVx/zBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432376; a=rsa-sha256; cv=none; b=P0HdEhzaHVYisfevvBEhZzt6lYg7IfVQRE+5MW/npNjOu1ltFYuGKujyEe9NScLDJoCrnO 0Bgcs0fmhR+esNrEeXp4P3IVhDIipv+nfy2Nv0FUxOtvOnhlMbw9kxm7HaUFiYY2hh9AcO jrJ7jE24HCm8mVo/gGTc4HDMFHb4DKRzXSpVCPkdz0STn4/9cmNKQ3aJQlxsoGW9tF2yeI AyOL/KNBY6ZPiHrP4dv3mcz9840tINAlKOEcQOJqtbONIC00ofi6CVBQfJi/njeia4uEwI hpUf/6usOBQaGsdLxA+7tDipHn4CNX/kb1TC5sOhEy3smLx2HDYhAq+wfE2X1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Sx36yjTzbl2; Tue, 18 Nov 2025 02:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2JZGj003615; Tue, 18 Nov 2025 02:19:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2JZTR003612; Tue, 18 Nov 2025 02:19:35 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:19:35 GMT Message-Id: <202511180219.5AI2JZTR003612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0e737642f275 - stable/15 - release: Add /boot/loader.conf to some cloudware List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0e737642f27546ea34229447b2bc056a1fa58799 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0e737642f27546ea34229447b2bc056a1fa58799 commit 0e737642f27546ea34229447b2bc056a1fa58799 Author: Colin Percival AuthorDate: 2025-11-18 01:01:30 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:19:20 +0000 release: Add /boot/loader.conf to some cloudware These were forgotten during the METALOGization process earlier. Reviewed by: markj MFC after: immediately (for 15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53795 (cherry picked from commit 86c63597f2dc7f89268d13a00c0dc7a74cca51d0) --- release/tools/basic-cloudinit.conf | 1 + release/tools/gce.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index f8554c42f49c..98e11f0bb08b 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -28,6 +28,7 @@ beastie_disable="YES" loader_logo="none" console="comconsole,vidconsole" EOF + metalog_add_data ./boot/loader.conf cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config PasswordAuthentication yes diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 2fa23f6e54f4..78511dbc66c9 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -51,6 +51,7 @@ kern.timecounter.hardware=ACPI-safe aesni_load="YES" nvme_load="YES" EOF + metalog_add_data ./boot/loader.conf echo '169.254.169.254 metadata.google.internal metadata' >> \ ${DESTDIR}/etc/hosts From nobody Tue Nov 18 02:19:37 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Sx538RTz6HQRL; Tue, 18 Nov 2025 02:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Sx518Vvz3R52; Tue, 18 Nov 2025 02:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6932Ms7aAUxWl473g5rxIz2BgFYVc9k/tcc/1kOv290=; b=RzUWf4Z8I7o0NZdLoewhBd5ygwX0Ja49I9Qp/kkjiLE2VoShOxj2cwPfw9gZBnxxVgBawu 6uBnjGB9/bqTih0IpqmGmWwLbUivH/EhH8LAiUnp4oyk6EeUXOX8J6UTbFM5Q2RLO6qVLK jmK/Tge4j/jWsIPoN4ZgDwq6QngHZx6PSUsK7oGsTEGRjqTU5mkhIwVNvWIqJvvQixh237 MAfDM+qiqk08tWpbM0TGlKPrX9vGlDu4awWEbVJXvI4fvCfncGSANbUnMjbEp/OTMuQTD2 bf/8KHUuYYS46/9HA7qeqgI+tHYUCLGbAFNWgxLmMPOLACQAqJVXXWZYcd2aXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6932Ms7aAUxWl473g5rxIz2BgFYVc9k/tcc/1kOv290=; b=SRk+H8G3pl2CrVRunlcKPvD9/T8JZEc18cmUYKu5grAfZeXIEU63w7B7E2VyXdm8K08KtT aJGvsvkX4ABmL6NFpbnRmlMjLNmXQ9qLG/LvONxP8PPIdQENSgLbYw6DWD+KgdCb5IHSrF 1EQe3ZX1222V9EQBYJEPDdNbit78XNyxHT8Wr20mIXGRR0BanFK5GaBvLNPlpMLaub65om Ser1GuLrZXK45Ubsek5n1mnA95DFrsOzExOMAS5JYCzWEfHztkZkfsmkpzMn9u7UbsLaox 5znwp2caatxAPdW2VgaHPqaad7sH/O6yGNFYeYFqpcAdNx5FIix4n+TCD/rFrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432377; a=rsa-sha256; cv=none; b=VGqZuoVe6WK8XC80iHkupon7AAtOkOsVehKIOpRyzPOBb+lSTJN0CSUJ1oJ2YrQmqvv7q2 832iyAtmrCywFIPWAkNk2Q0/aTYKD13Yy3fz0r0kzTO/1Lmzzizs0xxNLHHp3rqqMorPuv nKvvkal9nJsngNMXZ4LGTs3HBcd5pS9DTHvliFXFHwYURLaOA6LIuNop61MRZo36cU3Weq P8mJSz2N5VdxehoVCmgv9O9c2wkmOHfRrJFa9Fh6fV4LHjHqye14YBl3IRdw5GuUNGQkIC Rm1gcFQDlwtAJom97stQ8KmEQCeocCwgQu7xRcS7yjNzTRBZxG46aY+DTH8uxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Sx50mPTzbXX; Tue, 18 Nov 2025 02:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2JbDP003653; Tue, 18 Nov 2025 02:19:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2JbEV003650; Tue, 18 Nov 2025 02:19:37 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:19:37 GMT Message-Id: <202511180219.5AI2JbEV003650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 10ef3bf823c5 - stable/15 - GCE: Add /usr/src and /usr/ports to METALOG List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 10ef3bf823c5d5db0303eb1552f1faa47cb0e58c Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=10ef3bf823c5d5db0303eb1552f1faa47cb0e58c commit 10ef3bf823c5d5db0303eb1552f1faa47cb0e58c Author: Colin Percival AuthorDate: 2025-11-18 01:02:47 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:19:20 +0000 GCE: Add /usr/src and /usr/ports to METALOG We ship these in order to comply with GCE Marketplace rules about providing source code and licenses for all the software we ship as part of images. Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53796 (cherry picked from commit 0dbb00733c4a177a9a22d61a627d377d0876ea16) --- release/tools/gce.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 78511dbc66c9..c1e129ba69d6 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -98,6 +98,10 @@ EOF # the image. if [ -e "${DESTDIR}/../ftp/src.txz" ]; then tar fxJ ${DESTDIR}/../ftp/src.txz -C ${DESTDIR} + ( cd ${DESTDIR} && find ./usr/src ) | + while read P; do + metalog_add_data ${P} + done fi if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR} @@ -108,6 +112,10 @@ EOF DISABLE_VULNERABILITIES=YES \ I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES done + ( cd ${DESTDIR} && find ./usr/ports ) | + while read P; do + metalog_add_data ${P} + done fi ## XXX: Verify this is needed. I do not see this requirement From nobody Tue Nov 18 02:19:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Sx63PXYz6HQLc; Tue, 18 Nov 2025 02:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Sx61hJYz3R2y; Tue, 18 Nov 2025 02:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YB+MeAclQ//yno1Cd5NsaMx//IU5MLAvBketYaL5N/Q=; b=qcpXMjWtxTNsKOUDwgi3sjFgLOUFDmR0oRKCQzvUQNFHtTb4UPFtpRoz3alvXnYZOSuS6g +LdygUdiakGHWW59aKgqi5f/tfuvaMKAo2wzmAhRhkSBMnibfD5zySrtv39IaVgBspKuNm EIYkZqwUW2gfbpkdaIW2V6KRODu9OhsbRY6bqaGUyGVXZtDh8GTMiKLROJWNZ8wuoJaG3k PT8SHghfBUsIo6vmdPklUxBXPzfkudIfuYPPLoGbs9ELnlQIPhpRAxeflPV+d9TnVJ4GtN M+3fRY07PtGtuPf9gdSRiwDNLp4ViSLiwyB5Dp/j68euES+tr9v06vd1KdDsxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YB+MeAclQ//yno1Cd5NsaMx//IU5MLAvBketYaL5N/Q=; b=fdSuQY+ipi4iCjwjbURyaZBlQXblm+OQyE+6l2UaodJLEl5qel14OZCsqJWwUTXGOuIKPp xn5Vz8LGUzZGEeyeXrNwXsQht3DzIe2b37h2WTq1sT04+nO77uXN+JUf5HkuykDNB9zkOv 7sCnD2NtFYDnmfL2Ikejc6ezp7z9PwpgbNVOqsM2ixRkjU8Ny/fE3zpAL/X36mXXcbxAw8 3IXV9EjSbsW7JYSlA69c4BaXS3e5aANbpF25AZeseaWe1GfuHNAvL8k6jJhMfn59dhWBCw ZDcHBnweHBrlIBt+0ZoKFYoeftmp3msFXBU2lMqOxhxn+wCZulttRancTgvTGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432378; a=rsa-sha256; cv=none; b=YvND8w8pZOSAVi0MctPs45AVYrLJBHWUDEFPkpDSyvdwMBGfaE1KkmKXLbHQ/el/TniHq5 JC9OirUqA57p8xPnsdNFQCoGmqe+QSjkPXQW7U6YuyACBl+NhQK7ReyRWQ4egEAauZxwWu e7bUFO4HuZAmqZt50LxQ/oxTxzn861CNmuOZe4bQdIYo0aCKe54txxUUp9humdyyynnRj1 arqBdBlRxi4AraE5HEOgaT7sbwg/UGN4DkpENVbX8QJkz9QHE9obV//5qln2zShtokO/do eaZ2JQXlot0fdpem5oxwYKXdNra/zEtrfu5p0jWsfNELScIlhhJzr8S5aKZZQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Sx61H91zbl3; Tue, 18 Nov 2025 02:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2JclC003693; Tue, 18 Nov 2025 02:19:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2JcD6003690; Tue, 18 Nov 2025 02:19:38 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:19:38 GMT Message-Id: <202511180219.5AI2JcD6003690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 96468730a2fa - stable/15 - release: Add a MISSING_METALOGS hack to VMs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 96468730a2fad1eaaf65367bcec5106378cbf3d1 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=96468730a2fad1eaaf65367bcec5106378cbf3d1 commit 96468730a2fad1eaaf65367bcec5106378cbf3d1 Author: Colin Percival AuthorDate: 2025-11-18 01:04:55 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:19:20 +0000 release: Add a MISSING_METALOGS hack to VMs The packages for 15.0-RELEASE built without the bug fix needed to make files created via @sample get properly listed in METALOG. Fix the cloudware which contain @sample-using packages by adding the necessary files to METALOG manually. This should be reverted after the next full package build, and live on only in releng/15.0. Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53797 (cherry picked from commit f6e9474ebdd53de5cf487c7bc9e0fa6743881c23) --- release/tools/azure.conf | 10 ++++++++++ release/tools/ec2-cloud-init.conf | 12 ++++++++++++ release/tools/gce.conf | 10 ++++++++++ release/tools/oracle.conf | 13 +++++++++++++ release/tools/vmimage.subr | 10 ++++++++++ 5 files changed, 55 insertions(+) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7975e1db0822..981e40566a1c 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -18,6 +18,16 @@ export NOSWAP=YES # https://learn.microsoft.com/en-us/partner-center/marketplace/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space export VM_BOOTPARTSOFFSET=1M +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/pam.d/sudo +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/waagent.conf +" + vm_extra_pre_umount() { # Remove the pkg package and repo databases as they will likely # be out of date by the time the image is used. In unprivileged diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf index 2a15ae5c57d8..8ad86a082260 100644 --- a/release/tools/ec2-cloud-init.conf +++ b/release/tools/ec2-cloud-init.conf @@ -9,6 +9,18 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent net/cloud-init" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} cloudinit sshd" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/cloud/cloud.cfg +./usr/local/etc/cloud/cloud.cfg.d/05_logging.cfg +./usr/local/etc/cloud/cloud.cfg.d/99_freebsd.cfg +./usr/local/etc/pam.d/sudo +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +" + vm_extra_pre_umount() { # Configuration common to all EC2 AMIs ec2_common diff --git a/release/tools/gce.conf b/release/tools/gce.conf index c1e129ba69d6..558641821b16 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -17,6 +17,16 @@ export VM_RC_LIST="ntpd sshd growfs \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/instance_configs.cfg.distro +./usr/local/etc/pam.d/sudo +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/syslog.d/90-google.conf +" + vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf diff --git a/release/tools/oracle.conf b/release/tools/oracle.conf index ebda3b3d6e61..152c48af1829 100644 --- a/release/tools/oracle.conf +++ b/release/tools/oracle.conf @@ -39,6 +39,19 @@ export VM_RC_LIST=" sshd zfs" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/cloud/cloud.cfg +./usr/local/etc/cloud/cloud.cfg.d/05_logging.cfg +./usr/local/etc/cloud/cloud.cfg.d/99_freebsd.cfg +./usr/local/etc/pam.d/sudo +./usr/local/etc/rsync/rsyncd.conf +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +" + vm_extra_pre_umount() { cat <<-'EOF' >> ${DESTDIR}/etc/rc.conf dumpdev=AUTO diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index d718150d8767..0ca9ba267ce0 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -334,6 +334,16 @@ buildfs() { metalog_add_data ./var/db/services.db fi + if [ -n "${MISSING_METALOGS}" ]; then + # Hack to allow VM configurations to add files which + # weren't being added to METALOG appropriately. This + # is mainly a workaround for the @sample bug and it + # should go away before FreeBSD 15.1 ships. + for P in ${MISSING_METALOGS}; do + metalog_add_data ${P} + done + fi + # Sort METALOG file; makefs produces directories with 000 permissions # if their contents are seen before the directories themselves. env -i LC_COLLATE=C sort -u ${DESTDIR}/METALOG > ${DESTDIR}/METALOG.sorted From nobody Tue Nov 18 02:22:39 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9T0b5Mlyz6HQQ5; Tue, 18 Nov 2025 02:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9T0b4sK2z3SGH; Tue, 18 Nov 2025 02:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mwwqzhDYnFmtlRDJFRPHNQ9xf3gmow9gsw/p18eBzCs=; b=meY4YgqaIYBSgQn/KR0MwjwwFaAKP8pk6oNFaerntdCPZtwFin65CU1/8U9rTG0liLrD0D N/4NciYep6RbfHHbTUxOibJOzuK7o+m9JGOHNd8UR+tb2BJgu+Sfe4OiTb81BR6sZ4Q6qb OSL3caWUKC1ffYqCAm3ZrRncnoUH4zCt/GwccC84Wx9A9N7baa1qJxjR3WWMLlzMEKkBYb 9Og8FdNRkW0jKS2hUKZxFu1sEzbf8NDtq6CulEs8uOAZ+Ug4LYMsl2gF3zU8fAsRcey4b4 4Ss87/qXPcKTEZZr3TCp3LamaoQsb1s6tU3MzO/v6wZQskUrOUVDrLvVp+qiSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mwwqzhDYnFmtlRDJFRPHNQ9xf3gmow9gsw/p18eBzCs=; b=CEXv7/USO54i5av5LdhH3dG4fshDoGzlvjxuqEkEQwFCMda0tZkYaHMUv6xuAe8mTNNbDB 0aHq6l6bX4xVXIbe15WN8bwS5uSQ/yjtJ3xzjF+oGSogCusolzMo0ardK33lgVbbM3eg1k nKLu14JevqtZONeiHRz9I+i88grTjxbuKYeijIMdeSOoO/Rllrx6/RFn8kgejgDypL8L1c TgKVfjE1+PD9adA5MIaGsuYmzxoSxlFptj3v3B3vy+07L0HwAnaLyUZJ4yXp0J60JRh9xC NXfrVB4dSW7agYs0WoJ/Xsxy/wVxeaKbwwBXB4TATRw7bfxYJyrf4SF52D1W5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432559; a=rsa-sha256; cv=none; b=iveUvne9LIFjvN6uwWIz/dTrKzxB3jeUsrRIZqb8s0r9iORJtRFszwIF/RblsvvU8qwcpf 0tS96pwpZzC0+kQe/FHh/N9JQxtrTIvxFFiaKgnuFRXzRN+kAk5ydEeIhItLBPnadXJJRb AwYGWC1HSO34tDfmEVkMyDBmLeFG/knTXi6In2K/yt3I6dcBusl88Yi9WBKNrcinSOs7qm fT5+NHkir6pee/ThiADhW8pAZxKpc01P4mbTS9m0uduM+ml6M85gHR2l5Yk1H73m8IKZB5 XuTxIs+JjsnRRlOBexzHPcrsmAur7B1kgUk2/fvYKaUtxzM9WsF+vXWTn2mc6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9T0b4H7jzbDG; Tue, 18 Nov 2025 02:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2MdnI020916; Tue, 18 Nov 2025 02:22:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2Md5m020913; Tue, 18 Nov 2025 02:22:39 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:22:39 GMT Message-Id: <202511180222.5AI2Md5m020913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: fb51f370709d - releng/15.0 - release: Add /boot/loader.conf to some cloudware List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: fb51f370709d2d50704934b24b868b303bd90dd4 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fb51f370709d2d50704934b24b868b303bd90dd4 commit fb51f370709d2d50704934b24b868b303bd90dd4 Author: Colin Percival AuthorDate: 2025-11-18 01:01:30 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:20:30 +0000 release: Add /boot/loader.conf to some cloudware These were forgotten during the METALOGization process earlier. Approved by: re (cperciva) Reviewed by: markj MFC after: immediately (for 15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53795 (cherry picked from commit 86c63597f2dc7f89268d13a00c0dc7a74cca51d0) (cherry picked from commit 0e737642f27546ea34229447b2bc056a1fa58799) --- release/tools/basic-cloudinit.conf | 1 + release/tools/gce.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index f8554c42f49c..98e11f0bb08b 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -28,6 +28,7 @@ beastie_disable="YES" loader_logo="none" console="comconsole,vidconsole" EOF + metalog_add_data ./boot/loader.conf cat << EOF >> ${DESTDIR}/etc/ssh/sshd_config PasswordAuthentication yes diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 2fa23f6e54f4..78511dbc66c9 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -51,6 +51,7 @@ kern.timecounter.hardware=ACPI-safe aesni_load="YES" nvme_load="YES" EOF + metalog_add_data ./boot/loader.conf echo '169.254.169.254 metadata.google.internal metadata' >> \ ${DESTDIR}/etc/hosts From nobody Tue Nov 18 02:22:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9T0d1dVnz6HQQ6; Tue, 18 Nov 2025 02:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9T0c5xbSz3SGQ; Tue, 18 Nov 2025 02:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xef58Nohh+CbMsotKp8ijTGaQWZyi1totAmgfxYeQ/U=; b=Zl/pqv8hwL2vv/jcCYDDEKZX7rYMEaEqspfO1T6a5GNft3HZJF9P1SUQPaUPC3Gkt/Axtm 5Ofpta9vBg3cYWEtdq98fjVQdjwiv6AWppdQjnWFXoRlYCa9FN7Lc2wToMUizZlSjjhZan H8Yj5zR+AfFADuanQlozQlCYu4vNtb8zlOtt4FAiFAPavLRWqyfebD8DLv09Parm/yShIf 3+RKntM3VQkLyLmSIp2qlhljSY0/qXNgjOs+zjEDqtAIWqjiCDvS5EwOogIREOxwowr5kQ 98ja4ajw7PUm4C6CqZyw4E5XgklfudSEv2a/hGdBP2io0JC1yV4aEVr7tnqcFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xef58Nohh+CbMsotKp8ijTGaQWZyi1totAmgfxYeQ/U=; b=IIGCx8DrJqz24LZa8r2Ee4OY6P18rQHUyPfkY7vIMxX5Xi+SoU+rzLdhFxUpEHFK0Ft2PZ huFsaCd+hiPc0n6olKJjYTAzmJV8FFXUfczpCyBn8xxqI4BzqmPNlYbGyszYKe/7QQETBC YIkNlzgjuovAoYjY2SVS9w05/Iorvb2FUyCeJyMMuL/VrEK17Y2PmexdNCm+8qFF7qGl8K cVh218lLQrmYGZduzvjyn4F2lDKuVF7Mz4V2oTXDYJdZINisY+OdaBSwKbnkynAXHolfeS PKaQ0yeD/sy52a9jAa7CYmlFUWKK90MRbK5KgqkX3iceK4S+pRgrj2w1AI4NQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432560; a=rsa-sha256; cv=none; b=JYt9U3ZC7zengpK/d9icHkOf0uouq83CCGc//emyDEyFl1PTrkGYmpdztYpPNJJxm6JXIK bvGTYCRT4k2GEJVF/cUgDoS7fjCE2QxoCwFbB6YAKMW7TVkU/FK61CHv6i9FrU6cfbto7o pCZr9Xq+GmPQNw4Cd/WoIDj/YGD6+CxQcrvY7CwnbGjg5VXt4Ak+ZDvs//CfmU4MXnQ9bS 4Esp00jC5FEEqDtY7nzpauG1gcwd1gmiTBn0OuKa2m7Je69/eFi/JG4g1X8C7tjQZUmDqP zfPtlbsRemPCDQ+3lQm1O5/hvB7I7XTmCpobBT75FqIkkfI4yVxrec7iNUrtAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9T0c5ThszbyT; Tue, 18 Nov 2025 02:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2MeLb020950; Tue, 18 Nov 2025 02:22:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2MeDu020947; Tue, 18 Nov 2025 02:22:40 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:22:40 GMT Message-Id: <202511180222.5AI2MeDu020947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0f4c3dcd1e07 - releng/15.0 - GCE: Add /usr/src and /usr/ports to METALOG List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 0f4c3dcd1e0761781e5636272caeb5d50fef3e0b Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0f4c3dcd1e0761781e5636272caeb5d50fef3e0b commit 0f4c3dcd1e0761781e5636272caeb5d50fef3e0b Author: Colin Percival AuthorDate: 2025-11-18 01:02:47 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:20:35 +0000 GCE: Add /usr/src and /usr/ports to METALOG We ship these in order to comply with GCE Marketplace rules about providing source code and licenses for all the software we ship as part of images. Approved by: re (cperciva) Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53796 (cherry picked from commit 0dbb00733c4a177a9a22d61a627d377d0876ea16) (cherry picked from commit 10ef3bf823c5d5db0303eb1552f1faa47cb0e58c) --- release/tools/gce.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 78511dbc66c9..c1e129ba69d6 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -98,6 +98,10 @@ EOF # the image. if [ -e "${DESTDIR}/../ftp/src.txz" ]; then tar fxJ ${DESTDIR}/../ftp/src.txz -C ${DESTDIR} + ( cd ${DESTDIR} && find ./usr/src ) | + while read P; do + metalog_add_data ${P} + done fi if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR} @@ -108,6 +112,10 @@ EOF DISABLE_VULNERABILITIES=YES \ I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES done + ( cd ${DESTDIR} && find ./usr/ports ) | + while read P; do + metalog_add_data ${P} + done fi ## XXX: Verify this is needed. I do not see this requirement From nobody Tue Nov 18 02:22:41 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9T0f29cFz6HQgh; Tue, 18 Nov 2025 02:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9T0d6cbSz3S5J; Tue, 18 Nov 2025 02:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ohHUHPoanQY+sjqMG5vWUp/tc7nFc9tMJYtAnQifU7M=; b=mRaL9XE8X0+56i5F2g2XFrX8cyXGKeHon92hi0WrGexvmiHz1VxsjdCDURF5TUBeqRgi9r NCZwUML476tEpuyyOWV0usXpwD1RPMQTR3x9Gp23a/fnUmgGnz9C7erIse1r77BQBTpz64 skRJHbmnVpzK99rF9XbAvxEpefm6xrCKGs23nkPD2HvHyHKYRTEGfZgBsmT3ozdLYs/xoY bxeqbfJH8bxmn9TcnpQLH13nUhHR5mUjj2ctpZtriMwrLf+lbz5eVRi9tj69mwShZraeKK e4VtP0HefY/f6wKH6lq+akUfg3pvF3wTHj3Ahm+f3IVs+WzlusvpqNBvFZRVqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ohHUHPoanQY+sjqMG5vWUp/tc7nFc9tMJYtAnQifU7M=; b=blakksq7j4BJdZ4uGR32yprCr7142xfVuVult344CH0FM8dGZw7OwVa7gjxGDyKKOY+Hyu NDjw7r3AV+TOIHEXFlLtRUP+UKXKBJQvZzLtVbwAZGnH1b6o5HOZ1MyFEhEbvny0LphdIw 1wIyntDDWS1YBW7EinOsa11G+ZxKfhTOoUMkf12m8rsvSoQmNRh7TJ5wLrQdFTI0pu1M/P j8YpVdszIraVW4JxwnLht1VM++ok/bvH3nHg1gGEj7Xw/5ZjbwVuHHBRKywvCo/i6mZfox g2fJkn/IxWbdI5NRGJr60WwThw+qyED+reRSuiVoW5KzwS2zxcWaoHidk5+i3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432562; a=rsa-sha256; cv=none; b=ejEycaaZ19yihmXSzmO2sYmPewOagksNH7m0tmV6ZLKh6gTeC3HHlEu3sxQt1lprYn3a3E zk5TfqELqJIlrS0IHawe1V1FdWCd0OWheTjOwJfgX2xQDc62kofljLMsG5dMSX/xJAPfXs G6XjLwx6+J7ifDRjGSQGBLHvEqWdzq4dnWEKdsBN2P+vZFIgKoQlkTKxy2Rdaa6GpPlRR5 5El+0B5iPSkZfC5SliGojKXvzugJ0gRBpqDVNppm2fyKgDJQAbOg50z1jjvroLdJUk3LaM MuO8n0cdUpzR1I7cxCwN4hwOhS+tqQJ1mnVJIOaYnmsBJXOkK+8yN01nTx9yYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9T0d669szbyK; Tue, 18 Nov 2025 02:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2Mf5S020986; Tue, 18 Nov 2025 02:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2Mfqn020983; Tue, 18 Nov 2025 02:22:41 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:22:41 GMT Message-Id: <202511180222.5AI2Mfqn020983@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f66279332f7c - releng/15.0 - release: Add a MISSING_METALOGS hack to VMs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f66279332f7c571f62d616469e78a4341eb125ff Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f66279332f7c571f62d616469e78a4341eb125ff commit f66279332f7c571f62d616469e78a4341eb125ff Author: Colin Percival AuthorDate: 2025-11-18 01:04:55 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:20:38 +0000 release: Add a MISSING_METALOGS hack to VMs The packages for 15.0-RELEASE built without the bug fix needed to make files created via @sample get properly listed in METALOG. Fix the cloudware which contain @sample-using packages by adding the necessary files to METALOG manually. This should be reverted after the next full package build, and live on only in releng/15.0. Approved by: re (cperciva) Reviewed by: markj MFC after: immediately (15.0-RC2) Differential Revision: https://reviews.freebsd.org/D53797 (cherry picked from commit f6e9474ebdd53de5cf487c7bc9e0fa6743881c23) (cherry picked from commit 96468730a2fad1eaaf65367bcec5106378cbf3d1) --- release/tools/azure.conf | 10 ++++++++++ release/tools/ec2-cloud-init.conf | 12 ++++++++++++ release/tools/gce.conf | 10 ++++++++++ release/tools/oracle.conf | 13 +++++++++++++ release/tools/vmimage.subr | 10 ++++++++++ 5 files changed, 55 insertions(+) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7975e1db0822..981e40566a1c 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -18,6 +18,16 @@ export NOSWAP=YES # https://learn.microsoft.com/en-us/partner-center/marketplace/azure-vm-certification-faq#vm-images-must-have-1-mb-of-free-space export VM_BOOTPARTSOFFSET=1M +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/pam.d/sudo +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/waagent.conf +" + vm_extra_pre_umount() { # Remove the pkg package and repo databases as they will likely # be out of date by the time the image is used. In unprivileged diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf index 2a15ae5c57d8..8ad86a082260 100644 --- a/release/tools/ec2-cloud-init.conf +++ b/release/tools/ec2-cloud-init.conf @@ -9,6 +9,18 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent net/cloud-init" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} cloudinit sshd" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/cloud/cloud.cfg +./usr/local/etc/cloud/cloud.cfg.d/05_logging.cfg +./usr/local/etc/cloud/cloud.cfg.d/99_freebsd.cfg +./usr/local/etc/pam.d/sudo +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +" + vm_extra_pre_umount() { # Configuration common to all EC2 AMIs ec2_common diff --git a/release/tools/gce.conf b/release/tools/gce.conf index c1e129ba69d6..558641821b16 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -17,6 +17,16 @@ export VM_RC_LIST="ntpd sshd growfs \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/instance_configs.cfg.distro +./usr/local/etc/pam.d/sudo +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +./usr/local/etc/syslog.d/90-google.conf +" + vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf diff --git a/release/tools/oracle.conf b/release/tools/oracle.conf index ebda3b3d6e61..152c48af1829 100644 --- a/release/tools/oracle.conf +++ b/release/tools/oracle.conf @@ -39,6 +39,19 @@ export VM_RC_LIST=" sshd zfs" +# Hack for FreeBSD 15.0; should go away before 15.1. +MISSING_METALOGS=" +./usr/local/etc/cloud/cloud.cfg +./usr/local/etc/cloud/cloud.cfg.d/05_logging.cfg +./usr/local/etc/cloud/cloud.cfg.d/99_freebsd.cfg +./usr/local/etc/pam.d/sudo +./usr/local/etc/rsync/rsyncd.conf +./usr/local/etc/ssl/cert.pem +./usr/local/etc/sudo.conf +./usr/local/etc/sudo_logsrvd.conf +./usr/local/etc/sudoers +" + vm_extra_pre_umount() { cat <<-'EOF' >> ${DESTDIR}/etc/rc.conf dumpdev=AUTO diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index d718150d8767..0ca9ba267ce0 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -334,6 +334,16 @@ buildfs() { metalog_add_data ./var/db/services.db fi + if [ -n "${MISSING_METALOGS}" ]; then + # Hack to allow VM configurations to add files which + # weren't being added to METALOG appropriately. This + # is mainly a workaround for the @sample bug and it + # should go away before FreeBSD 15.1 ships. + for P in ${MISSING_METALOGS}; do + metalog_add_data ${P} + done + fi + # Sort METALOG file; makefs produces directories with 000 permissions # if their contents are seen before the directories themselves. env -i LC_COLLATE=C sort -u ${DESTDIR}/METALOG > ${DESTDIR}/METALOG.sorted From nobody Tue Nov 18 02:22:42 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9T0g2Yybz6HQYd; Tue, 18 Nov 2025 02:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9T0g00Nkz3S5V; Tue, 18 Nov 2025 02:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ZpZlwGgwTjgI+jCmQs6I8omNPqoSUvQbvPcT2VzDSU=; b=CZJpBqTa684WbVKov1BRzyfrlUJLbbU5KbjE6A96Lx8ax74Ill0I5dnilD0sOp5pZm+57k eYbMzP4jt8Sr068fClyVhRJ4Sy/8axxq/uPIYK+vPiFNAy1tHeZTgf0qEHf/tLVkrEbaJI RnA9sgSZCk8bQjx8wuzuB5h0k9rRMjOP/qOvwR33Ewq9mmFzd5vObOEPDtu8B9dVpGU1Qs LUjngSUXZPNi4LIoQwTSO/Onipn54jWnSSxg7zCHkRxH2/SVSAuI/5o5rCT4Q2l04QoilN /GLhN4CWWoXIlXcBUr8+ZhlXVEmCnnCIhEtd4xyUhzjIXa/Md0eXEDstQ9XdgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763432563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ZpZlwGgwTjgI+jCmQs6I8omNPqoSUvQbvPcT2VzDSU=; b=LpiyhEYurgb3BoImhUk2MtNsjM6XI0x0KU+mJApOmh9Yv9qiVZYqbFWFlpz2ob/FEChWGs p0B/vw7vAUq82BGbth0qTlvS93uLR3K3G17bkqOMyKRyatxDSX297suvpeSk1va3lJKdmE zvcggIQiPjCCGRA4PsOHeemyPJwZWuIX+LSndmWJ0mJKweGToQBNAYZf3P1j6wZnzGben+ 4DCOJv3g6gsgsWlx5tqmPodcM2hL7OWXT0oSt96JuaY/qF+3xtUMKzaIGcol1VbkiyIUnn NP3p7ZvAmPLPjz+qaqJhRL+nIYPKaqmEeIdjnitdHeMbM+GZTCV+kkPdSLYwdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763432563; a=rsa-sha256; cv=none; b=rs6zjegj1+oBVFQ/63re+QGidZ/H7PJ0BFg7TgzB8TJazTG8XYgbNBgJEMKZffwiXUb4vo +Y6rWQblEXiSxly+fcLUByci2OlOc4pLb9+dxAhOl/YGJlAxo5JX5v+ClyKLb5CAyPw3tp g0TxSr6XyJxCe1N0a3EoNUX8sh52IrCwI+4mnPQTAhgti3Q272XXYYaboiaNzBVphCOBGB tzjdUBV9JfrxXO+D/Gxm25kJpRq5AXHkyNgSm3+EuF2hjlCmEmeooe+NOGWhovgg+BCQp4 K8d5c/Sz+oFM94pe+DRS/HXJlyH/s5VvE3nPTQ+pk5Ju/CRKk0qYTBvI8eH+iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9T0f6byYzbVv; Tue, 18 Nov 2025 02:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI2MgKc021023; Tue, 18 Nov 2025 02:22:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI2Mgx8021020; Tue, 18 Nov 2025 02:22:42 GMT (envelope-from git) Date: Tue, 18 Nov 2025 02:22:42 GMT Message-Id: <202511180222.5AI2Mgx8021020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 7bd80d8ee020 - releng/15.0 - 15.0: Update to RC2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 7bd80d8ee020ea79fd148f11f295a342b96dcc89 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7bd80d8ee020ea79fd148f11f295a342b96dcc89 commit 7bd80d8ee020ea79fd148f11f295a342b96dcc89 Author: Colin Percival AuthorDate: 2025-11-18 02:22:00 +0000 Commit: Colin Percival CommitDate: 2025-11-18 02:22:00 +0000 15.0: Update to RC2 Approved by: re (implicit) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 5f5224975735..d04589d00eb3 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -51,7 +51,7 @@ TYPE="FreeBSD" REVISION="15.0" -BRANCH="RC1" +BRANCH="RC2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Nov 18 03:37:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9Vg05MBHz6HWW3; Tue, 18 Nov 2025 03:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Vg04Zpwz3ZRW; Tue, 18 Nov 2025 03:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyTqL0USKBoz7Hkvxljp7nGRxx+vJ2zMSh3qlYbwe3c=; b=pKCGDtbt9s7mtpFc//bAArXywGCcCFE6sc2+FtQE10rdB5KCtk6RjkQBWbotffyMZLl8nA 5C+cB7mWgQ09TruRgQvP/MYDExr2x0h0beIu8Yf8yxEMmsMjLTqgYf+IvvAZbXHQfV0xvI OH8HtcfGXRGu0zlSeVtlxupUrYq7MdwRB+l0uHG+sOl5mGEn2HwF7nCa+a4taRwutpGU01 JsoApinKBmH3oE2JJMZHTvlFPVYpyZQmttdNgtH+XZErQURpfX1h7bD/9XFxBwZrCmKui+ esTczWReJCLF1XMr/+X8tlr5xBNmHNAfp5Z49uLAR3U7T/OywZNn4uZawTk8/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyTqL0USKBoz7Hkvxljp7nGRxx+vJ2zMSh3qlYbwe3c=; b=sOpWa+8Q8CmrqXxSTnk8LG4Bf1C+UwYKrmGBxa3lCyM65mnUTC2e2TlsJPllJPyE9tMA7F Fh5RpYP3gcZxYHOTuvd79XGDEmn3Vyfma2PopS1sE3osrh9ov10yunDyQset5WMhbOrXP+ rRJza06pbRhEwsUJukRro8G6etBeFDKDePGmKUyga58v76uvgf4jHAUo5PBdEbs6c3ekMH 3Zo+JVHgORNaSOgqEV4NEAHchty19Oi0JqoPeQjGnl5CvhPTrUJZwfxpPIQO9o4CeJ3NfD UiSSV5732a5RRMChIIO5dRePjT47bEO7H3XYh3/xfhmmUT7qiKCQ9fpBTrF48g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763437052; a=rsa-sha256; cv=none; b=BHlN0onoji5lGQphIXUjwXhK4NYeaih7jP7xOzrL2mXX2fWEdChacSekUUfGBdseaXaIZm cINT0/tmHsF5j3wabjANHM83uOo+nm16N1/tk7c0mC5qvBXoitEhjI6Jb2UB6fqDOd/t+e f/3Bg7xnnS/4GXj43Xz/c4gjFrRC2fJEpd42bEC3ObS6OKU36bNNyDxHPJG43jai7R7AUW uotgpwRYyv99vnq9XIm5ePN9vEqCooaZAlnYFitRJ8jEodJLICpShbNjFyH0d0tuAdfhaB bf7gketvLxTaOFNSomsbV2F+5v5awgNficRW8rmcNIoGnxiXB3LfBdrsaclOdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9Vg03lf9zdZP; Tue, 18 Nov 2025 03:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI3bWrX055306; Tue, 18 Nov 2025 03:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI3bW3x055304; Tue, 18 Nov 2025 03:37:32 GMT (envelope-from git) Date: Tue, 18 Nov 2025 03:37:32 GMT Message-Id: <202511180337.5AI3bW3x055304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 48c288443822 - stable/15 - kern_thread: thread_suspend_check(1) must never suspend List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 48c28844382229a7af24941541e89e663b38f75c Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=48c28844382229a7af24941541e89e663b38f75c commit 48c28844382229a7af24941541e89e663b38f75c Author: Konstantin Belousov AuthorDate: 2025-11-06 19:25:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-18 03:37:05 +0000 kern_thread: thread_suspend_check(1) must never suspend PR: 290843 (cherry picked from commit e1c6f4cb9bd29358c2b2fe249af9a2f9626b0670) --- sys/kern/kern_thread.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 3180c66cb42b..4f9053460455 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1446,6 +1446,14 @@ thread_suspend_check(int return_instead) return (TD_SBDRY_INTR(td) ? TD_SBDRY_ERRNO(td) : 0); } + /* + * We might get here with return_instead == 1 if + * other checks missed it. Then we must not suspend + * regardless of P_SHOULDSTOP() or debugger request. + */ + if (return_instead) + return (EINTR); + /* * If the process is waiting for us to exit, * this thread should just suicide. @@ -1481,10 +1489,9 @@ thread_suspend_check(int return_instead) * gets taken off all queues. */ thread_suspend_one(td); - if (return_instead == 0) { - p->p_boundary_count++; - td->td_flags |= TDF_BOUNDARY; - } + MPASS(!return_instead); + p->p_boundary_count++; + td->td_flags |= TDF_BOUNDARY; PROC_SUNLOCK(p); mi_switch(SW_INVOL | SWT_SUSPEND); PROC_LOCK(p); From nobody Tue Nov 18 03:38:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9VhW0jcRz6HWTJ; Tue, 18 Nov 2025 03:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9VhV6s67z3Zlf; Tue, 18 Nov 2025 03:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0uBYQqc1QQmd+b+S6jYzi4SzgLH+jTs9P8qVMulw+T8=; b=YhlcDoLkU2Tnq85ZD+KwpX4PIuBMm5oycrmJOY+03OXVXyyFu9lUE0iOkaReQ0WVAL+zR+ 55EIYVNs/hL3uqiskfzxaoF3JYq+ef7/ZKD18nEJF12fiqdUvqSljy1uF+9TNpg11N9DXl +IqSOprVCqDrtl544aj3aH2qb10cguzzisp1v3rlIN4gfdeJFT/r3io1FD8vtYNR/7GCYp PrDI5p0sAw2uoWQVNANHU5XeZt0bP5J7rbr+ZzYa3Sx1yRo1bW+okPpw6nGUAPt2m84d75 N1t/jv4OxlhfY0CdV4tpE0U3+d9MK9SROuSUi+rhNd76WaZ0hWyztL2OYZgu5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0uBYQqc1QQmd+b+S6jYzi4SzgLH+jTs9P8qVMulw+T8=; b=xEs2x6ItW6SIk3X3ZPYlK5Dy2iCpDNImgvQ35D19d5Sa4OFTugz0pmKtw+tW+CPAF7c/GQ FUb5FJNmjy1AuUabO6AGHBzZkqdU9Rlh04Uota2oPrlPWe/pF6VWZA9EyGBmJ77O+G0tb1 z1b+oRk31/+1EglP9hMLweusmzRquPh9FAXV1aJZ0dPyI4iKQXZ21iCyBZ1AAxf2emFIfE bjfPLaqixV/967Pog99NP5nBz1+De9nle7Pw1erntsXU0EqMKThqYnsAyXvFeC6vKEvmcA bRtnQ2CSdgEzr7hwAntAb5hnzCZr9LkURNrCsBZsAloo8D5pHa/IsbWVhx5swQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763437131; a=rsa-sha256; cv=none; b=mA34q0tcV09YhBwbSM9oKDo8WjGeTvoUQWTuorNqyAAbI7QxnraDj2wbmJ8SZdSzh4YBhD cYidVC1AqD5jKTtjE2sS0jQMU1sPMW4d9tJxtBH79PX3iAkCkB9bUTU0Gpn7IkTocVDIgg tPicIBsF6a4Ryq6zqhbkJZCRL+e3LPVpB4cjaP2XX3Qe0RCMEiEn6nukScnGJA3/zfN6/1 ExSzEEVu3GuiLwXZEC74xWgSWDJDNcKufrHzMMZGra8HWl/AHR8/IxzMXJ/qpvX+mq+bQ9 HserV02mnB0gx5IYuze4FGSeffL8KTTiJq0ppSQDOLW5ID6GYP6g+8WnhioWXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d9VhV6RSVzd5f; Tue, 18 Nov 2025 03:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI3co1c055825; Tue, 18 Nov 2025 03:38:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI3conO055822; Tue, 18 Nov 2025 03:38:50 GMT (envelope-from git) Date: Tue, 18 Nov 2025 03:38:50 GMT Message-Id: <202511180338.5AI3conO055822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f363f4a8fa8b - stable/14 - kern_thread: thread_suspend_check(1) must never suspend List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f363f4a8fa8b7d7beb79d2f6f70479aad30e7d6f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f363f4a8fa8b7d7beb79d2f6f70479aad30e7d6f commit f363f4a8fa8b7d7beb79d2f6f70479aad30e7d6f Author: Konstantin Belousov AuthorDate: 2025-11-06 19:25:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-18 03:38:29 +0000 kern_thread: thread_suspend_check(1) must never suspend PR: 290843 (cherry picked from commit e1c6f4cb9bd29358c2b2fe249af9a2f9626b0670) --- sys/kern/kern_thread.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index a41e74e1533e..bd81b7472579 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1451,6 +1451,14 @@ thread_suspend_check(int return_instead) return (TD_SBDRY_INTR(td) ? TD_SBDRY_ERRNO(td) : 0); } + /* + * We might get here with return_instead == 1 if + * other checks missed it. Then we must not suspend + * regardless of P_SHOULDSTOP() or debugger request. + */ + if (return_instead) + return (EINTR); + /* * If the process is waiting for us to exit, * this thread should just suicide. @@ -1488,10 +1496,9 @@ thread_suspend_check(int return_instead) * gets taken off all queues. */ thread_suspend_one(td); - if (return_instead == 0) { - p->p_boundary_count++; - td->td_flags |= TDF_BOUNDARY; - } + MPASS(!return_instead); + p->p_boundary_count++; + td->td_flags |= TDF_BOUNDARY; PROC_SUNLOCK(p); mi_switch(SW_INVOL | SWT_SUSPEND); PROC_LOCK(p); From nobody Tue Nov 18 12:58:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9l6h5fwqz6H5jZ for ; Tue, 18 Nov 2025 12:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9l6h3hLjz3gpl for ; Tue, 18 Nov 2025 12:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qtcqyzCt7xtCaosDO5cGzEmpBq9L459PwHyNGnhP568=; b=tLt/kFFzVFa6L9KzcNHmYSxYYqzY5SZO/HDUfrhgEfxZAnKoq7fPVe2wAPuP7pGLcwY5hc QM1FcfK2tuYg3TCrRz9qFNHXD2SALgZIht1af/NHvp4g0mME9UOm/tx6wf3w0MLTWzKpH8 JUPgBUQbqLNT5UiBk2WxCycHGLMtMLuTSeDC2tzlbEeTi26ZQyeDsYeBl4RtD4WWD6tp8s TIof2cnmbgZCBHKoQ0ZrhOCu1hMqK6fFY5Vt47GCtKMs6yymXuXp1ypr1FiapkhY2kA04w 0vCswAbDKVb3CIgZ/owkazQJD2A/rEtw4UHjSV3sUtKFvSF3am56iVQkhIyasQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qtcqyzCt7xtCaosDO5cGzEmpBq9L459PwHyNGnhP568=; b=d9XTOf89sROobAGCNF3Q7AtnnsdrHiKnPBqd01TJ56NLEaOjAB9YvR9YLBlXJbqV+jMzHv JbbPeAN1I2oNoxuHozqWFJFhgY9x3ssRhilnL+mOYHz5/mGazHxo6ua00hE2D5CVnAlwK2 orbjRzMG7xbGVfPAxlBd1CO8/ePdFRA/p7YbtZKtZQ+vBmVQd+kft+K+T8UBTNJmlTU5Mz NBmYZYStdkKhR9gp8k+oCesPDdKaHLaGZznuD6iLUDly4aa9ajIeTbcbHNZgnIzLdvOhdm QuFVd5A8B0geawon2qhcn4tzSbyZCS5W34s0OoIW1BeiSeVKjxj5ZIL0ukTE3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763470732; a=rsa-sha256; cv=none; b=uvnFJn2bT5t17gQSwA+pN8oFc6iaZT/2tyDw/ghQx9DhvYUk8sTHMe04ji+wmJO3yU4U5A rlLHHNdWt9DfjIPHhtkQvbdHDXuMr48T3RlMdu/tYCNt8R5ZSyKgCAhQtGNEM4hlNnCuLx VKiDuv2huvqdTKJsN70e9YF/zVVibnVqluT8vYlOesBEsUP7v9iDuGhOGg3Om7OmUltybg e94vLS7vF05ulsEU/w4iTFTV3/VNPMUtPOiy3Efa/ER6DX7Nrc7EbqUnmNbytG4oZ+gSEp LGD8oo92C+6E78GmtSfq4C3M8hv+jTume0xHACqi2f9jArlet3gwONeKfeVyVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9l6h2y1Wzvl6 for ; Tue, 18 Nov 2025 12:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c400 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 12:58:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 155d5b8a19ba - stable/15 - zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 155d5b8a19baa864ebe9d8346d932bd04ea23aca Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 12:58:51 +0000 Message-Id: <691c6d8b.2c400.75b41508@gitrepo.freebsd.org> The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=155d5b8a19baa864ebe9d8346d932bd04ea23aca commit 155d5b8a19baa864ebe9d8346d932bd04ea23aca Merge: 48c288443822 099f69ff5d3d Author: Martin Matuska AuthorDate: 2025-11-18 11:44:03 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 11:44:03 +0000 zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15 OpenZFS 2.4.0 rc4 Notable upstream pull request merges: #17477 1e8c96d7d Add knob to disable slow io notifications #17792 5582e8b08 Update dnode_next_offset_level to accept blkid instead of offset #17872 584762617 Pass flags to more DMU write/hold functions #17875 178a8be21 BRT: Round bv_entcount up to BRT_BLOCKSIZE #17875 e3acd0a72 Fix caching of DDT log and BRT #17877 67fc49433 Cleanup ZIO_FLAG_IO_RETRY vs TRYHARD usage #17824 dda711dbb Fix gang write late_arrival bug #17890 41878d57e Add BRT support to zpool prefetch command #17903 aaf374bd4 ZIO: Set minimum number of free issue threads to 32 #17906 ac0bc4cc0 spa_misc: add an API for spa_namespace_lock #17908 583db4003 FreeBSD: Add support for _PC_CASE_INSENSITIVE #17911 -multiple Update library ABI versions for v2.4.0 #17915 e305c7d59 BRT: Fix ranges to blocks conversion math #17916 002bc3da6 BRT: Increase block size from 4KB to 8KB #17921 e895c7619 ZAP: Remove dmu_object_info_from_dnode() call Obtained from: OpenZFS OpenZFS commit: 099f69ff5d3df7988632039db7ad6d183eb34042 OpenZFS tag: zfs-2.4.0-rc4 .../.github/workflows/scripts/generate-ci-type.py | 10 +- .../.github/workflows/scripts/qemu-2-start.sh | 20 +- .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 38 ++- sys/contrib/openzfs/.mailmap | 8 + sys/contrib/openzfs/AUTHORS | 14 + sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/README.md | 2 +- sys/contrib/openzfs/autogen.sh | 61 +---- sys/contrib/openzfs/cmd/zdb/zdb.c | 8 +- sys/contrib/openzfs/cmd/zfs/zfs_project.c | 36 ++- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 34 ++- sys/contrib/openzfs/cmd/ztest.c | 39 +-- sys/contrib/openzfs/config/deb.am | 8 +- sys/contrib/openzfs/contrib/debian/Makefile.am | 8 +- sys/contrib/openzfs/contrib/debian/clean | 4 +- sys/contrib/openzfs/contrib/debian/control | 26 +- .../{openzfs-libzfs6.docs => openzfs-libzfs7.docs} | 0 ...bzfs6.install.in => openzfs-libzfs7.install.in} | 0 ...enzfs-libzpool6.docs => openzfs-libzpool7.docs} | 0 ...ol6.install.in => openzfs-libzpool7.install.in} | 0 .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + sys/contrib/openzfs/include/sys/brt.h | 1 + sys/contrib/openzfs/include/sys/brt_impl.h | 2 +- sys/contrib/openzfs/include/sys/dmu.h | 8 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 4 +- sys/contrib/openzfs/include/sys/spa.h | 14 +- sys/contrib/openzfs/include/sys/vdev_impl.h | 1 + sys/contrib/openzfs/include/sys/zfs_project.h | 10 +- sys/contrib/openzfs/lib/libnvpair/Makefile.am | 2 +- sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/include/os/linux/sys/vfs.h | 33 +++ .../openzfs/lib/libspl/include/sys/tunables.h | 12 +- sys/contrib/openzfs/lib/libuutil/libuutil.abi | 69 ----- sys/contrib/openzfs/lib/libzfs/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 83 +----- sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 2 + sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 8 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 5 +- .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c | 37 +++ .../openzfs/lib/libzfs_core/libzfs_core.abi | 70 +---- .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi | 2 +- sys/contrib/openzfs/lib/libzpool/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzpool/kernel.c | 4 +- sys/contrib/openzfs/man/man4/zfs.4 | 42 ++- sys/contrib/openzfs/man/man7/vdevprops.7 | 8 +- sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 5 + sys/contrib/openzfs/man/man8/zfs-jail.8 | 79 +++--- sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 22 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 73 ++++-- sys/contrib/openzfs/man/man8/zpool-prefetch.8 | 27 +- sys/contrib/openzfs/module/Kbuild.in | 3 +- sys/contrib/openzfs/module/Makefile.bsd | 24 -- sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 5 +- sys/contrib/openzfs/module/os/freebsd/zfs/spa_os.c | 10 +- .../openzfs/module/os/freebsd/zfs/vdev_label_os.c | 8 +- .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 20 +- .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 2 + .../openzfs/module/os/freebsd/zfs/zvol_os.c | 12 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 3 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 93 +++++-- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 6 +- sys/contrib/openzfs/module/zcommon/zpool_prop.c | 3 + sys/contrib/openzfs/module/zfs/arc.c | 8 +- sys/contrib/openzfs/module/zfs/bpobj.c | 7 +- sys/contrib/openzfs/module/zfs/bptree.c | 9 +- sys/contrib/openzfs/module/zfs/brt.c | 48 +++- sys/contrib/openzfs/module/zfs/dbuf.c | 5 +- sys/contrib/openzfs/module/zfs/ddt_log.c | 7 +- sys/contrib/openzfs/module/zfs/dmu.c | 27 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 6 +- sys/contrib/openzfs/module/zfs/dnode.c | 156 +++++------- sys/contrib/openzfs/module/zfs/metaslab.c | 8 +- sys/contrib/openzfs/module/zfs/mmp.c | 4 +- sys/contrib/openzfs/module/zfs/spa.c | 281 +++++++++++++-------- sys/contrib/openzfs/module/zfs/spa_checkpoint.c | 2 +- sys/contrib/openzfs/module/zfs/spa_config.c | 8 +- sys/contrib/openzfs/module/zfs/spa_history.c | 5 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 110 +++++--- sys/contrib/openzfs/module/zfs/space_map.c | 2 +- sys/contrib/openzfs/module/zfs/vdev.c | 86 +++++-- .../openzfs/module/zfs/vdev_indirect_births.c | 2 +- .../openzfs/module/zfs/vdev_indirect_mapping.c | 5 +- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 8 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 33 +-- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 4 +- sys/contrib/openzfs/module/zfs/vdev_removal.c | 20 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 12 +- sys/contrib/openzfs/module/zfs/zap_micro.c | 4 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 9 +- sys/contrib/openzfs/module/zfs/zfs_fuid.c | 2 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 41 +-- sys/contrib/openzfs/module/zfs/zio.c | 13 +- sys/contrib/openzfs/module/zfs/zio_inject.c | 8 +- sys/contrib/openzfs/module/zfs/zvol.c | 9 +- .../openzfs/module/zstd/include/aarch64_compat.h | 38 --- .../openzfs/module/zstd/lib/common/compiler.h | 3 - .../openzfs/module/zstd/lib/common/zstd_internal.h | 9 + sys/contrib/openzfs/rpm/generic/zfs.spec.in | 44 ++-- sys/contrib/openzfs/scripts/Makefile.am | 4 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 4 + sys/contrib/openzfs/scripts/zfs2zol-patch.sed | 32 --- sys/contrib/openzfs/scripts/zol2zfs-patch.sed | 20 -- sys/contrib/openzfs/tests/runfiles/common.run | 2 +- .../tests/test-runner/bin/test-runner.py.in | 33 ++- .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + .../zpool_prefetch/zpool_prefetch_001_pos.ksh | 12 +- .../zpool_prefetch/zpool_prefetch_002_pos.ksh | 95 +++++++ .../tests/functional/events/zed_slow_io.ksh | 44 +++- .../tests/functional/trim/autotrim_config.ksh | 2 +- 115 files changed, 1386 insertions(+), 1059 deletions(-) diff --cc sys/contrib/openzfs/.mailmap index e6f09c6c9d43,000000000000..3397fbc3745d mode 100644,000000..100644 --- a/sys/contrib/openzfs/.mailmap +++ b/sys/contrib/openzfs/.mailmap @@@ -1,229 -1,0 +1,237 @@@ +# This file maps the name+email seen in a commit back to a canonical +# name+email. Git will replace the commit name/email with the canonical version +# wherever it sees it. +# +# If there is a commit in the history with a "wrong" name or email, list it +# here. If you regularly commit with an alternate name or email address and +# would like to ensure that you are always listed consistently in the repo, add +# mapping here. +# +# On the other hand, if you use multiple names or email addresses legitimately +# (eg you use a company email address for your paid OpenZFS work, and a +# personal address for your evening side projects), then don't map one to the +# other here. +# +# The most common formats are: +# +# Canonical Name +# Canonical Name +# Canonical Name Commit Name +# +# See https://git-scm.com/docs/gitmailmap for more info. + +# These maps are making names consistent where they have varied but the email +# address has never changed. In most cases, the full name is in the +# Signed-off-by of a commit with a matching author. +Achill Gilgenast +Ahelenia Ziemiańska +Ahelenia Ziemiańska +Alex John +Andreas Dilger +Andrew Walker +Benedikt Neuffer +Chengfei Zhu +ChenHao Lu <18302010006@fudan.edu.cn> +Chris Lindee +Colm Buckley +Crag Wang +Damian Szuberski +Daniel Kolesa +Debabrata Banerjee +Diwakar Kristappagari +Finix Yan +Gaurav Kumar +Gionatan Danti +Glenn Washburn +Gordan Bobic +Gregory Bartholomew +hedong zhang +Ilkka Sovanto +InsanePrawn +Jason Cohen +Jason Harmening +Jeremy Faulkner +Jinshan Xiong +John Poduska ++Jo Zzsi +Justin Scholz +Ka Ho Ng +Kash Pande +Kay Pedersen +KernelOfTruth +Liu Hua +Liu Qing +loli10K +Mart Frauenlob +Matthias Blankertz +Michael Gmelin +Olivier Mazouffre +Piotr Kubaj +Quentin Zdanis ++Roberto Ricci +Roberto Ricci +Rob Norris +Rob Norris +Sam Lunt +Sanjeev Bagewadi +Sebastian Wuerl +SHENGYI HONG +Stoiko Ivanov +Tamas TEVESZ +WHR +Yanping Gao +Youzhong Yang + +# Signed-off-by: overriding Author: +Alexander Ziaee +Felix Schmidt ++Jean-Sébastien Pédron ++Konstantin Belousov +Olivier Certner ++Patrick Xia +Phil Sutter +poscat +Qiuhao Chen +Ryan +Sietse +Yuxin Wang +Zhenlei Huang + +# Commits from strange places, long ago +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Herb Wartens +Ned Bass +Tulsi Jain + +# Mappings from Github no-reply addresses +ajs124 +Alek Pinchuk +Aleksandr Liber <61714074+AleksandrLiber@users.noreply.github.com> +Alexander Lobakin +Alexey Smirnoff +Allen Holl <65494904+allen-4@users.noreply.github.com> +Alphan Yılmaz +Ameer Hamza <106930537+ixhamza@users.noreply.github.com> +Andrew J. Hesford <48421688+ahesford@users.noreply.github.com>> +Andrew Sun +Aron Xu +Arun KV <65647132+arun-kv@users.noreply.github.com> +Ben Wolsieffer +bernie1995 <42413912+bernie1995@users.noreply.github.com> +Bojan Novković <72801811+bnovkov@users.noreply.github.com> +Boris Protopopov +Brad Forschinger +Brandon Thetford +buzzingwires <131118055+buzzingwires@users.noreply.github.com> +Cedric Maunoury <38213715+cedricmaunoury@users.noreply.github.com> +Charles Suh +Chris Peredun <126915832+chrisperedun@users.noreply.github.com> ++classabbyamp <5366828+classabbyamp@users.noreply.github.com> +Dacian Reece-Stremtan <35844628+dacianstremtan@users.noreply.github.com> +Damian Szuberski <30863496+szubersk@users.noreply.github.com> +Daniel Hiepler <32984777+heeplr@users.noreply.github.com> +Daniel Kobras +Daniel Reichelt +David Quigley +Dennis R. Friedrichsen <31087738+dennisfriedrichsen@users.noreply.github.com> +Dex Wood +DHE +Dmitri John Ledkov <19779+xnox@users.noreply.github.com> +Dries Michiels <32487486+driesmp@users.noreply.github.com> +Edmund Nadolski <137826107+ednadolski-ix@users.noreply.github.com> +Érico Nogueira <34201958+ericonr@users.noreply.github.com> +Fedor Uporov <60701163+fuporovvStack@users.noreply.github.com> +Felix Dörre +Felix Neumärker <34678034+xdch47@users.noreply.github.com> +Finix Yan +Friedrich Weber <56110206+frwbr@users.noreply.github.com> +Gaurav Kumar +George Gaydarov +Georgy Yakovlev <168902+gyakovlev@users.noreply.github.com> +Gerardwx +Germano Massullo +Gian-Carlo DeFazio +Giuseppe Di Natale +Hajo Möller +Harry Mallon <1816667+hjmallon@users.noreply.github.com> +Hiếu Lê +Jake Howard +James Cowgill +Jaron Kent-Dobias +Jason King +Jeff Dike <52420226+jdike@users.noreply.github.com> +Jitendra Patidar <53164267+jsai20@users.noreply.github.com> +João Carlos Mendes Luís +John Eismeier <32205350+jeis2497052@users.noreply.github.com> +John L. Hammond <35266395+jhammond-intel@users.noreply.github.com> +John-Mark Gurney +John Ramsden +Jonathon Fernyhough <559369+jonathonf@users.noreply.github.com> +Jose Luis Duran +Justin Hibbits +Kaitlin Hoang +Kevin Greene <104801862+kxgreene@users.noreply.github.com> +Kevin Jin <33590050+jxdking@users.noreply.github.com> +Kevin P. Fleming +Krzysztof Piecuch <3964215+pikrzysztof@users.noreply.github.com> +Kyle Evans +Laurențiu Nicola +loli10K +Lorenz Hüdepohl +Luís Henriques <73643340+lumigch@users.noreply.github.com> +Marcin Skarbek +Matt Fiddaman <81489167+matt-fidd@users.noreply.github.com> +Maxim Filimonov +Max Zettlmeißl <6818198+maxz@users.noreply.github.com> +Michael Niewöhner +Michael Zhivich <33133421+mzhivich@users.noreply.github.com> +MigeljanImeri <78048439+MigeljanImeri@users.noreply.github.com> +Mo Zhou <5723047+cdluminate@users.noreply.github.com> ++nav1s <42621369+nav1s@users.noreply.github.com> +Nick Mattis +omni <79493359+omnivagant@users.noreply.github.com> +Pablo Correa Gómez <32678034+pablofsf@users.noreply.github.com> +Paul Zuchowski <31706010+PaulZ-98@users.noreply.github.com> +Peter Ashford +Peter Dave Hello +Peter Wirdemo <4224155+pewo@users.noreply.github.com> +Petros Koutoupis +Ping Huang <101400146+hpingfs@users.noreply.github.com> +Piotr P. Stefaniak +Richard Allen <33836503+belperite@users.noreply.github.com> +Rich Ercolani <214141+rincebrain@users.noreply.github.com> +Rick Macklem <64620010+rmacklem@users.noreply.github.com> +Rob Wing <98866084+rob-wing@users.noreply.github.com> +Roman Strashkin +Ryan Hirasaki <4690732+RyanHir@users.noreply.github.com> +Samuel Wycliffe J <115969550+samwyc@users.noreply.github.com> +Samuel Wycliffe <50765275+npc203@users.noreply.github.com> +Savyasachee Jha +Scott Colby +Sean Eric Fagan ++Shreshth Srivastava <66148173+Shreshth3@users.noreply.github.com> +Spencer Kinny <30333052+Spencer-Kinny@users.noreply.github.com> +Srikanth N S <75025422+nssrikanth@users.noreply.github.com> +Stefan Lendl <1321542+stfl@users.noreply.github.com> +Thomas Bertschinger <101425190+bertschinger@users.noreply.github.com> +Thomas Geppert +Tim Crawford +Todd Seidelmann <18294602+seidelma@users.noreply.github.com> +Tom Matthews +Tony Perkins <62951051+tony-zfs@users.noreply.github.com> +Torsten Wörtwein +Tulsi Jain +Václav Skála <33496485+vaclavskala@users.noreply.github.com> +Vaibhav Bhanawat <88050553+vaibhav-delphix@users.noreply.github.com> +Vandana Rungta <46906819+vandanarungta@users.noreply.github.com> +Violet Purcell <66446404+vimproved@users.noreply.github.com> +Vipin Kumar Verma <75025470+vermavipinkumar@users.noreply.github.com> +Wolfgang Bumiller +XDTG <35128600+XDTG@users.noreply.github.com> +xtouqh <72357159+xtouqh@users.noreply.github.com> +Yuri Pankov <113725409+yuripv@users.noreply.github.com> +Yuri Pankov <82001006+yuripv@users.noreply.github.com> diff --cc sys/contrib/openzfs/README.md index a90736bb56b7,000000000000..a39b88fedd12 mode 100644,000000..100644 --- a/sys/contrib/openzfs/README.md +++ b/sys/contrib/openzfs/README.md @@@ -1,35 -1,0 +1,35 @@@ +![img](https://openzfs.github.io/openzfs-docs/_static/img/logo/480px-Open-ZFS-Secondary-Logo-Colour-halfsize.png) + +OpenZFS is an advanced file system and volume manager which was originally +developed for Solaris and is now maintained by the OpenZFS community. +This repository contains the code for running OpenZFS on Linux and FreeBSD. + +[![codecov](https://codecov.io/gh/openzfs/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/openzfs/zfs) +[![coverity](https://scan.coverity.com/projects/1973/badge.svg)](https://scan.coverity.com/projects/openzfs-zfs) + +# Official Resources + + * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo - * [ZoL Site](https://zfsonlinux.org) - Linux release info & links ++ * [ZoL site](https://zfsonlinux.org) - Linux release info & links + * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html) + * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc) + +# Installation + +Full documentation for installing OpenZFS on your favorite operating system can +be found at the [Getting Started Page](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html). + +# Contribute & Develop + +We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md). + +We have a [Code of Conduct](./CODE_OF_CONDUCT.md). + +# Release + +OpenZFS is released under a CDDL license. +For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197` + +# Supported Kernels + * The `META` file contains the officially recognized supported Linux kernel versions. + * Supported FreeBSD versions are any supported branches and releases starting from 13.0-RELEASE. diff --cc sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h index 000000000000,c7b567ff44a4..c7b567ff44a4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh index 000000000000,f34f8c36e592..f34f8c36e592 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh From nobody Tue Nov 18 12:58:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9l6j5ln4z6H5d1 for ; Tue, 18 Nov 2025 12:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9l6j3rq4z3gmS for ; Tue, 18 Nov 2025 12:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3IUofgEmudH20Qgg0cQtPIhPCi7/zS/xdmrO0rfFsQ=; b=aWE8qw/mUT5Ay9hQjhzdl2DNgtNl3WypLdUcMRjyDGJw/TNQ+wDclp/zACOc+kUeXe0r9o VqY9yZu0FMdHdrPyAQP123/OIGqKIvBTmmUuLFNO0tZo1sPJIsCCy51bvIEzPsLx3Aqtu3 ka6Y2X4KYVmqG43cgxgLUJpaO+6GEUS3BX5OvY69lszHE0fH9FkL24UWZ7/vAgzBmo3DfX o7u+yCwWvLz5U7HX5e4k3kIGSSHoL1iTrQRH6LWjqDrA1imMrigdmY50byrEYeDWzpKZ8d iMVCpotuUSgjCg9kKyO8vtasO7r5zAQPNX2JIgnXjK0OtX7pTrsGYKYmEk/cUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763470733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s3IUofgEmudH20Qgg0cQtPIhPCi7/zS/xdmrO0rfFsQ=; b=yZkBT7lwZDPeSktSPNbIHWfch3Cp+sRXGMf7otla2CEqHOK7hUh6od83ZfsdeA+pbjcqY/ GbAZDhdXcxrcd6MX7N401lkCIEw56b9Btnry9DSfTELEeohYeJ4ISemlq2fqZ4dKwvSkP9 vSKDb8+cTURP9z1ANwikintqcseZSDxBllGI4Q1YoyRAbSl7V3ZaDoLIPvGj7EqdgjvUBw pzWXjjm+70pr7qrLvJZnxL/BCmcDEEcCIMwQwENRedCGGtncFNFo9avfMIqytB1VZ8Qh+4 daIIexu8Y+lLaSWf2rbUNCxCbvMUQYwDsK2LqIKtDJBUU5cyW+vW0ejiNQ/FPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763470733; a=rsa-sha256; cv=none; b=cD2fwq/1I778CdvrtF7Qwh2qOl4p8GH8K9H8xyTzXcF7JVzCj2T1U75b0DgT/BgSTmMBBB hIvhtMxYee80Trp4bLwnOo8aJRVeubN4u39UvwWu3GizPwRxh9/P82F/ArTBK1WSM6v4Ox c0B/VOGWd8PBa3UIi5fq/Tf6+nTvmGm6fy5o25xwhRrx48i8uhC7XJlVCTZYzcGQD+fBVW sUcclfWIKtSAifNHnDJ2L8IJogPv9gkj1kL7xBH+tDGKJwDg75S/paXnutnKahSn2+U4gC ZGsCIIDByLSudGGBSy4m0Kj5moC51Q8HREp6JAZtKpHnOjIK8NnpWNspg7D6Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9l6j3GZnzvl7 for ; Tue, 18 Nov 2025 12:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2acb3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 12:58:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 7128544353ac - stable/15 - zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.4.0-rc4 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7128544353ac76cf0acfd02b327dec8e8f7faf1d Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 12:58:53 +0000 Message-Id: <691c6d8d.2acb3.52f91885@gitrepo.freebsd.org> The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7128544353ac76cf0acfd02b327dec8e8f7faf1d commit 7128544353ac76cf0acfd02b327dec8e8f7faf1d Author: Martin Matuska AuthorDate: 2025-11-18 11:58:55 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 12:06:40 +0000 zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.4.0-rc4 While here, fix compilation be unhiding zfs_tunables hidden in 5714090fb --- sys/contrib/openzfs/lib/libspl/include/sys/tunables.h | 3 ++- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h index c85400f6fd28..0ce348669bfe 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h @@ -25,7 +25,8 @@ */ #ifndef _SYS_TUNABLES_H -#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +//#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +#define _SYS_TUNABLES_H extern typedef enum { ZFS_TUNABLE_TYPE_INT, diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 339182042915..446c5c1a12cd 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -856,7 +856,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.0-rc3-FreeBSD_g814f9afba" +#define ZFS_META_ALIAS "zfs-2.4.0-rc4-FreeBSD_g099f69ff5" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -886,7 +886,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "rc3-FreeBSD_g814f9afba" +#define ZFS_META_RELEASE "rc4-FreeBSD_g099f69ff5" /* Define the project version. */ #define ZFS_META_VERSION "2.4.0" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index ba87aecc9751..cedd706372c4 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.0-rc3-0-g814f9afba" +#define ZFS_META_GITREV "zfs-2.4.0-rc4-0-g099f69ff5" From nobody Tue Nov 18 13:34:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9lvj6n1kz6H7vD for ; Tue, 18 Nov 2025 13:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9lvj21x9z3m8s for ; Tue, 18 Nov 2025 13:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763472865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QlVjl4wyuaNy8PIaMIKoKdhRRUh2FllIVGAxO7+xuho=; b=EHAtyTqh+ky1cwu7SBtEA2zdKu88NcLLaWuE2rp+mDPnIq2hUTN3oFfokz/uoekfroNWQs Sg2hkhaO7kf3SOpbKWGYJ+ebMdS+HyyyNbYFoW4z1Fcq4wj9E5voj5LZAZ7oRngRQxMJ4Z 6xdM0hPxDUI9b1ASniuoqYuyEn6zX9etdO7+/b59OCARtPXwE6dMkBw6G3qzIjRor96KJn WJOyENt5Ls46HWgMzHdUXMgvme1KyIMdtTSyS9+28we+GpqD7HSwMwqhZqQ7WCk/ZkMTux mae/pUPrb7db1nc33iE7QuiceRsrY/LFcRm6ApCVf4VGI+t/0sneThpbjZxIyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763472865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QlVjl4wyuaNy8PIaMIKoKdhRRUh2FllIVGAxO7+xuho=; b=f/PIKDYKQAm/Qmnk1B54wFVV9mSWA7pWY6L4ivPJDqBsmZ29LZMEstgWJEGeZXW5XzHPFe l13w+pF3/FuKTo/JBfbzfb7Hrrxadsg4hUluTBOqTqml/nZoQs0ZYPOrhgIh3T3DZDdzIV ANbktxKk9ZmTj5A3G9a8s6waQseV/ttUUDJ16Gjel3NfA3Ufr99bjpVhYzxdPuLwlh9Aa5 CxhFV/JPNKq2TaPhy/QPQVWhJ6j2s1g9q4sf1iOs9PLijP5JWfCjkC6Bx3osEMw4xKP58L L43JpgDbdsEBPAhaHq2e1WJdl0gxLhHZDxF1iZW11dSZSU2OEIJePTQJ+Fw7Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763472865; a=rsa-sha256; cv=none; b=q0BIKQ+zQ+FGInORDSbpEf2sgaX7STeLWqXUk5DRr8nZb8OHF0Kv5pyt1uC+2xXiZkGt3Y c3v0CC6QsdNTT82t5udV608YW0SQ0X+RJdBEiGeZoEBcgMrIDYPOhpW3+az8E+iYwoIF4u H9MayD9WCTRwsgLzPUr8f3fRpQ2roSfch4HqfNMr3vin/EIcBiq4ka/q/LnGVg8BPd9bbW EWpKGz29oZ221swljkZ5vMmpIIi9+gg4bDSyp3XfA/5DYl9Q30tiGPu7iIIiGpYmJ0izF+ zE1knR5DAeE79Aq2LmPt8pqajmk1LdvQnNGIgFo/34KsHjRS7TfeXVwrxIYFBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9lvj0zk5zx8K for ; Tue, 18 Nov 2025 13:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2ee39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:34:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 443b7c41d619 - stable/15 - dtrace_callout_execute.4: Document the DTrace callout_execute provider List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 443b7c41d619412e2d149423b3c5d0d9b11bf4ae Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:34:25 +0000 Message-Id: <691c75e1.2ee39.11b6f8c9@gitrepo.freebsd.org> The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=443b7c41d619412e2d149423b3c5d0d9b11bf4ae commit 443b7c41d619412e2d149423b3c5d0d9b11bf4ae Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-04 11:10:55 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:34:19 +0000 dtrace_callout_execute.4: Document the DTrace callout_execute provider MFC after: 2 weeks Fixes: 91dd9aae1ab8 Add explicit static DTrace tracing to the callout mechanism Differential Revision: https://reviews.freebsd.org/D51397 (cherry picked from commit 3ccb2d9513e6a2e046e635c186da68acf8f8498b) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 1 + share/man/man4/Makefile | 1 + share/man/man4/dtrace_callout_execute.4 | 68 ++++++++++++++++++++++++++++ share/man/man9/callout.9 | 4 +- 4 files changed, 73 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 2e7eeeadb86b..6b0c3d3c2dee 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -1300,6 +1300,7 @@ in .Xr cpp 1 , .Xr dwatch 1 , .Xr dtrace_audit 4 , +.Xr dtrace_callout_execute 4 , .Xr dtrace_dtrace 4 , .Xr dtrace_fbt 4 , .Xr dtrace_io 4 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 35cc6bbb8da8..dd98badd31ba 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1003,6 +1003,7 @@ _ccd.4= ccd.4 .if ${MK_CDDL} != "no" _dtrace_provs= dtrace_audit.4 \ + dtrace_callout_execute.4 \ dtrace_dtrace.4 \ dtrace_fbt.4 \ dtrace_io.4 \ diff --git a/share/man/man4/dtrace_callout_execute.4 b/share/man/man4/dtrace_callout_execute.4 new file mode 100644 index 000000000000..1154ed066b97 --- /dev/null +++ b/share/man/man4/dtrace_callout_execute.4 @@ -0,0 +1,68 @@ +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 4, 2025 +.Dt DTRACE_CALLOUT_EXECUTE 4 +.Os +.Sh NAME +.Nm dtrace_callout_execute +.Nd a DTrace provider for the callout API +.Sh SYNOPSIS +.Nm callout_execute Ns Cm :kernel::callout_start +.Nm callout_execute Ns Cm :kernel::callout_end +.Sh DESCRIPTION +The +.Nm callout_execute +provider allows for tracing the +.Xr callout 9 +mechanism. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_start +probe fires just before a callout. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_end +probe fires right after a callout. +.Pp +The only argument to the +.Nm callout_execute +probes, +.Fa args[0] , +is a callout handler +.Ft struct callout * +of the invoked callout. +.Sh EXAMPLES +.Ss Example 1: Graph of Callout Execution Time +The following +.Xr d 7 +script generates a distribution graph of +.Xr callout 9 +execution times: +.Bd -literal -offset 2n +callout_execute:::callout_start +{ + self->cstart = timestamp; +} + +callout_execute:::callout_end +{ + @length = quantize(timestamp - self->cstart); +} +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr tracing 7 , +.Xr callout 9 , +.Xr SDT 9 +.Sh AUTHORS +.An -nosplit +The +.Nm callout_execute +provider was written by +.An Robert N. M. Watson Aq Mt rwatson@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man9/callout.9 b/share/man/man9/callout.9 index 0e59ef8ab2b1..637049ec1ef5 100644 --- a/share/man/man9/callout.9 +++ b/share/man/man9/callout.9 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 22, 2024 +.Dd November 4, 2025 .Dt CALLOUT 9 .Os .Sh NAME @@ -789,6 +789,8 @@ and functions return a value of one if the callout was still pending when it was called, a zero if the callout could not be stopped and a negative one is it was either not running or has already completed. +.Sh SEE ALSO +.Xr dtrace_callout_execute 4 .Sh HISTORY .Fx initially used the long standing From nobody Tue Nov 18 13:36:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9lxX6X87z6H8Tk for ; Tue, 18 Nov 2025 13:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9lxX1L7Dz3mWl for ; Tue, 18 Nov 2025 13:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763472960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/UgJ+6nW3FDC6cKFGmKpjhgqIkYcQRzSCuBjFSkIOKI=; b=MGDgsJUs6CJ0U9l05mYYlD88QHBBGWjMlDxqigd3dfeFZIuYMuDgtQ9XF2FY0DNCMd5jTV Pd8Sid7ny17GLJQAqcZ4meN5jSg67Xg6aJX191EbEnVZddwjXIvSAC/Z+gsjVwE0mRodww yEKt04b862XJaAac7tNnd4RAhoI5V6CdMylGfODjMr7ZY/uaB71JyJSSmRPJ8YVkgSgwxc gQHwMXnNmYurcM1CrrVHijYefhpOWBNNfXTSN7jWxhPiaR49DADfUI9c/NdJi/Xi6y82nj AVu72zqKJIhvYg8hACakhDsCV25HGBx4BCkt6sY0ep0F0BQC1ek6WG2UkzMZVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763472960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/UgJ+6nW3FDC6cKFGmKpjhgqIkYcQRzSCuBjFSkIOKI=; b=q6SFghI8pBjxPF/2UEqFlVu3HjPhwbP+o2Bc0m4olxisYnm5L0kARdEU814igWRbsJheUg F+XybrSTQMQ92HvRzH0s66lQ/E4zURsgs75QAhJ6r5JcJNtb7G3XjZiotP21+oPly3ztvL 1qsEAF3IogULSAY859tuel0EGdulxpk2czJQ7o8675PKfoJBF6Ihue3qt/uQxAsYGEkXBb tganM/joHrV7RL7U+dZlft6yGwAVGOlR/wDgLDQkURO9s4brdI5x2FXGVkR/ebKxpnu6Zl lsgGWGe31wHm6JAUqpG4oXcK5F6gciTs0ViAVBrCyVICdYiV4n514KzByBijng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763472960; a=rsa-sha256; cv=none; b=iq9sj+QaSsprfxtjflccNa+MX1o1JpN5OshkeQp4KwJH1KB8N6q3mzO3ZM26bwM04sC3GR ThhLmSgymgF/UfDM60Vx3t7VRKEdOiabw/4+SANqVviN6alvd1R7OntKFo+/wz7a6BHtRh 1nb8frlwSmVgjT8sKLOArtd/9b5FKz3SsHOEpgkCEe+e9Yo5zDkEXuKlIpLwn2TDk83dN5 7/2VV7kmFqE2FFgXzv2i1hxr+63HWP/yPUfScy2Yu3dLrsxtm1I6nqu8zVHByq1VqnZrFR eMxraBjeJ2N3R5XmRPByH/TTBsIv6zQmMB8vU+7YZbBXzsjlwX3LtFG1QkjwhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9lxX0pJQzwpQ for ; Tue, 18 Nov 2025 13:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f41b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:36:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 7d43404485bf - stable/14 - dtrace_callout_execute.4: Document the DTrace callout_execute provider List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7d43404485bf2e306e54bdfdb0ae937d6921df39 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:36:00 +0000 Message-Id: <691c7640.2f41b.3f5c6a9d@gitrepo.freebsd.org> The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=7d43404485bf2e306e54bdfdb0ae937d6921df39 commit 7d43404485bf2e306e54bdfdb0ae937d6921df39 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-04 11:10:55 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:35:54 +0000 dtrace_callout_execute.4: Document the DTrace callout_execute provider MFC after: 2 weeks Fixes: 91dd9aae1ab8 Add explicit static DTrace tracing to the callout mechanism Differential Revision: https://reviews.freebsd.org/D51397 (cherry picked from commit 3ccb2d9513e6a2e046e635c186da68acf8f8498b) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 1 + share/man/man4/Makefile | 1 + share/man/man4/dtrace_callout_execute.4 | 68 ++++++++++++++++++++++++++++ share/man/man9/callout.9 | 4 +- 4 files changed, 73 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 68b3a7f5f9bc..ce01b2c4c017 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -1299,6 +1299,7 @@ in .Sh SEE ALSO .Xr cpp 1 , .Xr dtrace_audit 4 , +.Xr dtrace_callout_execute 4 , .Xr dtrace_fbt 4 , .Xr dtrace_io 4 , .Xr dtrace_ip 4 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 627ca85d1fff..2dda6b937dc2 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -939,6 +939,7 @@ _ccd.4= ccd.4 .if ${MK_CDDL} != "no" _dtrace_provs= dtrace_audit.4 \ + dtrace_callout_execute.4 \ dtrace_fbt.4 \ dtrace_io.4 \ dtrace_ip.4 \ diff --git a/share/man/man4/dtrace_callout_execute.4 b/share/man/man4/dtrace_callout_execute.4 new file mode 100644 index 000000000000..1154ed066b97 --- /dev/null +++ b/share/man/man4/dtrace_callout_execute.4 @@ -0,0 +1,68 @@ +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 4, 2025 +.Dt DTRACE_CALLOUT_EXECUTE 4 +.Os +.Sh NAME +.Nm dtrace_callout_execute +.Nd a DTrace provider for the callout API +.Sh SYNOPSIS +.Nm callout_execute Ns Cm :kernel::callout_start +.Nm callout_execute Ns Cm :kernel::callout_end +.Sh DESCRIPTION +The +.Nm callout_execute +provider allows for tracing the +.Xr callout 9 +mechanism. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_start +probe fires just before a callout. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_end +probe fires right after a callout. +.Pp +The only argument to the +.Nm callout_execute +probes, +.Fa args[0] , +is a callout handler +.Ft struct callout * +of the invoked callout. +.Sh EXAMPLES +.Ss Example 1: Graph of Callout Execution Time +The following +.Xr d 7 +script generates a distribution graph of +.Xr callout 9 +execution times: +.Bd -literal -offset 2n +callout_execute:::callout_start +{ + self->cstart = timestamp; +} + +callout_execute:::callout_end +{ + @length = quantize(timestamp - self->cstart); +} +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr tracing 7 , +.Xr callout 9 , +.Xr SDT 9 +.Sh AUTHORS +.An -nosplit +The +.Nm callout_execute +provider was written by +.An Robert N. M. Watson Aq Mt rwatson@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man9/callout.9 b/share/man/man9/callout.9 index 96b93283bfc2..97d9f4138742 100644 --- a/share/man/man9/callout.9 +++ b/share/man/man9/callout.9 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 1, 2021 +.Dd November 4, 2025 .Dt CALLOUT 9 .Os .Sh NAME @@ -816,6 +816,8 @@ and functions return a value of one if the callout was still pending when it was called, a zero if the callout could not be stopped and a negative one is it was either not running or has already completed. +.Sh SEE ALSO +.Xr dtrace_callout_execute 4 .Sh HISTORY .Fx initially used the long standing From nobody Tue Nov 18 13:37:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9lyz6k6Bz6H93P for ; Tue, 18 Nov 2025 13:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9lyz4gyzz3n6N for ; Tue, 18 Nov 2025 13:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtkJx3L4WmFMdEb3lMZr9EmsI65WEbSr4YlknBfC5Lo=; b=Uljyofq1tF2QFU9HuLc4D0d/zx2dTyEWophB9ocHq7g5R/T59yaU4ZfQ5iO2K1cCArG8o+ uPJEEhUUiRyJuzxZV3i5wQIJmtGnhZYvz1xPng316/lyHURWOZZ9KVJ/hcXgi75CdUt8L5 NreS4zwRvnCcZqAuUZ9RpeszP4wt1+AEh5biAnlusAEG6vOmDU727oy9bqQBwMqLjSb6sQ 8Ir+mGn/iR9afAbaGJt4nJH70fPONX+U4nAUZ5kZuxlCcCrwcHygpBOc1JGd+ULJTY1+kk TgdS75zfIDcxf4/R8fy4NJV71LuXd0eq3TvGwDni+qzhR5vtg8IiqAJYNuDnLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtkJx3L4WmFMdEb3lMZr9EmsI65WEbSr4YlknBfC5Lo=; b=CHl44v6V4kNDFbV5fm1ImDhyJUNiiQ+oGg8A7lqaxEbnbQwpkYKqYYfMAmuvvke2f9x00U w2nrrlM8HRcfCjki8aeyYCtSKZnTT09MUI6Izc4q3E8WvfpNGtROo/EEEZFKflL4PPjm2m XlOsUsMZrL0Mq1UywhsRE7sUY0sQ39ZKA8Syc8lYdlHj7cC1wqbZVYEbHYn4CfGREn69qd EzwKEsGrYzPo+D00nF5QXA8VkTihPk+RpjH34g6Ne3nVtV1iXOQGlJSP6Mwz5eAVws5g8H HA7JV4iQmdIRKi9ZmQMt9oHRa+/hpKIQgzgu+krAndMz9GTeqzXfWvkx7a0JBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763473035; a=rsa-sha256; cv=none; b=ggJ8VeHRBMWvumbPY+OP4fQFWhaJStMkJergjg8VoaGS0TAALVU9U2bYJFvy5/qCSZDEPe rrKbAxFOd0H+1SgbfxzkUEWFeoZRPvXodFjcDV1nrMjXdxsy1TArAQl/Y9nunmgEQbbIrM 9MuyOcc5ZKujLJfGfDpsVyavq30QQyHr20vnFHtfK1pO8WLTEeuqsygt8BpU4gDkYHpkmg Tg+uhCTXfhMRiG+mq1FwdmhWtJ+jfTWm1qUKr9pESJZQfZeBKZm/KMZcwtyoz68XhjdfnY 7Bv2xuv3WAozoy394LK2fzkMj6xP0Yio0R10CeqIa6wGP3DRxV8IUF05daPBpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9lyz3pmQzwWl for ; Tue, 18 Nov 2025 13:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2db7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:37:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 760b71a49363 - stable/13 - dtrace_callout_execute.4: Document the DTrace callout_execute provider List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 760b71a4936330032c727da8ebcecfa6440fe489 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:37:15 +0000 Message-Id: <691c768b.2db7d.2a583924@gitrepo.freebsd.org> The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=760b71a4936330032c727da8ebcecfa6440fe489 commit 760b71a4936330032c727da8ebcecfa6440fe489 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-04 11:10:55 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:37:10 +0000 dtrace_callout_execute.4: Document the DTrace callout_execute provider MFC after: 2 weeks Fixes: 91dd9aae1ab8 Add explicit static DTrace tracing to the callout mechanism Differential Revision: https://reviews.freebsd.org/D51397 (cherry picked from commit 3ccb2d9513e6a2e046e635c186da68acf8f8498b) --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 1 + share/man/man4/Makefile | 1 + share/man/man4/dtrace_callout_execute.4 | 68 ++++++++++++++++++++++++++++ share/man/man9/callout.9 | 4 +- 4 files changed, 73 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index b36f71d17bbb..7c9a4b1e7cf6 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -883,6 +883,7 @@ in .Sh SEE ALSO .Xr cpp 1 , .Xr dtrace_audit 4 , +.Xr dtrace_callout_execute 4 , .Xr dtrace_fbt 4 , .Xr dtrace_io 4 , .Xr dtrace_ip 4 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 332670598905..49dbff287e18 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -960,6 +960,7 @@ _ccd.4= ccd.4 .if ${MK_CDDL} != "no" _dtrace_provs= dtrace_audit.4 \ + dtrace_callout_execute.4 \ dtrace_fbt.4 \ dtrace_io.4 \ dtrace_ip.4 \ diff --git a/share/man/man4/dtrace_callout_execute.4 b/share/man/man4/dtrace_callout_execute.4 new file mode 100644 index 000000000000..1154ed066b97 --- /dev/null +++ b/share/man/man4/dtrace_callout_execute.4 @@ -0,0 +1,68 @@ +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 4, 2025 +.Dt DTRACE_CALLOUT_EXECUTE 4 +.Os +.Sh NAME +.Nm dtrace_callout_execute +.Nd a DTrace provider for the callout API +.Sh SYNOPSIS +.Nm callout_execute Ns Cm :kernel::callout_start +.Nm callout_execute Ns Cm :kernel::callout_end +.Sh DESCRIPTION +The +.Nm callout_execute +provider allows for tracing the +.Xr callout 9 +mechanism. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_start +probe fires just before a callout. +.Pp +The +.Nm callout_execute Ns Cm :kernel::callout_end +probe fires right after a callout. +.Pp +The only argument to the +.Nm callout_execute +probes, +.Fa args[0] , +is a callout handler +.Ft struct callout * +of the invoked callout. +.Sh EXAMPLES +.Ss Example 1: Graph of Callout Execution Time +The following +.Xr d 7 +script generates a distribution graph of +.Xr callout 9 +execution times: +.Bd -literal -offset 2n +callout_execute:::callout_start +{ + self->cstart = timestamp; +} + +callout_execute:::callout_end +{ + @length = quantize(timestamp - self->cstart); +} +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr tracing 7 , +.Xr callout 9 , +.Xr SDT 9 +.Sh AUTHORS +.An -nosplit +The +.Nm callout_execute +provider was written by +.An Robert N. M. Watson Aq Mt rwatson@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man9/callout.9 b/share/man/man9/callout.9 index 96b93283bfc2..97d9f4138742 100644 --- a/share/man/man9/callout.9 +++ b/share/man/man9/callout.9 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 1, 2021 +.Dd November 4, 2025 .Dt CALLOUT 9 .Os .Sh NAME @@ -816,6 +816,8 @@ and functions return a value of one if the callout was still pending when it was called, a zero if the callout could not be stopped and a negative one is it was either not running or has already completed. +.Sh SEE ALSO +.Xr dtrace_callout_execute 4 .Sh HISTORY .Fx initially used the long standing From nobody Tue Nov 18 13:38:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9m0K2fTMz6H93n for ; Tue, 18 Nov 2025 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9m0K20hTz3p1m for ; Tue, 18 Nov 2025 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v4ZJk7f1X3tgZupVlPciUf9GRhkni8WRYRMnIiNKEiA=; b=fmrMvNaayYlgxR///bhsfJasP0KUPZ2uFLJMVeq+G+MhGIzMOZeASLgsGBL7leyluwB9/M wphwLHKHTW+aEY/4LkJ3AZF0364SHo3r95twTdAR3M8EngCe+KSOZiQM83FMHyv7ahTGqS 0i2vepyUVQw/z2hlcAuwR3vZbHyou0PZzB/Adzv0lwtG3gOwhhACYh9Z4c+xpBVo3shfO8 cGS4GSoeJB5tVH5cJ3x1hLhDH07INhEHn+ee6tzmfbBcLsXGobfeF9u6dpAYJYBD1GAAiY ai9uLT3BYpdRQjGAG5YYThZns10022YiMpW5h2sLA66If8Zt3KR28MOisgJ11g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v4ZJk7f1X3tgZupVlPciUf9GRhkni8WRYRMnIiNKEiA=; b=hTzt+QlNlpT+GkC3QtFkyw30uOp114RPmptjrzJoUrIYyapiPhmxLntsDZAC8EVylQAVcY IegKOK5tpdorNT2tEcV908zQmuNAkjCiBzt96eyanKL3N2isQCM3dp9lku3KHK0hirhKhw AS03ZbEIKXrM1Jyz6MUYFlgNiIZHlNWqnBhmWf4Yc6KPUVpJYpes9Q57dWBs7u46QRS2nv u9Iw6CX60VMNiLPbzLS74iDXCZf2q7P79LXQxNja89tt8gI/6P3kOuEzgZBhJao458gVN+ Tj1KCkqDlYEy0X9P2usBgCaT9ekLXGoAaSWfo7IQ0eCKyYoNSduorOfkwimCcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763473105; a=rsa-sha256; cv=none; b=pTG68fA3lCeI87jkeYttNVf12hjEVA/vileDAuP7bAq7EpSZWBNQqxdLYQBuWa7CbNZKvA fwGqcU+nDWEABa/TSGUzXcHpsTLJjVseo057fJogxasSzTFbySC/s+1+Og/X8B1x/IYa+U +/6G5XwtBpEAknkFnhOjQ+0bCZnIq73BrcmsfxQfd5IntIirhxor48n9o+Pc/Bc50dUxQ1 Bi//5tUpKouHTH/xKL7dLApDprOSPz97TtTMq/LZAiOvz1ujKyngmgsey0Y8E+WoKAyMiB B7urKuA8qWqM9ky11dlh4SVytk6oeX5A87FtfPnlgN1JRdfQSvHE/t1oC74+sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9m0K1b4ZzwvM for ; Tue, 18 Nov 2025 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e437 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:38:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d086bf34b56f - stable/15 - d.7: Document strchr, strjoin, strrchr, strstr, strtok, strlen, and substr List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d086bf34b56f1a9bb75cdceabec02cc39703fe66 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:38:25 +0000 Message-Id: <691c76d1.2e437.2a4eeeb4@gitrepo.freebsd.org> The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d086bf34b56f1a9bb75cdceabec02cc39703fe66 commit d086bf34b56f1a9bb75cdceabec02cc39703fe66 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-28 20:06:53 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:38:14 +0000 d.7: Document strchr, strjoin, strrchr, strstr, strtok, strlen, and substr Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53417 (cherry picked from commit af99c4c1d03c742faf8bd4c62fbbb664c5f7fc18) --- share/man/man7/d.7 | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/share/man/man7/d.7 b/share/man/man7/d.7 index 4b00d3d71c79..59b3389b121b 100644 --- a/share/man/man7/d.7 +++ b/share/man/man7/d.7 @@ -198,6 +198,130 @@ The number of nanoseconds since the Epoch Suitable for timestamping logs. .El .Sh BUILT-IN FUNCTIONS +.\" Keep the indentation wide enough for the reader to be able to skim through +.\" function names quickly. +.Bl -tag -width "size_t strlen" +.It Ft string Fn strchr "string s" "char c" +Return a substring of +.Fa s +starting at the first occurance of +.Fa c +in +.Fa s . +Return +.Dv NULL +if +.Fa c +does not occur in +.Fa s . +.Pp +For example, +.Bd -literal -compact -offset indent +strchr("abc", 'b'); +.Ed +returns +.Ql "bc" +and +.Bd -literal -compact -offset indent +strchr("abc", 'd'); +.Ed +returns +.Dv NULL . +.It Ft string Fn strjoin "string s1" "string s2" +Return a string resulting from concatenating +.Fa s1 +and +.Fa s2 . +.Pp +For example, +.Bd -literal -compact -offset indent +strjoin("abc", "def") +.Ed +returns +.Ql abcdef . +.It Ft string Fn strrchr "string s" "char c" +Return a substring of +.Fa s +starting at the last occurance of +.Fa c +in +.Fa s . +Similar to +.Fn strchr . +.It Ft string Fn strstr "string haystack" "string needle" +Return a substring of +.Fa haystack +starting at the first occurrence of +.Fa needle . +Return +.Dv NULL +if +.Fa needle +is not a substring of +.Fa haystack . +.Pp +For example, +.Bd -literal -compact -offset indent +strstr("abc1bc2", "bc") +.Ed +returns +.Ql bc1bc2 +and +.Bd -literal -compact -offset indent +strstr("abc", "xy") +.Ed +returns +.Dv NULL . +.It Ft string Fn strtok "string s" "string separators" +Tokenize +.Fa s +with +.Fa separators . +.Pp +For example, +.Bd -literal -compact -offset indent +strtok("abcdefg", "xyzd") +.Ed +returns +.Ql abc . +.It Ft size_t Fn strlen "string s" +Return the length of string +.Fa s . +.It Ft string Fn substr "string s" "int position" "[int length]" +Return a +substring of string +.Fa s +starting at +.Fa position . +The substring will be at most +.Fa length Ns -long . +If +.Fa length +is not specified, use the rest of the string. +If +.Fa position +is greater than +the size of +.Fa s , +return an empty string. +.Pp +For example, +.Bd -literal -compact -offset indent +substr("abcd", 2) +.Ed +returns +.Ql cd , +.Bd -literal -compact -offset indent +substr("abcd", 2, 1) +.Ed +returns +.Ql c , +and +.Bd -literal -compact -offset indent +substr("abcd", 99) +.Ed +returns an empty string. +.El .Ss Aggregation Functions .Bl -tag -compact -width "llquantize(value, factor, low, high, nsteps)" .It Fn avg value From nobody Tue Nov 18 13:38:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9m0v32xkz6H92D for ; Tue, 18 Nov 2025 13:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9m0v2MTlz3p5n for ; Tue, 18 Nov 2025 13:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4zzXjdZigg4z0p3cjFEe40nYsAGYk5+naohtb0lQHs=; b=m4xI1afSY5innxH7YJNJUs4NsSWEpzo4j+6LI3JHwDGhESQXxdfr8kDNDqAJDtHaJsNz5w 4YZ3DP2Rp9nHvID18SZOfbO0ZJ9P8bOWRZnEWL4ghCuRElOQM6q2OnWzKk4PTcSnES0IIm 188tzIJpAMq30KG4Zubufu+/lFG4AnrM6oSJqmXPC6GS2uxdTeUwBXXfPvlu0Va3GlVVaH CdHxK6g659ZceodaTFIdFUPVlFwrCuZ6f3N/C5KPz/ik+h/mTIDyjg0k3/3H1Hyq9UlmfN ivyTEh9ZNKJvj02+nWJExjj4OAVDjX8R6GsgKm41aSIBXje/lO4J2hl0xwIQ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4zzXjdZigg4z0p3cjFEe40nYsAGYk5+naohtb0lQHs=; b=dr7xsbNWHeLFgRLYJB/YcqvrEBkAV7DzRKIlaPJrYYxDHN8vAwnSeDlNzjrd/S1GpWgh4x Gi7wL0aIGrokr+MG3ZNb7hoV2uIupaTrYs2ofx4qtb8yo7QlABhWUqOKI7VKOo/qKNi2Q4 8rp2Z7fug5qWa6on3PdQ6LV12QgVu7/qFhCTcgPazZzSyZs9nR+6VD6T/smSDddVs8c6GM xc9FtU5fZEiKz1GD29FfVugnsFOOFX9FSiaoILMULSslSr+qpb6wMMheK6a9Gg7z3aW79N v8E/gWIU4CxgVAk++6icoHJaaAJMOLHC0jbm9RiDU6DGtbptJ4o1gbmI3LGTfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763473135; a=rsa-sha256; cv=none; b=e3E/7H8fElL4iqHD2j+/zTSrZ6QP1vnrMxGRvMXTfW+q6CJw7VUiUiBwGeJCUHCUyQCf6H alEZpCj4c9z1ehCTbKETKK8KTZjZhel5w9zaSn9BJ/Rjkdgvkv1MXThmv5gNtRxCqgIYWr +iwzmUHAg9/HjxxEdsMy9UxBSNBlKbS2V1rGSskPzfQ2W8gSJfoFhTWpouz9WYfKEnx51G qJszkzxUiz/8VYjapS4Okl83wScg74ZXKAEA40cdu22Q5YHxNyVbaXqSRZeRT5VR37sewO 7Ku23G4MOCMRFZCVVtLQw6DpLVDEBMalqFPINCi+QP3nlZe8Rwxj6cWMPGJ3rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9m0v1nDyzx53 for ; Tue, 18 Nov 2025 13:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e43b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:38:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 32ef68b0f30d - stable/15 - geom_zero.4: Document List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 32ef68b0f30d903455173fc4c0029d4bced647db Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:38:55 +0000 Message-Id: <691c76ef.2e43b.6bbb7c30@gitrepo.freebsd.org> The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=32ef68b0f30d903455173fc4c0029d4bced647db commit 32ef68b0f30d903455173fc4c0029d4bced647db Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-09 14:46:40 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:38:48 +0000 geom_zero.4: Document PR: 250593 Reviewed by: bcr, ziaee Thanks to: imp, markj MFC after: 1 week Fixes: 3843eba85d98 Add unmapped BIO support to GEOM ZERO Fixes: 24e1fdcd1a69 Allow to specify the byte which will be used for filling read buffer Fixes: 565bc101112c Add a very simple and small GEOM class - ZERO (cherry picked from commit 39acb7fd86eda721df402c2f1368b78cede161c3) --- share/man/man4/Makefile | 2 + share/man/man4/geom_zero.4 | 174 +++++++++++++++++++++++++++++++++++++++++++++ share/man/man4/zero.4 | 3 +- 3 files changed, 178 insertions(+), 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index dd98badd31ba..a04e20dfea27 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -189,6 +189,7 @@ MAN= aac.4 \ geom.4 \ geom_linux_lvm.4 \ geom_uzip.4 \ + geom_zero.4 \ gif.4 \ ${_gve.4} \ gpio.4 \ @@ -1120,6 +1121,7 @@ MAN+= \ veriexec.4 \ zyd.4 +MLINKS+=geom_zero.4 gzero.4 MLINKS+=mtw.4 if_mtw.4 MLINKS+=otus.4 if_otus.4 MLINKS+=rsu.4 if_rsu.4 diff --git a/share/man/man4/geom_zero.4 b/share/man/man4/geom_zero.4 new file mode 100644 index 000000000000..8da09b1473c9 --- /dev/null +++ b/share/man/man4/geom_zero.4 @@ -0,0 +1,174 @@ +.\" +.\" Copyright (c) 2019 Greg White . All rights reserved. +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt GEOM_ZERO 4 +.Os +.Sh NAME +.Nm gzero , +.Nm geom_zero +.Nd GEOM-based zero disk/block device +.Sh SYNOPSIS +.Cd "options GEOM_ZERO" +.Pp +In +.Xr loader.conf 5 +or +.Xr sysctl.conf 5 : +.Cd kern.geom.zero.byte +.Cd kern.geom.zero.clear +.Sh DESCRIPTION +.Nm +is a +.Xr GEOM 4 +device simulating a one-exabyte disk. +It throws away any data written to it, +and returns the value of +.Va kern.geom.zero.byte +for every byte read from it. +.Pp +.Nm +differs from +.Xr zero 4 , +which is a regular character device and has an infinite length, +while +.Pa /dev/gzero +is a +.Xr GEOM 4 +provider of large, but limited, size. +.Pp +Consult +.Xr geom 8 +for instructions on how to use the supported commands of the +.Xr GEOM 4 +.Nm ZERO +class. +.Pp +.Nm +is useful for benchmarking performance of GEOM and GEOM classes +where compression of the data does not affect the results +.Po blocks from +.Pa /dev/gzero +compress exceptionally well +.Pc . +Examples of such benchmarks include +comparing the speed of two disk encryption algorithms and +comparing a hardware versus software implementation +of a single encryption algorithm. +.Sh MIB VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width "kern.geom.zero.clear" +.It Va kern.geom.zero.byte +This variable sets the fill byte of the +.Nm +device. +Default: +.Ql 0 . +.It Va kern.geom.zero.clear +This variable controls the clearing of the read data buffer. +If set to +.Ql 0 , +.Nm +will not copy any data into the read data buffers +and just return the read data buffers as they are without modifying them. +In particular, it will not not fill the read buffer with the value of +.Va kern.geom.zero.byte . +This is useful for read benchmarking to reduce the measurement noise +caused by extra memory initialization. +Default: +.Ql 1 . +.El +.Sh FILES +.Bl -tag -width /dev/gzero +.It Pa /dev/gzero +The +.Nm +device. +.El +.Sh EXAMPLES +Create the +.Pa /dev/gzero +device by loading the +.Nm geom_zero +kernel module: +.Bd -literal -offset indent +# geom zero load +.Ed +.Pp +Show information about the +.Nm +device: +.Bd -literal -offset indent +# geom zero list +Geom name: gzero +Providers: +1. Name: gzero + Mediasize: 1152921504606846976 (1.0E) + Sectorsize: 512 + Mode: r0w0egzero0 +.Ed +.Pp +Set the fill byte of the +.Nm +device to 70 +.Po decimal for letter +.Dq F +in +.Xr ascii 7 +.Pc : +.Bd -literal -offset indent +# sysctl kern.geom.zero.byte=70 +kern.geom.zero.byte: 0 -> 70 +# head -c 1 /dev/gzero +F +.Ed +.Pp +Benchmark read and write throughput of +.Xr geli 8 Ap s +default encryption algorithm with a 4-KiB sector size: +.Bd -literal -offset indent +# geom zero load +# geli onetime -s 4096 gzero +# sysctl kern.geom.zero.clear=0 +# dd if=/dev/gzero.eli of=/dev/zero bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.258195 secs (853398307 bytes/sec) +# dd if=/dev/zero of=/dev/gzero.eli bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.663118 secs (645619658 bytes/sec) +.Ed +.Sh SEE ALSO +.Xr GEOM 4 , +.Xr zero 4 , +.Xr geom 8 , +.Xr sysctl 8 , +.Xr bio 9 +.Sh HISTORY +A +.Nm +device first appeared in +.Fx 6 . +.Sh AUTHORS +.An -nosplit +The +.Nm +device was written by +.An Paweł Jakub Dawidek Aq Mt pjd@FreeBSD.org . +.Pp +The +.Nm +manual page was originally written by +.An Greg White Aq Mt gkwhite@gmail.com +and rewritten by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org +before landing in +.Fx . diff --git a/share/man/man4/zero.4 b/share/man/man4/zero.4 index f1cd52d455d1..85651d53d342 100644 --- a/share/man/man4/zero.4 +++ b/share/man/man4/zero.4 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 7, 1996 +.Dd November 9, 2025 .Dt ZERO 4 .Os .Sh NAME @@ -48,6 +48,7 @@ supply of null bytes when read. .El .Sh SEE ALSO .Xr full 4 , +.Xr gzero 4 , .Xr null 4 .Sh HISTORY A From nobody Tue Nov 18 13:39:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9m1T2H5cz6H96S for ; Tue, 18 Nov 2025 13:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9m1T0qxxz3pcl for ; Tue, 18 Nov 2025 13:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2NTds+8p8cHutUQc/HQHxslcyJxvDxOKeUP7G7Y7jY=; b=nhzKzQbNJfeZDTyFY5td/imCYhMZbu9/76ve46ngLFnTyx+Om/gQigQ4Tvg81aboABNsTw pTyvtfrjUb2kxOi9bDYyov8f6ZbmF8Ewk5YpgUNzHNA33VSIwPzXgraqplyHT01PHtE6hV 4hs6qUS22zG6U0ZuOj3OeYAzs6oYIK45q1v4zpJllVv0X8bN9r7iTjkMY7k9PyWSWpH6jU 8x3k34hz+WVGZiok81XlniRJrG3CgwGnd84tITlhN2ZgpaSf/vRlXbyCbTSJXUFJvh94jV m4JA+4w06gBoYZeaGDl1QiweSZPJAmVNHkHwFZql/grQaagtrhYEXEsKADhF+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2NTds+8p8cHutUQc/HQHxslcyJxvDxOKeUP7G7Y7jY=; b=hWhFvIOqm5ukOGf9ZoHPnAQAQSBb7suoi5ZDu7Vn26oP1/I8ENT1VXqIWrVyCFAlH+9oCe 5g3WJ36p45WdzNC0j6Mi9tOGJ8C7VVK1U6i5jTu11Tw9q3mnyhU61MX7ZoQEq/b8MBSlBK nvLxVn28FCD2/83UMN285FV3iMH1Ly4SOb++4Ty51up1KlOQT8C7SU51SF/BQ/QL5AFWQv thELNviysRjRKLllfOUu69JfJ4GVmfLlueA7J8UW5Rmz3j2N8hRRfXIehY+gQ1y+TMQ3ZM KOPABScrfUpQNVJIfq4idSVp2plIv4qlThD2twS8DVZAwTb+JFNpHvEcu3OzBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763473165; a=rsa-sha256; cv=none; b=dBj3AaFveJ1uvFr9AOyCzKZjeIKzNFxrshewTIrcwy48WHdi/AEl54gPRmBfz90Cvs4cNF dqf3VcyuJv+xsqDSpwR/uF/I/GKgz0j+iAb1Uyiqa/xIt7fR34JtBsufdw2RHaDpukV1Nw oK2gWEeviyTRNy41U+z46A7fHKC4zWDQXEawOzPZSFhHD22cOTCw0Xyc7gZnyDRRPID5uG G4z8QPbjzH/GnSzYvaP50qLpaq/YVcugwWXb+o5mkJQzcDi3R2w0PZoH4jbeAhaEKt+m87 rNdPoWSRFU7YULyrwMKvegDgqCzfcvqUMuC/3LDFKV2DgbSC0G9ruEr2y4Da2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9m1T07g9zwdd for ; Tue, 18 Nov 2025 13:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e8f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:39:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 18391412cecf - stable/14 - geom_zero.4: Document List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 18391412cecfc338fd4ac747e766fbc0721ca3f8 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:39:25 +0000 Message-Id: <691c770d.2e8f4.3a2f7cb1@gitrepo.freebsd.org> The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=18391412cecfc338fd4ac747e766fbc0721ca3f8 commit 18391412cecfc338fd4ac747e766fbc0721ca3f8 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-09 14:46:40 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:39:16 +0000 geom_zero.4: Document PR: 250593 Reviewed by: bcr, ziaee Thanks to: imp, markj MFC after: 1 week Fixes: 3843eba85d98 Add unmapped BIO support to GEOM ZERO Fixes: 24e1fdcd1a69 Allow to specify the byte which will be used for filling read buffer Fixes: 565bc101112c Add a very simple and small GEOM class - ZERO (cherry picked from commit 39acb7fd86eda721df402c2f1368b78cede161c3) --- share/man/man4/Makefile | 2 + share/man/man4/geom_zero.4 | 174 +++++++++++++++++++++++++++++++++++++++++++++ share/man/man4/zero.4 | 3 +- 3 files changed, 178 insertions(+), 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 2dda6b937dc2..66cec9586fc4 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -173,6 +173,7 @@ MAN= aac.4 \ geom.4 \ geom_linux_lvm.4 \ geom_uzip.4 \ + geom_zero.4 \ gif.4 \ ${_gve.4} \ gpio.4 \ @@ -1047,6 +1048,7 @@ MAN+= \ uvscom.4 \ zyd.4 +MLINKS+=geom_zero.4 gzero.4 MLINKS+=otus.4 if_otus.4 MLINKS+=rsu.4 if_rsu.4 MLINKS+=rtwn_usb.4 if_rtwn_usb.4 diff --git a/share/man/man4/geom_zero.4 b/share/man/man4/geom_zero.4 new file mode 100644 index 000000000000..8da09b1473c9 --- /dev/null +++ b/share/man/man4/geom_zero.4 @@ -0,0 +1,174 @@ +.\" +.\" Copyright (c) 2019 Greg White . All rights reserved. +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt GEOM_ZERO 4 +.Os +.Sh NAME +.Nm gzero , +.Nm geom_zero +.Nd GEOM-based zero disk/block device +.Sh SYNOPSIS +.Cd "options GEOM_ZERO" +.Pp +In +.Xr loader.conf 5 +or +.Xr sysctl.conf 5 : +.Cd kern.geom.zero.byte +.Cd kern.geom.zero.clear +.Sh DESCRIPTION +.Nm +is a +.Xr GEOM 4 +device simulating a one-exabyte disk. +It throws away any data written to it, +and returns the value of +.Va kern.geom.zero.byte +for every byte read from it. +.Pp +.Nm +differs from +.Xr zero 4 , +which is a regular character device and has an infinite length, +while +.Pa /dev/gzero +is a +.Xr GEOM 4 +provider of large, but limited, size. +.Pp +Consult +.Xr geom 8 +for instructions on how to use the supported commands of the +.Xr GEOM 4 +.Nm ZERO +class. +.Pp +.Nm +is useful for benchmarking performance of GEOM and GEOM classes +where compression of the data does not affect the results +.Po blocks from +.Pa /dev/gzero +compress exceptionally well +.Pc . +Examples of such benchmarks include +comparing the speed of two disk encryption algorithms and +comparing a hardware versus software implementation +of a single encryption algorithm. +.Sh MIB VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width "kern.geom.zero.clear" +.It Va kern.geom.zero.byte +This variable sets the fill byte of the +.Nm +device. +Default: +.Ql 0 . +.It Va kern.geom.zero.clear +This variable controls the clearing of the read data buffer. +If set to +.Ql 0 , +.Nm +will not copy any data into the read data buffers +and just return the read data buffers as they are without modifying them. +In particular, it will not not fill the read buffer with the value of +.Va kern.geom.zero.byte . +This is useful for read benchmarking to reduce the measurement noise +caused by extra memory initialization. +Default: +.Ql 1 . +.El +.Sh FILES +.Bl -tag -width /dev/gzero +.It Pa /dev/gzero +The +.Nm +device. +.El +.Sh EXAMPLES +Create the +.Pa /dev/gzero +device by loading the +.Nm geom_zero +kernel module: +.Bd -literal -offset indent +# geom zero load +.Ed +.Pp +Show information about the +.Nm +device: +.Bd -literal -offset indent +# geom zero list +Geom name: gzero +Providers: +1. Name: gzero + Mediasize: 1152921504606846976 (1.0E) + Sectorsize: 512 + Mode: r0w0egzero0 +.Ed +.Pp +Set the fill byte of the +.Nm +device to 70 +.Po decimal for letter +.Dq F +in +.Xr ascii 7 +.Pc : +.Bd -literal -offset indent +# sysctl kern.geom.zero.byte=70 +kern.geom.zero.byte: 0 -> 70 +# head -c 1 /dev/gzero +F +.Ed +.Pp +Benchmark read and write throughput of +.Xr geli 8 Ap s +default encryption algorithm with a 4-KiB sector size: +.Bd -literal -offset indent +# geom zero load +# geli onetime -s 4096 gzero +# sysctl kern.geom.zero.clear=0 +# dd if=/dev/gzero.eli of=/dev/zero bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.258195 secs (853398307 bytes/sec) +# dd if=/dev/zero of=/dev/gzero.eli bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.663118 secs (645619658 bytes/sec) +.Ed +.Sh SEE ALSO +.Xr GEOM 4 , +.Xr zero 4 , +.Xr geom 8 , +.Xr sysctl 8 , +.Xr bio 9 +.Sh HISTORY +A +.Nm +device first appeared in +.Fx 6 . +.Sh AUTHORS +.An -nosplit +The +.Nm +device was written by +.An Paweł Jakub Dawidek Aq Mt pjd@FreeBSD.org . +.Pp +The +.Nm +manual page was originally written by +.An Greg White Aq Mt gkwhite@gmail.com +and rewritten by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org +before landing in +.Fx . diff --git a/share/man/man4/zero.4 b/share/man/man4/zero.4 index f1cd52d455d1..85651d53d342 100644 --- a/share/man/man4/zero.4 +++ b/share/man/man4/zero.4 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 7, 1996 +.Dd November 9, 2025 .Dt ZERO 4 .Os .Sh NAME @@ -48,6 +48,7 @@ supply of null bytes when read. .El .Sh SEE ALSO .Xr full 4 , +.Xr gzero 4 , .Xr null 4 .Sh HISTORY A From nobody Tue Nov 18 13:39:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9m262b5sz6H96d for ; Tue, 18 Nov 2025 13:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9m261tp5z3pqm for ; Tue, 18 Nov 2025 13:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0xFgUorLuPbcf1zzg07s8xvQCXH10fxcxU6jM6YMZII=; b=X3sym5wdb4LEVAB0XFBEfGuHwYAZxaAai+1COFF/XBfPN6F73anURxq1zNO+KVbAHgj7TM 1UK5rARYVn80go4FcH7fgeSnSSFsJaKQi9RBJOkzRbeI4VymfmzZCBbZ3qzZx2Pzy/GeQq aMBOhLc278aeczi/Xi0XcEqa4rDbwgkA+sEmGTQIFuUXQyldcnWfeRl9ZrqqE3VTphfTnC spY6Xl6PobJ2f0hU65Ml3YrVFj0qTx9JVKEcvRhjpvKz0yt/m3AsvIQYQTKj97E1pm228Y ysj1qpgEva7oStZNQdAXfcvpJq6rLXY1pvlVZa5D6Ad0BbmbOiD73YIzcCcwPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763473198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0xFgUorLuPbcf1zzg07s8xvQCXH10fxcxU6jM6YMZII=; b=nEyVtxvCCqhsMLVgWgRTvQjtf9060XnEfzjSclq9fvX+rueEtpGjeeR1oK2LdvhsjlqNah 8aviWLOJsAcuTxXhh3hKpvn2MrerQQelVqDJFEjnxnmE2alRr702JSCJzxIKEV7+QTLWx+ oR5t8gRU8Bug8rDWoHTUD7n3GY2c9z73+DnVNy+4f22Ub91csRvEvqCtuGaPigg9r2uKYG mhz8xj9d6lZxpPM5R5R/onXRJR27+3ZBVRuJo1Lol7GeS+HSpyI4nm6eAk76qaCeSRBoye ubITE3/5W7PBnUIS+tTE8mF4r235v4mN3tiGXX+ktlLEGSiVjKgasDGtc3pF4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763473198; a=rsa-sha256; cv=none; b=ZoqkmuqRFNri0EYybF2Hy95/YV10WwPFZBtnqHCitJdbVeWTknXRCEoYeoxfY2zcY/aTqF d+hTInZbKNZ5ErCNsfEwZxjAzzi3NnVywFsrlDSOjhhaUbIYa8w/7VljyAd9W3J3aiSlMt j+gCVDsKHy2tCx7jM1rQZiDMxDMeNetbD0eOrjZypv4hTwAkr1rdepejvhwTMMKfxvS6P+ 7Hr8TN8y10yXIuDK1Jambear/ngRLrws3yHXgA8ifBJeJillWvb5SCOT2JvYMXZmaPNZZd KEUihIGAilJ9W498VJ5l3tPOnNQd+yiJbD+PitjatmFgPXljPJWtYUwLiIdZeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9m2618lPzx5w for ; Tue, 18 Nov 2025 13:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2de61 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 13:39:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6ec3d4402af6 - stable/13 - geom_zero.4: Document List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6ec3d4402af60ad91d4dae829c77416ed60cf896 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 13:39:58 +0000 Message-Id: <691c772e.2de61.275c2775@gitrepo.freebsd.org> The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=6ec3d4402af60ad91d4dae829c77416ed60cf896 commit 6ec3d4402af60ad91d4dae829c77416ed60cf896 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-11-09 14:46:40 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-18 13:39:49 +0000 geom_zero.4: Document PR: 250593 Reviewed by: bcr, ziaee Thanks to: imp, markj MFC after: 1 week Fixes: 3843eba85d98 Add unmapped BIO support to GEOM ZERO Fixes: 24e1fdcd1a69 Allow to specify the byte which will be used for filling read buffer Fixes: 565bc101112c Add a very simple and small GEOM class - ZERO (cherry picked from commit 39acb7fd86eda721df402c2f1368b78cede161c3) --- share/man/man4/Makefile | 2 + share/man/man4/geom_zero.4 | 174 +++++++++++++++++++++++++++++++++++++++++++++ share/man/man4/zero.4 | 3 +- 3 files changed, 178 insertions(+), 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 49dbff287e18..5ea51eb02eb0 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -172,6 +172,7 @@ MAN= aac.4 \ geom_linux_lvm.4 \ geom_map.4 \ geom_uzip.4 \ + geom_zero.4 \ gif.4 \ ${_gve.4} \ gpio.4 \ @@ -1068,6 +1069,7 @@ MAN+= \ uvscom.4 \ zyd.4 +MLINKS+=geom_zero.4 gzero.4 MLINKS+=otus.4 if_otus.4 MLINKS+=rsu.4 if_rsu.4 MLINKS+=rtwn_usb.4 if_rtwn_usb.4 diff --git a/share/man/man4/geom_zero.4 b/share/man/man4/geom_zero.4 new file mode 100644 index 000000000000..8da09b1473c9 --- /dev/null +++ b/share/man/man4/geom_zero.4 @@ -0,0 +1,174 @@ +.\" +.\" Copyright (c) 2019 Greg White . All rights reserved. +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd November 9, 2025 +.Dt GEOM_ZERO 4 +.Os +.Sh NAME +.Nm gzero , +.Nm geom_zero +.Nd GEOM-based zero disk/block device +.Sh SYNOPSIS +.Cd "options GEOM_ZERO" +.Pp +In +.Xr loader.conf 5 +or +.Xr sysctl.conf 5 : +.Cd kern.geom.zero.byte +.Cd kern.geom.zero.clear +.Sh DESCRIPTION +.Nm +is a +.Xr GEOM 4 +device simulating a one-exabyte disk. +It throws away any data written to it, +and returns the value of +.Va kern.geom.zero.byte +for every byte read from it. +.Pp +.Nm +differs from +.Xr zero 4 , +which is a regular character device and has an infinite length, +while +.Pa /dev/gzero +is a +.Xr GEOM 4 +provider of large, but limited, size. +.Pp +Consult +.Xr geom 8 +for instructions on how to use the supported commands of the +.Xr GEOM 4 +.Nm ZERO +class. +.Pp +.Nm +is useful for benchmarking performance of GEOM and GEOM classes +where compression of the data does not affect the results +.Po blocks from +.Pa /dev/gzero +compress exceptionally well +.Pc . +Examples of such benchmarks include +comparing the speed of two disk encryption algorithms and +comparing a hardware versus software implementation +of a single encryption algorithm. +.Sh MIB VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width "kern.geom.zero.clear" +.It Va kern.geom.zero.byte +This variable sets the fill byte of the +.Nm +device. +Default: +.Ql 0 . +.It Va kern.geom.zero.clear +This variable controls the clearing of the read data buffer. +If set to +.Ql 0 , +.Nm +will not copy any data into the read data buffers +and just return the read data buffers as they are without modifying them. +In particular, it will not not fill the read buffer with the value of +.Va kern.geom.zero.byte . +This is useful for read benchmarking to reduce the measurement noise +caused by extra memory initialization. +Default: +.Ql 1 . +.El +.Sh FILES +.Bl -tag -width /dev/gzero +.It Pa /dev/gzero +The +.Nm +device. +.El +.Sh EXAMPLES +Create the +.Pa /dev/gzero +device by loading the +.Nm geom_zero +kernel module: +.Bd -literal -offset indent +# geom zero load +.Ed +.Pp +Show information about the +.Nm +device: +.Bd -literal -offset indent +# geom zero list +Geom name: gzero +Providers: +1. Name: gzero + Mediasize: 1152921504606846976 (1.0E) + Sectorsize: 512 + Mode: r0w0egzero0 +.Ed +.Pp +Set the fill byte of the +.Nm +device to 70 +.Po decimal for letter +.Dq F +in +.Xr ascii 7 +.Pc : +.Bd -literal -offset indent +# sysctl kern.geom.zero.byte=70 +kern.geom.zero.byte: 0 -> 70 +# head -c 1 /dev/gzero +F +.Ed +.Pp +Benchmark read and write throughput of +.Xr geli 8 Ap s +default encryption algorithm with a 4-KiB sector size: +.Bd -literal -offset indent +# geom zero load +# geli onetime -s 4096 gzero +# sysctl kern.geom.zero.clear=0 +# dd if=/dev/gzero.eli of=/dev/zero bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.258195 secs (853398307 bytes/sec) +# dd if=/dev/zero of=/dev/gzero.eli bs=4k count=$((1024 * 256)) +262144+0 records in +262144+0 records out +1073741824 bytes transferred in 1.663118 secs (645619658 bytes/sec) +.Ed +.Sh SEE ALSO +.Xr GEOM 4 , +.Xr zero 4 , +.Xr geom 8 , +.Xr sysctl 8 , +.Xr bio 9 +.Sh HISTORY +A +.Nm +device first appeared in +.Fx 6 . +.Sh AUTHORS +.An -nosplit +The +.Nm +device was written by +.An Paweł Jakub Dawidek Aq Mt pjd@FreeBSD.org . +.Pp +The +.Nm +manual page was originally written by +.An Greg White Aq Mt gkwhite@gmail.com +and rewritten by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org +before landing in +.Fx . diff --git a/share/man/man4/zero.4 b/share/man/man4/zero.4 index f1cd52d455d1..85651d53d342 100644 --- a/share/man/man4/zero.4 +++ b/share/man/man4/zero.4 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 7, 1996 +.Dd November 9, 2025 .Dt ZERO 4 .Os .Sh NAME @@ -48,6 +48,7 @@ supply of null bytes when read. .El .Sh SEE ALSO .Xr full 4 , +.Xr gzero 4 , .Xr null 4 .Sh HISTORY A From nobody Tue Nov 18 14:04:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9mZT546Mz6HC0V for ; Tue, 18 Nov 2025 14:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9mZT1t8mz3vZ8 for ; Tue, 18 Nov 2025 14:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763474673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=INROj0bnNUFACH+UA0b1aXJloAR5I38lUm0Y9AwJ87o=; b=cvcqN9z3UqmB+BC7v/WHr2MelGbIXzeaIFkTDJLqN54xaw65FHZCayTe5cOVXBehCL8fO4 9kEEJxClz0fAqq2Awzqbu0blen8rpDpfKNW4zVHasACcHtC+17w5JkQik9QGKMwmtQGd7+ CtXaUet7W0j7yyn/GRqaNTvCKHcH316gA2pKIsUDBtUasNW287DNICzPOEk7rt5FS2hJQJ 0jrdwcdeqRRDhmgVStWQG38R9UauAal7X/Ozzg6ACP86HLMHYjm27KeK4W/ybaZMKzzGQm gGyb4aj8CCgKXEdewSEJNxFuGzKAuUs8hLlejfqJCV+h5k8WsQTQKqotkBVOSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763474673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=INROj0bnNUFACH+UA0b1aXJloAR5I38lUm0Y9AwJ87o=; b=nqiY2V6liFiCYiCbAD8yqpU5Fqx9dFFieT69IvIDMbN+LiQ44VhJ3iwrtxZJfG6BJhOivx aqRa/J0vvRtkOU4DlToH2kLXRXQ5bnF2aiiqSh1/sm8vEFyM/QR7lLoR5hhvO8yR71Gkuh EmvoymZiSm+REcTkq1Ba6Fi0TEnsrb3VVBFgrHveeX4fkBRAD+hZjNrDrXOGwHJ6Mm3wfL 7gZbFtpV2baHGzNjxc1px4pqzDyuqKbAvJbP8fMYSr1pSHvDWnDSRMex2kiuTQjQs7WNl0 +Vn07IcJkuOwVCCOKomiZKgvn/mlapVRTy9z0l9vONnZL+u66XzvAahm/PadYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763474673; a=rsa-sha256; cv=none; b=UtOeLexEzmmej11yB1wOC/Wk26mWkMpC3DadLHM4ErYf/BynyMpaTCuOY1mC1Q2R3TSkYm hakaw0n1XVXwYn2CAcdxfq33bwIqbrK/oLVskSxFEn+MYRriAcDb1KCf/u0DcXccTRfvhg k548SzVH/eJmwqrSvPPvmdrMbqDUiVbrwflGmvSnVYL5CUPoCFglU7J+17ASunkJpWf6cu p8mEzhh1VIPahtnY3mqISyWpy4ka2w/fXmt+w9WyKJc/HLv5DptUSBLZ+YKpe9llvt7RNq WXewxsgXCkxfIWlPVP0Iz8tw5sTsZfbcO18ki6l4JvOknlI0b9xvQsv2EgNOZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9mZT1NBZzxn4 for ; Tue, 18 Nov 2025 14:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3227a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 14:04:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 484fa40ca71b - stable/15 - zfs: fix aarch64 build after zfs-2.4.0-rc4 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 484fa40ca71bc9c00ee6d3729e5e27cc5d68e131 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 14:04:33 +0000 Message-Id: <691c7cf1.3227a.389b4e4e@gitrepo.freebsd.org> The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=484fa40ca71bc9c00ee6d3729e5e27cc5d68e131 commit 484fa40ca71bc9c00ee6d3729e5e27cc5d68e131 Author: Martin Matuska AuthorDate: 2025-11-17 19:15:33 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 14:03:54 +0000 zfs: fix aarch64 build after zfs-2.4.0-rc4 (cherry picked from commit fb709935d64d5fd4ad21cf8c69faf580760999e4) --- sys/modules/zfs/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index ec531ed646a7..7a4d0bb51376 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -475,8 +475,6 @@ CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICA CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .if ${MACHINE_ARCH} == "aarch64" -__ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h -CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.error_private.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.fse_compress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} From nobody Tue Nov 18 15:02:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsh5YGkz6HH01 for ; Tue, 18 Nov 2025 15:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsh4lbgz44VB for ; Tue, 18 Nov 2025 15:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+iFNxlFrcsSZI0c0fJFTYkXkDsMdO0iUrlo3FiA2H3c=; b=h8S6Jzc69QsCINQiuP/hynj+BTa6/AzPUr3H15l4dhSMEXtAoxAXpJHaNFLkX37jFcw2do T1kWO6vkTkXwLCvp0eJNag2LcJaImlfm1Sre9G1vqIBYPaqycK9HYySWX1zc0tPBR1slak C3p+zdG3GElQV+2bhqBu2nhlmrzTOUVWwagrccQgSO/1mEZZHwRgMrRgYqWmjPUL3oPUuX FeqvS2YYcBrC1rGPp6TvRKAWudtuSbk8Z4nMxE5BW/CjcTVYxdQiwGUxo5nYIx8gxOp+wR GL4DM1yQHLT4ndIJll30/tOi4GLFHUw2Hyy8g3iwOPUfRCdCNWe/oqDi7UvV+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+iFNxlFrcsSZI0c0fJFTYkXkDsMdO0iUrlo3FiA2H3c=; b=pxHFV/zbsFUVd4R+JKtk6nb6T1QBxor8ZhnXQVoidoCzCBg3UQuXOiQ9JgJMDdQiUn30Oz Z8O/UD+bJp60cVLrH9IoxawndaEgCJfw9ghIJSG50RpXg/4pKpkTMZQ+fQlrveQr6U+Lsa TYdtcu/t/jPoqaQcrlKeBmSc7v/DAV4UPHTqtNSbJ/CHsLuLcTqo9mh4Sp1cw7oKDBRa4x h7WS9NLiDkNA+J4X6iCmODF31I57AqF6TXD69PgjlE/4fzzm6ueONq9WjBJUQe8cUEc/IK +T7hdCAzeizPeWy6s6LsHH88UWnX/WR0NDR0KMZBtjBp87IY4ulDr49Gay0x8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478168; a=rsa-sha256; cv=none; b=t4siwpeuNMDuPdb07D0NQL01Rf6b/6BBD3QkXpUEyLi/s75kqqLd6s3vzG+JceeLtXgk+z /BQjsPOuPDANFLFB/vPbEFihW642XgsokrDiOQXzVlDVrhIoq/00v2qKxsnNh3xng5TIHz 9ZsqlwtBzW7hGqhYTtnXhOwyyspTyz1jov+qN6eAMCUE/+Hp2huozaCv2dSUh9qv6OqMzy p8BnFEam7duG3hJORIhQ4cJy2MvVRxF2/rCnXiOj6JmlzFLiYZiLJ+tc+1nEKAsR26iy6F bFnHhQ81t5FNFug/7BC11t506Nu/Wu4HK5MlVyGI7h0249eMmUQLDGiEoI7F2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsh403lz102V for ; Tue, 18 Nov 2025 15:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3882a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 187e4b42f4e1 - stable/15 - multicast tests: Run in VNET jails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 187e4b42f4e1c422a256883507b80216c89ce15d Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:48 +0000 Message-Id: <691c8a98.3882a.6848b27c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=187e4b42f4e1c422a256883507b80216c89ce15d commit 187e4b42f4e1c422a256883507b80216c89ce15d Author: Mark Johnston AuthorDate: 2025-11-09 13:00:19 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:56:38 +0000 multicast tests: Run in VNET jails The tests themselves create identically named jails, resulting in spurious failures when the tests are run in parallel. MFC after: 1 week (cherry picked from commit b3b279b801d571919c8bbd5de4325d8819ffd59a) --- tests/sys/netinet/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index cc525bf24480..fb21196a5550 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -45,6 +45,8 @@ TEST_METADATA.fibs_test+= execenv="jail" \ TEST_METADATA.forward+= required_programs="python" \ execenv="jail" \ execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.multicast+= execenv="jail" \ + execenv_jail_params="vnet" TEST_METADATA.output+= required_programs="python" TEST_METADATA.redirect+= required_programs="python" From nobody Tue Nov 18 15:02:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsk1FR3z6HHFZ for ; Tue, 18 Nov 2025 15:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsj5Tjhz44Xh for ; Tue, 18 Nov 2025 15:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hrNYWSw9SKkWnDVl1Ho0LQgtk1L4AurnXD8KnQwDDNE=; b=XjzyXjxJQh6CSwH6vRrQN4plhPFCDpbBzYbImquQ6/x7PhuN3KOVxzANODl3bkk/jr81eP eH/mCkSLn4j6S3LpquMQNVhMm36zRb7PluIaREAdaqXKzjpZVpFDtaHZ7Ne7kUYcGkB4KC /lrydEFdepu45S2Nd50b71COiP99N7mvdqhEpM5SjzZbnNqs5KP4XrCgwLuiNQLQ3+vA+x 7TKur+a/vQ3FaQ9QMEgKV64pMXUUoYxfsYa7nDIW4QxH0aSPk7/h/YVEjTaEEkGYgkPjKK K5jFvdUDvs1KnH0rrGz4ZLLxM2Gw/0nK/MJB+b9xYyl+Q7sZR/teU6stJrsAkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hrNYWSw9SKkWnDVl1Ho0LQgtk1L4AurnXD8KnQwDDNE=; b=gKBBUzntorPOSb0na8T6nnHVC66YvZVbYS+31vK/pbGbXoQ3F8EbGctyZCWURIl6lUcZ3K F/+V8KxNxUV1ByH//IkvCUm9A8OSLSdNzSr5xW2DBiBIbTm9JWK/9K+4XPLTdb92n5TWZL v9PUEZVYvS2728lYJ+aXDlCcLwx3vqTeAYPU/4PXEGV3zeF5MhW+ZipIHqvuWDKrtkaGaz t0pZ2UMNLJVcHgo2D0VKfXTiSKcErban5ZTaf+tXI0rFN99IEpi45NBjdPfLg6SPhNDVmi 9tiEHUtnT1iMHqZ+jUwdxZ/lBkn1KeQvbS2lfy5Ldwu+gf1hrsNjQl3s1U/hlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478169; a=rsa-sha256; cv=none; b=CWWjP+Fg78MIubUnhYHvwIYkkdRX1d4ztpHb8+i+12mtxoK5LR8t6qKmKPzL88IVaxeoex s+Q9DCFJXxNlK0DJIw1IId4hCQFGuWesftipoV4ucBAkRj4Fb9ly+yFsRmosw98Ra6i27/ 041a/GaWPjAAt2UqNARv93q5ZlY/fPoythjutsuHVCoACa0X3hOK9STWrhCYg2qpCYn7Sf qbdDLhHLUpCmOOWDovVEzrayLEVBN0YGApnc4m94KbUEyPTE1D3fojSRPXn1xc0OUy1ia4 3C8GI09q2xyAL0kZYzuLB/GU1Y8/T2k+R1NLfo0MtGiAVSK+ERur5c7M87iC/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsj4mDyz1074 for ; Tue, 18 Nov 2025 15:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 368cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 557047e9fa51 - stable/15 - vmm: Simplify the VM_ALLOC_MEMSEG ioctl a bit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 557047e9fa51fb697551ef3a717c3971aafeb21b Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:49 +0000 Message-Id: <691c8a99.368cb.3896748a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=557047e9fa51fb697551ef3a717c3971aafeb21b commit 557047e9fa51fb697551ef3a717c3971aafeb21b Author: Mark Johnston AuthorDate: 2025-11-04 13:52:01 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:27 +0000 vmm: Simplify the VM_ALLOC_MEMSEG ioctl a bit We can free the mask earlier, simplifying some error paths. No functional change intended. Reviewed by: corvink, jhb, emaste Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53418 (cherry picked from commit c3f41c02c9a5bf45504af59c351f0ae336719753) --- sys/dev/vmm/vmm_dev.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index ebbceb25b69e..bd20acac1d2d 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -619,20 +619,16 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, } error = domainset_populate(&domain, mask, mseg->ds_policy, mseg->ds_mask_size); - if (error) { - free(mask, M_VMMDEV); + free(mask, M_VMMDEV); + if (error) break; - } domainset = domainset_create(&domain); if (domainset == NULL) { error = EINVAL; - free(mask, M_VMMDEV); break; } - free(mask, M_VMMDEV); } error = alloc_memseg(sc, mseg, sizeof(mseg->name), domainset); - break; } case VM_GET_MEMSEG: From nobody Tue Nov 18 15:02:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsl2jpDz6HH03 for ; Tue, 18 Nov 2025 15:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsk6jwvz44Xy for ; Tue, 18 Nov 2025 15:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jK58DV4lCVatUIHufnesuLBHjpnrTPdMMtHFpQSV7mo=; b=ElpkNB9SS5wcBjWZ0wL3RnXVSoOaeFauaym93KbJbUwcC9DkN/S6nR6bIcSo9R0lXnN3Wn WZo45sPFptvOSqM2zOQc3R0TESFR6HZcyYYzQGLkB+yKoJe8WsUcLsKyHcCYda+HtYEnxq UayG2fc6/63+WsqqP86gJbA4nlaiyUUZN+CceRn23PJi+BhpXPqrvqCDTc3lhK+WaKMWIt mYRd8dKnAP4UPjB8bwWIFCNjRs21aMi381u8cnOB0lRErnePISMb29Xsk2Ce4di4ff+XF7 YF5+aQY6lGIicCInOlfDGDoH06CpcT+A9gPo0ry84795fhqJM+grxqMwUqOmFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jK58DV4lCVatUIHufnesuLBHjpnrTPdMMtHFpQSV7mo=; b=YmiJZ4EuWRF2QI7TZWSz4MpnQbvk4err++GH8KADHg62fHkT/3erbjoWmprQL+oiAdkwbT /sCv7js5sO7LsrET00XpIj1XpEmMXzp1yPpxCdXHidU4XUgeAFkffT6BEulkDa5G/GERYc sXeoY2bXpjomB4+R/6Os3qgAvUtaWl0+1EoOwxkyn7EvE9WIwqzUY1wgpDfCMHwZ+xCQNn og2OrlJulQ0eWbhduK1Yz8DnI7Hc+be8rUAzIw/snh0X6K3SMrTnHGo1UKOyJS26ccfxut dNDt0SMafiATJXICvPsH5dgaC7muViVJuobEATeJaFG6m3vOfqnZDggS9WKsxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478171; a=rsa-sha256; cv=none; b=uk1WcmRwD3l/KBtQIFWwiK1FACJbbLK73d5n3BKpGEfDrmTMfGTqltueG//kd17kjSu9lX 3Srncuqztw3r/3qxyQjTKoFN70BXryMVXbvay58JVcChJRNh2n3bagbr7ra9cLTO/SccVj FMRbqgmvV4tdHt72fmcVeqWlcmnHBxTr5ZnjF7F2nyU8aZw2b0h0LnjTNOF50grCOU9oxU WmCwwXfWuR7OH4nykW/C4bkkRVv3JoTNXqDSx7+Op2CoEeNhpiLqZVHwSRGFXez2cvgcjN cdCeOqxKARN2MZ2lmXV6jYwMXrSzeoc+v7NuIridbS071ph7SqKRCIimaxPh0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsk5Zm6zyrM for ; Tue, 18 Nov 2025 15:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38125 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 869faf4c4823 - stable/15 - amd64/vmm: Factor vcpu_notify_event() into two functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 869faf4c4823c78240724ad326df1968f8cb15a9 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:50 +0000 Message-Id: <691c8a9a.38125.4dd1dc60@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=869faf4c4823c78240724ad326df1968f8cb15a9 commit 869faf4c4823c78240724ad326df1968f8cb15a9 Author: Mark Johnston AuthorDate: 2025-11-04 13:52:21 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:31 +0000 amd64/vmm: Factor vcpu_notify_event() into two functions vcpu_notify_event() previously took a boolean parameter which determines whether the implementation should try to use a posted interrupt. On arm64 and riscv, the implementation of vcpu_notify_event() is otherwise identical to that of amd64. With the aim of deduplicating vcpu state management code, introduce a separate amd64-only function which tries to use posted interrupts. This requires some duplication with vcpu_notify_event_locked(), but only a little bit. Then, fix up callers. No functional change intended. Reviewed by: corvink, jhb MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53419 (cherry picked from commit 78a3a1e78ad8812bcf82e30b52ba2f21c49a3407) --- sys/amd64/include/vmm.h | 3 ++- sys/amd64/vmm/io/vlapic.c | 2 +- sys/amd64/vmm/vmm.c | 42 ++++++++++++++++++++++++------------------ sys/amd64/vmm/vmm_lapic.c | 2 +- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index ad67510fecf3..c7baa5e4c54a 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -383,7 +383,8 @@ vcpu_should_yield(struct vcpu *vcpu) #endif void *vcpu_stats(struct vcpu *vcpu); -void vcpu_notify_event(struct vcpu *vcpu, bool lapic_intr); +void vcpu_notify_event(struct vcpu *vcpu); +void vcpu_notify_lapic(struct vcpu *vcpu); struct vm_mem *vm_mem(struct vm *vm); struct vatpic *vm_atpic(struct vm *vm); struct vatpit *vm_atpit(struct vm *vm); diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index 9879dfa164a4..afd5045de574 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -456,7 +456,7 @@ vlapic_fire_lvt(struct vlapic *vlapic, u_int lvt) return (0); } if (vlapic_set_intr_ready(vlapic, vec, false)) - vcpu_notify_event(vlapic->vcpu, true); + vcpu_notify_lapic(vlapic->vcpu); break; case APIC_LVT_DM_NMI: vm_inject_nmi(vlapic->vcpu); diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 473887240b9b..92d1b310f6ea 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -274,7 +274,7 @@ u_int vm_maxcpu; SYSCTL_UINT(_hw_vmm, OID_AUTO, maxcpu, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &vm_maxcpu, 0, "Maximum number of vCPUs"); -static void vcpu_notify_event_locked(struct vcpu *vcpu, bool lapic_intr); +static void vcpu_notify_event_locked(struct vcpu *vcpu); /* global statistics */ VMM_STAT(VCPU_MIGRATIONS, "vcpu migration across host cpus"); @@ -1033,7 +1033,7 @@ vcpu_wait_idle(struct vcpu *vcpu) KASSERT(vcpu->state != VCPU_IDLE, ("vcpu already idle")); vcpu->reqidle = 1; - vcpu_notify_event_locked(vcpu, false); + vcpu_notify_event_locked(vcpu); VMM_CTR1(vcpu, "vcpu state change from %s to " "idle requested", vcpu_state2str(vcpu->state)); msleep_spin(&vcpu->state, &vcpu->mtx, "vmstat", hz); @@ -1514,7 +1514,7 @@ vm_handle_suspend(struct vcpu *vcpu, bool *retu) */ for (i = 0; i < vm->maxcpus; i++) { if (CPU_ISSET(i, &vm->suspended_cpus)) { - vcpu_notify_event(vm_vcpu(vm, i), false); + vcpu_notify_event(vm_vcpu(vm, i)); } } @@ -1588,7 +1588,7 @@ vm_suspend(struct vm *vm, enum vm_suspend_how how) */ for (i = 0; i < vm->maxcpus; i++) { if (CPU_ISSET(i, &vm->active_cpus)) - vcpu_notify_event(vm_vcpu(vm, i), false); + vcpu_notify_event(vm_vcpu(vm, i)); } return (0); @@ -2068,7 +2068,7 @@ vm_inject_nmi(struct vcpu *vcpu) { vcpu->nmi_pending = 1; - vcpu_notify_event(vcpu, false); + vcpu_notify_event(vcpu); return (0); } @@ -2095,7 +2095,7 @@ vm_inject_extint(struct vcpu *vcpu) { vcpu->extint_pending = 1; - vcpu_notify_event(vcpu, false); + vcpu_notify_event(vcpu); return (0); } @@ -2266,14 +2266,14 @@ vm_suspend_cpu(struct vm *vm, struct vcpu *vcpu) vm->debug_cpus = vm->active_cpus; for (int i = 0; i < vm->maxcpus; i++) { if (CPU_ISSET(i, &vm->active_cpus)) - vcpu_notify_event(vm_vcpu(vm, i), false); + vcpu_notify_event(vm_vcpu(vm, i)); } } else { if (!CPU_ISSET(vcpu->vcpuid, &vm->active_cpus)) return (EINVAL); CPU_SET_ATOMIC(vcpu->vcpuid, &vm->debug_cpus); - vcpu_notify_event(vcpu, false); + vcpu_notify_event(vcpu); } return (0); } @@ -2381,7 +2381,7 @@ vm_set_x2apic_state(struct vcpu *vcpu, enum x2apic_state state) * to the host_cpu to cause the vcpu to trap into the hypervisor. */ static void -vcpu_notify_event_locked(struct vcpu *vcpu, bool lapic_intr) +vcpu_notify_event_locked(struct vcpu *vcpu) { int hostcpu; @@ -2389,12 +2389,7 @@ vcpu_notify_event_locked(struct vcpu *vcpu, bool lapic_intr) if (vcpu->state == VCPU_RUNNING) { KASSERT(hostcpu != NOCPU, ("vcpu running on invalid hostcpu")); if (hostcpu != curcpu) { - if (lapic_intr) { - vlapic_post_intr(vcpu->vlapic, hostcpu, - vmm_ipinum); - } else { - ipi_cpu(hostcpu, vmm_ipinum); - } + ipi_cpu(hostcpu, vmm_ipinum); } else { /* * If the 'vcpu' is running on 'curcpu' then it must @@ -2412,10 +2407,21 @@ vcpu_notify_event_locked(struct vcpu *vcpu, bool lapic_intr) } void -vcpu_notify_event(struct vcpu *vcpu, bool lapic_intr) +vcpu_notify_event(struct vcpu *vcpu) +{ + vcpu_lock(vcpu); + vcpu_notify_event_locked(vcpu); + vcpu_unlock(vcpu); +} + +void +vcpu_notify_lapic(struct vcpu *vcpu) { vcpu_lock(vcpu); - vcpu_notify_event_locked(vcpu, lapic_intr); + if (vcpu->state == VCPU_RUNNING && vcpu->hostcpu != curcpu) + vlapic_post_intr(vcpu->vlapic, vcpu->hostcpu, vmm_ipinum); + else + vcpu_notify_event_locked(vcpu); vcpu_unlock(vcpu); } @@ -2477,7 +2483,7 @@ restart: */ for (i = 0; i < vm->maxcpus; i++) { if (CPU_ISSET(i, &dest)) - vcpu_notify_event(vm_vcpu(vm, i), false); + vcpu_notify_event(vm_vcpu(vm, i)); } return (vm_handle_rendezvous(vcpu)); diff --git a/sys/amd64/vmm/vmm_lapic.c b/sys/amd64/vmm/vmm_lapic.c index 0cae01f172ec..63bdee69bb59 100644 --- a/sys/amd64/vmm/vmm_lapic.c +++ b/sys/amd64/vmm/vmm_lapic.c @@ -61,7 +61,7 @@ lapic_set_intr(struct vcpu *vcpu, int vector, bool level) vlapic = vm_lapic(vcpu); if (vlapic_set_intr_ready(vlapic, vector, level)) - vcpu_notify_event(vcpu, true); + vcpu_notify_lapic(vcpu); return (0); } From nobody Tue Nov 18 15:02:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsm1rdhz6HH9h for ; Tue, 18 Nov 2025 15:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsl6h48z44hB for ; Tue, 18 Nov 2025 15:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VV3h3ndPHRTfDcS2C7fsN5y/YE0y4zVZYS6uQdysNK0=; b=rGm6WRZQoubPLvsqax0bKMs0fEhsyJ0ai4U3oS6w8gWxzUvdkXNDli6k87B4tN1Dr/lrk/ /91okQp68GJGQkJok8SfIxrtsiS6+kpQp+V7rLJnlqCiKxDcO5PtPRCJ/uHjD7s2PBSL5/ qtQ80fYefhQFDaFCJB/mT+tz7vt9eYrENoUufhaNgS6KpE9RNciO39xcGfbspr5xb7tkYC mjMy3heJyhXZIrCT33FIWdvbuiSAdLNG7deYuVdEQs6mljczN4iWGX2b8NnkKihFWxMARH dru9KPLh3TioKbQ/DmIA4MBfMCZ4cPG20hGwfNk5ZqrB53h0dLgFhtCaF36hXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VV3h3ndPHRTfDcS2C7fsN5y/YE0y4zVZYS6uQdysNK0=; b=m9prQEb7gr/oCLizkrn0tLfUB1yV31J/WVzpQS88zKuBFgtBKbunerRWbvzJQ/ZaBZ1hhp ud2KAj2s8/xePgemzAqJpfK3eTGC0DgTs9a0XX8Cq4DVW11sfoHh+13PD4FxX44E/fhL0q dkFa+rp2X/OTzz07TZth8fXKXJ4/ZqasoEP42UaxUsicI1JppAlKiDWH690odSPk50XG/O cYigKYsBoCUxArecKgSsIMlijfO3jeWSP7f2jZxBlzitWW1qT2LB9Zj4j37PpCS84g9HhK 4/8ko4QE5Y73lJZSBNXtjf6TXO9TcJ5XcD4MK4PZzKdVYrPsFsxOF2wVsojqmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478172; a=rsa-sha256; cv=none; b=pM9ShSf0I7KD9OJtfkNq7g3JGRlNXdeBAiqhtud5zqqu+oH09p8ISYtSE52dVTp8KYOOTn LAdjmA8OceLcDwSAiHriHVMmwVDVMaIe8KacLpegZ3egQhu7CS/rpLQ6raS/w0n6E+pHmT AxjTIQyaF1Rv+qVUmCX3pPYgNIhjeVucz1utoK6F0nFL+HKz6t5vGol6aRDCf1+IDFts3E UXuR1mU42iob0fzpAuiRDOit0MPF/woRn8kDvO7p/Y8k2keFCKRC47nsQEYPq+Opy9dwLL MnLOLfNZunEjZ3JLoORqtGib2rlO3I4VYtLk2pY8SH1n2EXhkf7UeJhMNyZH9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsl61Z5z10SG for ; Tue, 18 Nov 2025 15:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36f50 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: af1dd9cf3d9b - stable/15 - amd64/vmm: Remove useless global variables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: af1dd9cf3d9b99234f30a9325973daf488c0e40e Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:51 +0000 Message-Id: <691c8a9b.36f50.11f8683c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=af1dd9cf3d9b99234f30a9325973daf488c0e40e commit af1dd9cf3d9b99234f30a9325973daf488c0e40e Author: Mark Johnston AuthorDate: 2025-11-04 13:54:07 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:31 +0000 amd64/vmm: Remove useless global variables No functional change intended. Reviewed by: corvink, jhb, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53420 (cherry picked from commit 3faad9e26018dfc0ab6da21a53c0310656187d7b) --- sys/amd64/vmm/vmm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 92d1b310f6ea..8f357fa6fb0f 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -573,12 +573,6 @@ vm_unlock_vcpus(struct vm *vm) sx_unlock(&vm->vcpus_init_lock); } -/* - * The default CPU topology is a single thread per package. - */ -u_int cores_per_package = 1; -u_int threads_per_core = 1; - int vm_create(const char *name, struct vm **retvm) { @@ -609,8 +603,8 @@ vm_create(const char *name, struct vm **retvm) M_ZERO); vm->sockets = 1; - vm->cores = cores_per_package; /* XXX backwards compatibility */ - vm->threads = threads_per_core; /* XXX backwards compatibility */ + vm->cores = 1; /* XXX backwards compatibility */ + vm->threads = 1; /* XXX backwards compatibility */ vm->maxcpus = vm_maxcpu; vm_init(vm, true); From nobody Tue Nov 18 15:02:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsn1cMGz6HGnj for ; Tue, 18 Nov 2025 15:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsn08Tnz44n5 for ; Tue, 18 Nov 2025 15:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/fzUWWi2HLhdpgHznJS9H6PupmmtFdRocZcdnaJnixQ=; b=ywqtEgPfZECEneA81+gxZvwpM7NkvPU3ei7gSBQdoDmTxdvQbFf+m0lr0u2lFzehLeQrUe 27FVBP7qgIsix7QthEPViXY/z329sJF8PfsjD5rJR96Azge9OEe6VdR0bofkLrS0B655Z4 mP9cXYMmknEj+PFsZx68evkdmM+w3bsVTPkVcw+stCvlG7k9wKTfpXwIGpwemg5x+NymXT ilU3GloGDI9rMM+O2Zgi7djG+UQj4oPmCA5nSq8+iZTRlOwdP9yuSjjajWOWweZXWpRsCS eN8shvvmQwaWGaoBU8ek/Ya6LZzolvZUi51QBgUZUxMZ8luXTrx0EURaTK5rZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/fzUWWi2HLhdpgHznJS9H6PupmmtFdRocZcdnaJnixQ=; b=m32qYrkqExFSuSGxAd93Gp2i2KrYa/hng8HDZ2ML6p2usJD4s9TEGrmhz3+eybFp0bpkJE a4pmOYoT+R3mAIyQ333UUW7Ke9nqbleGRxGhVoAhdVAD6/G4gEZDM8wt4yDWQiNlYhDw+7 iOJkjCpSX54636mqCcDn+3zZ61GlKGV6QNHI3TS/25v8jhKuYW4Ry0IJTqIjzpC7dMkd9j s+kEY3r0IVm5ZB3WUZKYO6HTdAvXZ4KXxmVNLIjftDyoDXfbZRXpDxVM8L0HKxLBTN0Vny tCAU/bTiFQLumroERdVQhEEBEYqzNzmc+Ps3kinbp7tw5d0R0wZc9tmAvWyN9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478173; a=rsa-sha256; cv=none; b=Sf7Q28mZOgh7ZutmR7SNvtdaJzwBlfbidGp5yTN8JCt1YRblkvYqm3EKJ1vBbe5tpWjq32 NPUq5HCCn5LPUCGS7diK85xknC6MZLUHClDdsdoP8lMsEMOxLZ9L5IAt1kHYJNnu4lLJ8M 1NkaSQwNzDbhyVCgbdsk4tjGQTwfZ+99TbQzYJz5tmOM/50yy4jCdj25PTd8lMLLL3kqqA uOMcyw0uf0ybygY1y+mpzhtyEE/7hYT9DgExtPjzjZpBHQZ2XuLrzy6rn/s7iXqf8ITYJs myX0NZM3kB4nIG7ay/cLCy2kU+AiOgsLr7wk+zi3RKEdMVjkCEbZ3bOOPknhoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsm6qCDz10Pn for ; Tue, 18 Nov 2025 15:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38309 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 16fe30d92da3 - stable/15 - vmm: Move the module load handler to vmm_dev.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 16fe30d92da3e3354635d5df28752373f2e07ebe Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:52 +0000 Message-Id: <691c8a9c.38309.cb60f52@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=16fe30d92da3e3354635d5df28752373f2e07ebe commit 16fe30d92da3e3354635d5df28752373f2e07ebe Author: Mark Johnston AuthorDate: 2025-11-04 13:54:27 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:32 +0000 vmm: Move the module load handler to vmm_dev.c Move the vmm_initialized check out of vm_create() and into the legacy sysctl handler. If vmm_initialized is false, /dev/vmmctl will not be available and so cannot be used to create VMs. Introduce new MD vmm_modinit() and vmm_modcleanup() routines which handle MD (de)initialization. No functional change intended. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53421 (cherry picked from commit e758074458df3b61773b7678ff47c4a835365d21) --- sys/amd64/vmm/vmm.c | 83 +++++++-------------------------------------------- sys/arm64/vmm/vmm.c | 73 ++++++-------------------------------------- sys/dev/vmm/vmm_dev.c | 65 ++++++++++++++++++++++++++++++++++++++-- sys/dev/vmm/vmm_dev.h | 5 ++-- sys/riscv/vmm/vmm.c | 65 ++++------------------------------------ 5 files changed, 90 insertions(+), 201 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 8f357fa6fb0f..824c725db0ab 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -189,8 +188,6 @@ struct vm { #define VMM_CTR4(vcpu, format, p1, p2, p3, p4) \ VCPU_CTR4((vcpu)->vm, (vcpu)->vcpuid, format, p1, p2, p3, p4) -static int vmm_initialized; - static void vmmops_panic(void); static void @@ -402,8 +399,8 @@ vm_exitinfo_cpuset(struct vcpu *vcpu) return (&vcpu->exitinfo_cpuset); } -static int -vmm_init(void) +int +vmm_modinit(void) { if (!vmm_is_hw_supported()) return (ENXIO); @@ -431,70 +428,17 @@ vmm_init(void) return (vmmops_modinit(vmm_ipinum)); } -static int -vmm_handler(module_t mod, int what, void *arg) +int +vmm_modcleanup(void) { - int error; - - switch (what) { - case MOD_LOAD: - if (vmm_is_hw_supported()) { - error = vmmdev_init(); - if (error != 0) - break; - error = vmm_init(); - if (error == 0) - vmm_initialized = 1; - else - (void)vmmdev_cleanup(); - } else { - error = ENXIO; - } - break; - case MOD_UNLOAD: - if (vmm_is_hw_supported()) { - error = vmmdev_cleanup(); - if (error == 0) { - vmm_suspend_p = NULL; - vmm_resume_p = NULL; - iommu_cleanup(); - if (vmm_ipinum != IPI_AST) - lapic_ipi_free(vmm_ipinum); - error = vmmops_modcleanup(); - /* - * Something bad happened - prevent new - * VMs from being created - */ - if (error) - vmm_initialized = 0; - } - } else { - error = 0; - } - break; - default: - error = 0; - break; - } - return (error); + vmm_suspend_p = NULL; + vmm_resume_p = NULL; + iommu_cleanup(); + if (vmm_ipinum != IPI_AST) + lapic_ipi_free(vmm_ipinum); + return (vmmops_modcleanup()); } -static moduledata_t vmm_kmod = { - "vmm", - vmm_handler, - NULL -}; - -/* - * vmm initialization has the following dependencies: - * - * - VT-x initialization requires smp_rendezvous() and therefore must happen - * after SMP is fully functional (after SI_SUB_SMP). - * - vmm device initialization requires an initialized devfs. - */ -DECLARE_MODULE(vmm, vmm_kmod, MAX(SI_SUB_SMP, SI_SUB_DEVFS) + 1, SI_ORDER_ANY); -MODULE_VERSION(vmm, 1); - static void vm_init(struct vm *vm, bool create) { @@ -579,13 +523,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - /* - * If vmm.ko could not be successfully initialized then don't attempt - * to create the virtual machine. - */ - if (!vmm_initialized) - return (ENXIO); - if (name == NULL || strnlen(name, VM_MAX_NAMELEN + 1) == VM_MAX_NAMELEN + 1) return (EINVAL); diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 14ea26c3668c..0cbc2359f1e8 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -139,8 +138,6 @@ struct vm { struct sx vcpus_init_lock; /* (o) */ }; -static bool vmm_initialized = false; - static int vm_handle_wfi(struct vcpu *vcpu, struct vm_exit *vme, bool *retu); @@ -324,11 +321,15 @@ vmm_unsupported_quirk(void) return (0); } -static int -vmm_init(void) +int +vmm_modinit(void) { int error; + error = vmm_unsupported_quirk(); + if (error != 0) + return (error); + vm_maxcpu = mp_ncpus; TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); @@ -346,61 +347,12 @@ vmm_init(void) return (vmmops_modinit(0)); } -static int -vmm_handler(module_t mod, int what, void *arg) +int +vmm_modcleanup(void) { - int error; - - switch (what) { - case MOD_LOAD: - error = vmm_unsupported_quirk(); - if (error != 0) - break; - error = vmmdev_init(); - if (error != 0) - break; - error = vmm_init(); - if (error == 0) - vmm_initialized = true; - else - (void)vmmdev_cleanup(); - break; - case MOD_UNLOAD: - error = vmmdev_cleanup(); - if (error == 0 && vmm_initialized) { - error = vmmops_modcleanup(); - if (error) { - /* - * Something bad happened - prevent new - * VMs from being created - */ - vmm_initialized = false; - } - } - break; - default: - error = 0; - break; - } - return (error); + return (vmmops_modcleanup()); } -static moduledata_t vmm_kmod = { - "vmm", - vmm_handler, - NULL -}; - -/* - * vmm initialization has the following dependencies: - * - * - HYP initialization requires smp_rendezvous() and therefore must happen - * after SMP is fully functional (after SI_SUB_SMP). - * - vmm device initialization requires an initialized devfs. - */ -DECLARE_MODULE(vmm, vmm_kmod, MAX(SI_SUB_SMP, SI_SUB_DEVFS) + 1, SI_ORDER_ANY); -MODULE_VERSION(vmm, 1); - static void vm_init(struct vm *vm, bool create) { @@ -486,13 +438,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - /* - * If vmm.ko could not be successfully initialized then don't attempt - * to create the virtual machine. - */ - if (!vmm_initialized) - return (ENXIO); - if (name == NULL || strlen(name) >= VM_MAX_NAMELEN) return (EINVAL); diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index bd20acac1d2d..08a53bb62a85 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -78,6 +79,8 @@ struct vmmdev_softc { int flags; }; +static bool vmm_initialized = false; + static SLIST_HEAD(, vmmdev_softc) head; static unsigned pr_allow_flag; @@ -1021,6 +1024,9 @@ sysctl_vmm_create(SYSCTL_HANDLER_ARGS) char *buf; int error, buflen; + if (!vmm_initialized) + return (ENXIO); + error = vmm_priv_check(req->td->td_ucred); if (error != 0) return (error); @@ -1106,7 +1112,7 @@ static struct cdevsw vmmctlsw = { .d_ioctl = vmmctl_ioctl, }; -int +static int vmmdev_init(void) { int error; @@ -1122,7 +1128,7 @@ vmmdev_init(void) return (error); } -int +static int vmmdev_cleanup(void) { sx_xlock(&vmmdev_mtx); @@ -1139,6 +1145,61 @@ vmmdev_cleanup(void) return (0); } +static int +vmm_handler(module_t mod, int what, void *arg) +{ + int error; + + switch (what) { + case MOD_LOAD: + error = vmmdev_init(); + if (error != 0) + break; + error = vmm_modinit(); + if (error == 0) + vmm_initialized = true; + else { + error = vmmdev_cleanup(); + KASSERT(error == 0, + ("%s: vmmdev_cleanup failed: %d", __func__, error)); + } + break; + case MOD_UNLOAD: + error = vmmdev_cleanup(); + if (error == 0 && vmm_initialized) { + error = vmm_modcleanup(); + if (error) { + /* + * Something bad happened - prevent new + * VMs from being created + */ + vmm_initialized = false; + } + } + break; + default: + error = 0; + break; + } + return (error); +} + +static moduledata_t vmm_kmod = { + "vmm", + vmm_handler, + NULL +}; + +/* + * vmm initialization has the following dependencies: + * + * - Initialization requires smp_rendezvous() and therefore must happen + * after SMP is fully functional (after SI_SUB_SMP). + * - vmm device initialization requires an initialized devfs. + */ +DECLARE_MODULE(vmm, vmm_kmod, MAX(SI_SUB_SMP, SI_SUB_DEVFS) + 1, SI_ORDER_ANY); +MODULE_VERSION(vmm, 1); + static int devmem_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, vm_size_t len, struct vm_object **objp, int nprot) diff --git a/sys/dev/vmm/vmm_dev.h b/sys/dev/vmm/vmm_dev.h index 2881a7063565..c691341d4350 100644 --- a/sys/dev/vmm/vmm_dev.h +++ b/sys/dev/vmm/vmm_dev.h @@ -18,8 +18,9 @@ struct thread; struct vm; struct vcpu; -int vmmdev_init(void); -int vmmdev_cleanup(void); +int vmm_modinit(void); +int vmm_modcleanup(void); + int vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, int fflag, struct thread *td); diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index a9eb9d144336..f2995b276072 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -133,8 +132,6 @@ struct vm { struct sx vcpus_init_lock; /* (o) */ }; -static bool vmm_initialized = false; - static MALLOC_DEFINE(M_VMM, "vmm", "vmm"); /* statistics */ @@ -210,10 +207,9 @@ vm_exitinfo(struct vcpu *vcpu) return (&vcpu->exitinfo); } -static int -vmm_init(void) +int +vmm_modinit(void) { - vm_maxcpu = mp_ncpus; TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); @@ -229,56 +225,12 @@ vmm_init(void) return (vmmops_modinit()); } -static int -vmm_handler(module_t mod, int what, void *arg) +int +vmm_modcleanup(void) { - int error; - - switch (what) { - case MOD_LOAD: - error = vmmdev_init(); - if (error != 0) - break; - error = vmm_init(); - if (error == 0) - vmm_initialized = true; - else - (void)vmmdev_cleanup(); - break; - case MOD_UNLOAD: - error = vmmdev_cleanup(); - if (error == 0 && vmm_initialized) { - error = vmmops_modcleanup(); - if (error) { - /* - * Something bad happened - prevent new - * VMs from being created - */ - vmm_initialized = false; - } - } - break; - default: - error = 0; - break; - } - return (error); + return (vmmops_modcleanup()); } -static moduledata_t vmm_kmod = { - "vmm", - vmm_handler, - NULL -}; - -/* - * vmm initialization has the following dependencies: - * - * - vmm device initialization requires an initialized devfs. - */ -DECLARE_MODULE(vmm, vmm_kmod, SI_SUB_DEVFS + 1, SI_ORDER_ANY); -MODULE_VERSION(vmm, 1); - static void vm_init(struct vm *vm, bool create) { @@ -359,13 +311,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - /* - * If vmm.ko could not be successfully initialized then don't attempt - * to create the virtual machine. - */ - if (!vmm_initialized) - return (ENXIO); - if (name == NULL || strlen(name) >= VM_MAX_NAMELEN) return (EINVAL); From nobody Tue Nov 18 15:02:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nss5Fdmz6HH6P for ; Tue, 18 Nov 2025 15:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nss2sJDz44T1 for ; Tue, 18 Nov 2025 15:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T+V5aI5zjBEQrqDiAHBSWcN0yN1UTX9yLwezIreuOc0=; b=oMQO2qZfWcrCt1sCWfFpzwBTeW1ox08VivX3VldBjhR4pzXllJHpyo2XxPhlXAFvktuFGa oohLbbWoCa7KwnSC6kyDXhO/qpWRariq5OW+uivfrJ2uh8qRA+eHqUzHktsIAdSwvtJhBP PjwoH0qTJi+fOf6Dn0uwXaDbqHr5dcxTV9s0d0Ptr/Y0xdCaIBTe6z6V2olAJsEs9u7U4A LPI32eWEf5TDLES3fCo6D4psFwTzwc6H9qUpX5CN5hYOhFvj+NvAYn1TVg5a4p1hwZtCsb vR77TQVjMIXFBRE8MWgY7zvDHMASWP6GI0ehyLBx/i5Sh+Txbws6OteqWbsL5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T+V5aI5zjBEQrqDiAHBSWcN0yN1UTX9yLwezIreuOc0=; b=WA00Me1olcvZKuWyJPuASQfVxcmZa8pXjC87J6W9YaDmtTdHgwRCTypXHuURV6mIRVQkkX 0BgMWKRvNos3Msedylt2fqOJsWYYcy1wFOPVcJo5zjF7Jffjh/xkS6EXeTw1K502YNSJB2 2Wf1l00eOig/NRgP6NL85h/wxVO710Y635faL3bEpscsktLEAYUd9S+uXxaZVLPIpZuHRh HeieqZKGJxIF5DmYAMfsJ8Y/ER/BnYRREOhMr3tVPLuZ+EbU2MCkRbjAuF+CJZfeL1y+4k S/+P/KW7HLazFHQV02uSljyPK+EUIwv9j1A5WQ1vrkVHigSQ34YDrFSqzEiUQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478177; a=rsa-sha256; cv=none; b=WNLOBklrVkFg3TwsNW0nDhIt/g4qsrfLHwlgNs06Oiyj70HRl2I7Oec1ei2mftHeAZNV5W zYPu2mb2gctmLhB3aud6zM9VCRlskq546ZmEZSHcw8iuuPWHbCpC9+Lk7mrBJurT2LBEMi kHPDB8hSUiJl0wSCZWGExRDBj5pY0QdHmb+DbeDwcd+flqdiIBPAeaYd/rrtmr568IH4FY cTm5EzUNDFp+MNKkzdAi4oPvwwlGiAot/KPWtwgv1riLSpkc1NIV3euSNHT5L4KWqnjHs2 CuWt+8+kZDUoi+XcWBSx5RzHf2+59eRtYVkkjzon0dbF2V5LTPbKGOFXkQzvxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nss2QZhz1075 for ; Tue, 18 Nov 2025 15:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3737b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6e8e1de9fb06 - stable/15 - vmm: Move vm_maxcpu handling into MI code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6e8e1de9fb06e37f4b3fce9786c934393a232263 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:57 +0000 Message-Id: <691c8aa1.3737b.fe7862b@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6e8e1de9fb06e37f4b3fce9786c934393a232263 commit 6e8e1de9fb06e37f4b3fce9786c934393a232263 Author: Mark Johnston AuthorDate: 2025-11-04 13:56:15 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:43 +0000 vmm: Move vm_maxcpu handling into MI code No functional change intended. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53477 (cherry picked from commit c46e5dc65ba5c9666bb4452878e332dc49730843) --- sys/amd64/include/vmm.h | 2 -- sys/amd64/vmm/intel/vmx.c | 2 +- sys/amd64/vmm/vmm.c | 22 ---------------------- sys/arm64/vmm/vmm.c | 20 -------------------- sys/dev/vmm/vmm_dev.c | 15 +++++++++++++++ sys/dev/vmm/vmm_dev.h | 11 +++++++++++ sys/riscv/vmm/vmm.c | 22 ---------------------- 7 files changed, 27 insertions(+), 67 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index 0a2d5a80f2b0..5cf1ae2d769c 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -206,8 +206,6 @@ struct vmm_ops { extern const struct vmm_ops vmm_ops_intel; extern const struct vmm_ops vmm_ops_amd; -extern u_int vm_maxcpu; /* maximum virtual cpus */ - int vm_create(const char *name, struct vm **retvm); struct vcpu *vm_alloc_vcpu(struct vm *vm, int vcpuid); void vm_disable_vcpu_creation(struct vm *vm); diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 842281ab862e..4189c1214b40 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include "opt_bhyve_snapshot.h" #include @@ -58,6 +57,7 @@ #include #include +#include #include #include diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index a989f93b8728..6dfa33adf63c 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -267,10 +267,6 @@ static int trap_wbinvd; SYSCTL_INT(_hw_vmm, OID_AUTO, trap_wbinvd, CTLFLAG_RDTUN, &trap_wbinvd, 0, "WBINVD triggers a VM-exit"); -u_int vm_maxcpu; -SYSCTL_UINT(_hw_vmm, OID_AUTO, maxcpu, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, - &vm_maxcpu, 0, "Maximum number of vCPUs"); - static void vcpu_notify_event_locked(struct vcpu *vcpu); /* global statistics */ @@ -296,14 +292,6 @@ VMM_STAT(VMEXIT_USERSPACE, "number of vm exits handled in userspace"); VMM_STAT(VMEXIT_RENDEZVOUS, "number of times rendezvous pending at exit"); VMM_STAT(VMEXIT_EXCEPTION, "number of vm exits due to exceptions"); -/* - * Upper limit on vm_maxcpu. Limited by use of uint16_t types for CPU - * counts as well as range of vpid values for VT-x and by the capacity - * of cpuset_t masks. The call to new_unrhdr() in vpid_init() in - * vmx.c requires 'vm_maxcpu + 1 <= 0xffff', hence the '- 1' below. - */ -#define VM_MAXCPU MIN(0xffff - 1, CPU_SETSIZE) - #ifdef KTR static const char * vcpu_state2str(enum vcpu_state state) @@ -405,16 +393,6 @@ vmm_modinit(void) if (!vmm_is_hw_supported()) return (ENXIO); - vm_maxcpu = mp_ncpus; - TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); - - if (vm_maxcpu > VM_MAXCPU) { - printf("vmm: vm_maxcpu clamped to %u\n", VM_MAXCPU); - vm_maxcpu = VM_MAXCPU; - } - if (vm_maxcpu == 0) - vm_maxcpu = 1; - vmm_host_state_init(); vmm_ipinum = lapic_ipi_alloc(pti ? &IDTVEC(justreturn1_pti) : diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 5225b995a75d..b1133be8fa3d 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -206,10 +206,6 @@ static const struct vmm_regs vmm_arch_regs_masks = { /* Host registers masked by vmm_arch_regs_masks. */ static struct vmm_regs vmm_arch_regs; -u_int vm_maxcpu; -SYSCTL_UINT(_hw_vmm, OID_AUTO, maxcpu, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, - &vm_maxcpu, 0, "Maximum number of vCPUs"); - static void vcpu_notify_event_locked(struct vcpu *vcpu); /* global statistics */ @@ -229,12 +225,6 @@ VMM_STAT(VMEXIT_SS, "number of vmexits for a single-step exception"); VMM_STAT(VMEXIT_UNHANDLED_EL2, "number of vmexits for an unhandled EL2 exception"); VMM_STAT(VMEXIT_UNHANDLED, "number of vmexits for an unhandled exception"); -/* - * Upper limit on vm_maxcpu. We could increase this to 28 bits, but this - * is a safe value for now. - */ -#define VM_MAXCPU MIN(0xffff - 1, CPU_SETSIZE) - static int vmm_regs_init(struct vmm_regs *regs, const struct vmm_regs *masks) { @@ -330,16 +320,6 @@ vmm_modinit(void) if (error != 0) return (error); - vm_maxcpu = mp_ncpus; - TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); - - if (vm_maxcpu > VM_MAXCPU) { - printf("vmm: vm_maxcpu clamped to %u\n", VM_MAXCPU); - vm_maxcpu = VM_MAXCPU; - } - if (vm_maxcpu == 0) - vm_maxcpu = 1; - error = vmm_regs_init(&vmm_arch_regs, &vmm_arch_regs_masks); if (error != 0) return (error); diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 09093fe44e2b..d6543bf6534e 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -91,6 +92,10 @@ static MALLOC_DEFINE(M_VMMDEV, "vmmdev", "vmmdev"); SYSCTL_DECL(_hw_vmm); +u_int vm_maxcpu; +SYSCTL_UINT(_hw_vmm, OID_AUTO, maxcpu, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &vm_maxcpu, 0, "Maximum number of vCPUs"); + static void devmem_destroy(void *arg); static int devmem_create_cdev(struct vmmdev_softc *sc, int id, char *devmem); @@ -1158,6 +1163,16 @@ vmm_handler(module_t mod, int what, void *arg) error = vmmdev_init(); if (error != 0) break; + + vm_maxcpu = mp_ncpus; + TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); + if (vm_maxcpu > VM_MAXCPU) { + printf("vmm: vm_maxcpu clamped to %u\n", VM_MAXCPU); + vm_maxcpu = VM_MAXCPU; + } + if (vm_maxcpu == 0) + vm_maxcpu = 1; + error = vmm_modinit(); if (error == 0) vmm_initialized = true; diff --git a/sys/dev/vmm/vmm_dev.h b/sys/dev/vmm/vmm_dev.h index 89fe7ec4704d..f14176c8afad 100644 --- a/sys/dev/vmm/vmm_dev.h +++ b/sys/dev/vmm/vmm_dev.h @@ -57,6 +57,17 @@ struct vmmdev_ioctl { extern const struct vmmdev_ioctl vmmdev_machdep_ioctls[]; extern const size_t vmmdev_machdep_ioctl_count; +/* + * Upper limit on vm_maxcpu. Limited by use of uint16_t types for CPU counts as + * well as range of vpid values for VT-x on amd64 and by the capacity of + * cpuset_t masks. The call to new_unrhdr() in vpid_init() in vmx.c requires + * 'vm_maxcpu + 1 <= 0xffff', hence the '- 1' below. + */ +#define VM_MAXCPU MIN(0xffff - 1, CPU_SETSIZE) + +/* Maximum number of vCPUs in a single VM. */ +extern u_int vm_maxcpu; + #endif /* _KERNEL */ struct vmmctl_vm_create { diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index e1ba0af83fae..23b57ad3b7aa 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -143,10 +143,6 @@ static int vmm_ipinum; SYSCTL_INT(_hw_vmm, OID_AUTO, ipinum, CTLFLAG_RD, &vmm_ipinum, 0, "IPI vector used for vcpu notifications"); -u_int vm_maxcpu; -SYSCTL_UINT(_hw_vmm, OID_AUTO, maxcpu, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, - &vm_maxcpu, 0, "Maximum number of vCPUs"); - static void vcpu_notify_event_locked(struct vcpu *vcpu); /* global statistics */ @@ -154,12 +150,6 @@ VMM_STAT(VMEXIT_COUNT, "total number of vm exits"); VMM_STAT(VMEXIT_IRQ, "number of vmexits for an irq"); VMM_STAT(VMEXIT_UNHANDLED, "number of vmexits for an unhandled exception"); -/* - * Upper limit on vm_maxcpu. We could increase this to 28 bits, but this - * is a safe value for now. - */ -#define VM_MAXCPU MIN(0xffff - 1, CPU_SETSIZE) - static void vcpu_cleanup(struct vcpu *vcpu, bool destroy) { @@ -210,18 +200,6 @@ vm_exitinfo(struct vcpu *vcpu) int vmm_modinit(void) { - vm_maxcpu = mp_ncpus; - - TUNABLE_INT_FETCH("hw.vmm.maxcpu", &vm_maxcpu); - - if (vm_maxcpu > VM_MAXCPU) { - printf("vmm: vm_maxcpu clamped to %u\n", VM_MAXCPU); - vm_maxcpu = VM_MAXCPU; - } - - if (vm_maxcpu == 0) - vm_maxcpu = 1; - return (vmmops_modinit()); } From nobody Tue Nov 18 15:02:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsr4K8Sz6HHFg for ; Tue, 18 Nov 2025 15:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsr26YNz44j2 for ; Tue, 18 Nov 2025 15:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GOxe6lAO4YyWdFUY3gFuelAWaQh5HBx5ULjyyeSpVIE=; b=xbAvFgB6oxgwRaC6reorePFzu8e12ylyExRE3LLUA5fxQ+DIU0K8xSW1R7Zglsoj3uPT6K DrJcxVrmq43qbQtxPyhz95EWkHhs9/2I8v/Eb3/G/iVmCkuc4DHsSoIzh+0HMEahy647OY 5NK3Lt1ygzOT91XFKSEE//QfnpLZYvcsBRZ1or1WIzasw7RtWDXzB6+DmewY16GyfgzJcE obaALQoLOTnVyjOJ9UlfVPUaCo55q8+s5ObJORYprd2xZVWOzVEj9UnZRWU+XwPWByzNzy TnXFJ56GyTnAVuQdjO/JMzHukL/tg3vtgS7wkGEIpT+82AjKUNRJLS78RmorCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GOxe6lAO4YyWdFUY3gFuelAWaQh5HBx5ULjyyeSpVIE=; b=l8Wr6rHnyvGsNcki+S72XiJa4W3Xf8OjxfwdAdWwa4KNo++orpguB6cvljUyGLSeHaPT8I 5f4CdZWFhyBQ7y3L7J1TW6AgBj+BDGcq19OlJFbT9s18Y/mOxMWrx2vfmJKUQ/pc+nbNlP +N+UWdRzvF80yp3QKR/Nz1m/rabVQCJBpojNVNiI4eQIuMXPtgKXI+kXJ5kjiSKwuEVC/d EkuXmNu6L1/TIe8tTlNWiJhy9uOxV1Y9YoMYhJifWdAqtCVRSSQZYmWNgiywnEmSaxIAMO vUNoqVBgmfzGV/LKpSEESh9iM8cSYoPiaiq8WXNPH+66sEmEdQrpj9T3eqpZ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478176; a=rsa-sha256; cv=none; b=P8vcMG6Td3hIpMrUjsmiT93MNyei2dEQqw4THY4oS6Ropd3YeKXOmj9v7+w/oLAdoLruQL ciAjIEzchgKXxNFVPAXKkmsVWew+es14pjGkYrNH6gKjZV/aqblRbg4lJn+ZkFXQrJRRYk HKUqxfD94I6gzQI0i1lAg2ySDwQTiTZZ1Rvvoc2ohENaFgAMT1YuZp+5F1ugO8neYaG04h 6OM0Yz4GHU6xlSDtBfDe9BeKrH20j+LTLXlPy8Evk0AkeitbRS8q6jXbRb8Tx8vfWAY3Wb 67jNFW/8gfd6rC6FGKIvjUM7KAf/Unpc0wj7+RuBmcsgJuupEssedBnQV47lPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsr1f0wz10KG for ; Tue, 18 Nov 2025 15:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 55096ebddc15 - stable/15 - arm64/vmm: Move the vgic_max_cpu_count() check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 55096ebddc1557b7f0e4cb294878fcc8621de37b Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:56 +0000 Message-Id: <691c8aa0.379aa.7d985f2a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=55096ebddc1557b7f0e4cb294878fcc8621de37b commit 55096ebddc1557b7f0e4cb294878fcc8621de37b Author: Mark Johnston AuthorDate: 2025-11-04 16:58:25 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:42 +0000 arm64/vmm: Move the vgic_max_cpu_count() check vm_alloc_vcpu() is called quite frequently, and we don't need to apply the vgic limit unless we're actually allocating a vcpu structure for the first time. No functional change intended. Reviewed by: andrew MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53580 (cherry picked from commit f3a7ed2047dffaebbfbb3920e993e9df424be728) --- sys/arm64/vmm/vmm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index dfaba058e205..5225b995a75d 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -394,10 +394,6 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) if (vcpuid < 0 || vcpuid >= vm_get_maxcpus(vm)) return (NULL); - /* Some interrupt controllers may have a CPU limit */ - if (vcpuid >= vgic_max_cpu_count(vm->cookie)) - return (NULL); - vcpu = (struct vcpu *) atomic_load_acq_ptr((uintptr_t *)&vm->vcpu[vcpuid]); if (__predict_true(vcpu != NULL)) @@ -406,6 +402,12 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) sx_xlock(&vm->vcpus_init_lock); vcpu = vm->vcpu[vcpuid]; if (vcpu == NULL && !vm->dying) { + /* Some interrupt controllers may have a CPU limit */ + if (vcpuid >= vgic_max_cpu_count(vm->cookie)) { + sx_xunlock(&vm->vcpus_init_lock); + return (NULL); + } + vcpu = vcpu_alloc(vm, vcpuid); vcpu_init(vcpu); From nobody Tue Nov 18 15:02:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsq5h6rz6HHFf for ; Tue, 18 Nov 2025 15:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsq1wVHz44Yt for ; Tue, 18 Nov 2025 15:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v8v5R9XaNSRLs8O5az3YhUb1nMB3gWLQlAqaF6Qp8u0=; b=fOWYFBg+84vFWVFjHbKWzihQxphzBx4NcEEdhl2WhMvgreuC7bOMaKShNpxFAmqHlBiYgS mGUIHSRA5jalenf+Cz2mQMTPspR8rbzlTp7PiO8/e7hlzN+7Xpkd/ti7JXodLEoCJxujlF vSpqXzThc5Hu1EeZhF1/KAaNOxlpCb3nUEeZcJ8o8p8CnBwu4Ecz3snPbNUffqONopHlyd GkjDpWd79pvXt6ftko0qQsiSmdlzRLLzf//mdAzUi2YXo05cJn9W22ZT9+rgrQD5m17UoG 4J++Mp3wLbhffHSNQxaRmCAHaYwCKza2Ym4OHIX5YCcrS9MMVWFTvSHtLYayWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v8v5R9XaNSRLs8O5az3YhUb1nMB3gWLQlAqaF6Qp8u0=; b=MZdQlJlqUNuYbRrtrX9fkeWtq4oCZMQCwMFbVSNcYCUehHkLTFkZtVzjGyepevyH8lHbgk 5la64GSNRP0M3Cx+YHIUFdw/IdjfE1+3Dqt/G4IrnKsIXB1Ud40vdkxmimhx4z4wNzBuDi HtZ8lR8qX6KtS5ZKkNSMdWj5y5fVyYGlZuzieHWzUytphGZ5qXtPCm8M+VmzNf79G3tGG+ LK5m/lieReOnFl1pLhcpz7t7baYbgIOli6YFJuwn93C9SmiPZVEoSIrOXv6KS1jc7ONtsz NZuQRARtNb26KkQcjMuNbFI7N8OLDH6UmVZUteC0XOEXCDonlxqdyEPyBJzc5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478175; a=rsa-sha256; cv=none; b=HzsztJrdXgIOaW7FceVjK+LFQHCmlSG16nUw0WfUYjbrpn0GLPlIXHgnEvzi/K0/PCQZIU SQSiQPf/scZ+qKrjFbMgWuSLNDnH3UziuRv+FG48EFhpl2poo6VukWiKttwKYmy3Vpe7jN 3ycLmeaLxhBma43+KmH+ICh9QeYNZW6TvpudMLlLo0KEHhsBMltufB1aRHvxJD/E+3JjXh vpTuf2mkFNPS6JaDABm61zlW/B2Q0fuwIJSU7M+vs2LNRUg+YEo/1Htg9ibZUU/m0yL16Z pqTWNFPcFzKX7XW401YGesCjdB1eF4aMK2YiE2nkI4xPOPb/U5LwSPLyOq8Mbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsq1H7Qz10KD for ; Tue, 18 Nov 2025 15:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 10b2ebb5a368 - stable/15 - amd64/vmm: Remove an unused function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 10b2ebb5a3686cc77135dce8b68ec2b890519b49 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:55 +0000 Message-Id: <691c8a9f.379a6.5c46a910@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=10b2ebb5a3686cc77135dce8b68ec2b890519b49 commit 10b2ebb5a3686cc77135dce8b68ec2b890519b49 Author: Mark Johnston AuthorDate: 2025-11-04 13:56:02 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:34 +0000 amd64/vmm: Remove an unused function Reviewed by: corvink, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53423 (cherry picked from commit 7214e0469234d90edd6deda4b181cd4862a9ace0) --- sys/amd64/vmm/io/ppt.c | 7 ------- sys/amd64/vmm/io/ppt.h | 6 ------ 2 files changed, 13 deletions(-) diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c index 2cb459fb848f..6feac5dcbbed 100644 --- a/sys/amd64/vmm/io/ppt.c +++ b/sys/amd64/vmm/io/ppt.c @@ -335,13 +335,6 @@ ppt_teardown_msix(struct pptdev *ppt) ppt->msix.num_msgs = 0; } -int -ppt_avail_devices(void) -{ - - return (num_pptdevs); -} - int ppt_assigned_devices(struct vm *vm) { diff --git a/sys/amd64/vmm/io/ppt.h b/sys/amd64/vmm/io/ppt.h index f97c399564d7..9377f34d50e6 100644 --- a/sys/amd64/vmm/io/ppt.h +++ b/sys/amd64/vmm/io/ppt.h @@ -42,12 +42,6 @@ int ppt_disable_msix(struct vm *vm, int bus, int slot, int func); int ppt_assigned_devices(struct vm *vm); bool ppt_is_mmio(struct vm *vm, vm_paddr_t gpa); -/* - * Returns the number of devices sequestered by the ppt driver for assignment - * to virtual machines. - */ -int ppt_avail_devices(void); - /* * The following functions should never be called directly. * Use 'vm_assign_pptdev()' and 'vm_unassign_pptdev()' instead. From nobody Tue Nov 18 15:02:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsp3ZsJz6HGtN for ; Tue, 18 Nov 2025 15:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9nsp0xJ5z44fB for ; Tue, 18 Nov 2025 15:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1/dq9dl6/nkOIVTyxAw7EJQqccp/+lpNLATEaSdiw0Q=; b=WKj+BRIBrUPX+eJtK6S56EKFn9RWXMx9V18B6yYInvuiLFLKdiHAA3YBRQzKTloV8YrbmP svDFKU6jsHWCJMFo0UVHt2t5ojcOuO0ITrcxxAn3TPat4aB9j9pBfPY6D32NmWnMESYH9J Us+4dHRi1y/k9C5wNN2DR2JX39ger2lBGT0uhR1dEEfjP582iPNeiicdcvSxnn/3mES1yt ZBk3FScRqHw2pvcz4NKtgBl7Ij6hbO3JSjaXBvoTXNYVSlms6j2ZyN0dq+AWh9jWHtiClv r7tU/U0KQiWDHdCdETaCH8U+tbYOy7njFY6YM1RVJAqRhYv9hYzBd8tBCsyTHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763478174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1/dq9dl6/nkOIVTyxAw7EJQqccp/+lpNLATEaSdiw0Q=; b=lCrdtRN2fWiACuxD+CrCcY22xUQr35rNTceMZDQASbLuc3Ey4Vy5i65adklW4viUbnUggk W3ACgKz5Ur7YjS0iK28BHKKgY/DIcAlTnix1/aYgksel5Gne4P36sXwvHzbLxL/HRFdJuM uwnJagkwSaiKI+bjulBhLvVPaJkcBiOXLTYoCX1Q1guwki/jD8rMtUHnGZIgae09Fzsbl2 b1kH/3N7DytK0bmYXIIVKIpZYJ1c3IpQn+D2GVlyIQP5XG+kznzSfU1DhmZHCowyIrDoqs xJkZs47g4XH/Kxz/G2G/XGWwUR3rrOcipAfG3f6MiW554aFarj14dGGhsdtgTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763478174; a=rsa-sha256; cv=none; b=dTYJ3VOMZLiXFPMkbO6zLYTRxObNUcSwa99UyG6Z1c6rRn7gBmaMYW6Afz3Gd0qTIYPT37 OLfpx6r1Z1JJP+MKcTCfIifHwRgEDH2GVvLPr/NRYjkY5MofFJ95o/lDSVWQQ7xO0TJJM5 HdtAMgrshNb1AKsoedrIL3St2ZfyNAzqLu8z3qPrH6KDNOuEyrPu2VhH/sLQ1EFf+n+nxr JC6xP1jcPZ74ZewyNMVq2rQEWWj8eiCDGv/5fQATRUjppnAFdCBqjXrX6lY8v9f3ernt+w j2gnqlkAIKjYnt9GM7W7QYvcWc73m/lWZBT/CMdRZSeyuOH0UuooEvqAxPsA+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9nsp0WQfz10MK for ; Tue, 18 Nov 2025 15:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 368cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 15:02:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 272c8c2b7cfa - stable/15 - vmm: Consolidate VM name length checking List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 272c8c2b7cfa75c1a8fd0b3a1d701f5f8b027635 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 15:02:54 +0000 Message-Id: <691c8a9e.368cf.7222eb3a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=272c8c2b7cfa75c1a8fd0b3a1d701f5f8b027635 commit 272c8c2b7cfa75c1a8fd0b3a1d701f5f8b027635 Author: Mark Johnston AuthorDate: 2025-11-04 13:55:07 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 14:57:33 +0000 vmm: Consolidate VM name length checking vm_create() is only called from one place. Rather than having similar checks everywhere, move them to vmmdev_create(). We can safely assume that the name is nul-terminated, the vmmctl ioctl handler and the legacy sysctl handler ensure this. So, don't bother with strnlen(). Finally, make sure that the name buffers are the same size on all platforms. VM_MAX_NAMELEN is supposed to be the maximum, not including the nul terminator. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53422 (cherry picked from commit 7377c87e467343e71b3e803708b98e04ea8e84bd) --- sys/amd64/include/vmm.h | 26 -------------------------- sys/amd64/include/vmm_dev.h | 2 ++ sys/amd64/vmm/vmm.c | 4 ---- sys/arm64/include/vmm.h | 21 --------------------- sys/arm64/include/vmm_dev.h | 2 ++ sys/arm64/vmm/vmm.c | 5 +---- sys/dev/vmm/vmm_dev.c | 3 +++ sys/dev/vmm/vmm_dev.h | 3 +++ sys/dev/vmm/vmm_param.h | 33 +++++++++++++++++++++++++++++++++ sys/riscv/include/vmm.h | 3 --- sys/riscv/include/vmm_dev.h | 2 ++ sys/riscv/vmm/vmm.c | 5 +---- 12 files changed, 47 insertions(+), 62 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index c7baa5e4c54a..0a2d5a80f2b0 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -122,33 +122,7 @@ enum x2apic_state { #define VM_INTINFO_HWEXCEPTION (3 << 8) #define VM_INTINFO_SWINTR (4 << 8) -/* - * The VM name has to fit into the pathname length constraints of devfs, - * governed primarily by SPECNAMELEN. The length is the total number of - * characters in the full path, relative to the mount point and not - * including any leading '/' characters. - * A prefix and a suffix are added to the name specified by the user. - * The prefix is usually "vmm/" or "vmm.io/", but can be a few characters - * longer for future use. - * The suffix is a string that identifies a bootrom image or some similar - * image that is attached to the VM. A separator character gets added to - * the suffix automatically when generating the full path, so it must be - * accounted for, reducing the effective length by 1. - * The effective length of a VM name is 229 bytes for FreeBSD 13 and 37 - * bytes for FreeBSD 12. A minimum length is set for safety and supports - * a SPECNAMELEN as small as 32 on old systems. - */ -#define VM_MAX_PREFIXLEN 10 -#define VM_MAX_SUFFIXLEN 15 -#define VM_MIN_NAMELEN 6 -#define VM_MAX_NAMELEN \ - (SPECNAMELEN - VM_MAX_PREFIXLEN - VM_MAX_SUFFIXLEN - 1) - #ifdef _KERNEL -#include - -CTASSERT(VM_MAX_NAMELEN >= VM_MIN_NAMELEN); - struct vm; struct vm_exception; struct vm_mem; diff --git a/sys/amd64/include/vmm_dev.h b/sys/amd64/include/vmm_dev.h index 441330fd57b8..f1c07a983a4b 100644 --- a/sys/amd64/include/vmm_dev.h +++ b/sys/amd64/include/vmm_dev.h @@ -34,6 +34,8 @@ #include #include +#include + struct vm_memmap { vm_paddr_t gpa; int segid; /* memory segment */ diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 824c725db0ab..a989f93b8728 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -523,10 +523,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - if (name == NULL || strnlen(name, VM_MAX_NAMELEN + 1) == - VM_MAX_NAMELEN + 1) - return (EINVAL); - vm = malloc(sizeof(struct vm), M_VM, M_WAITOK | M_ZERO); error = vm_mem_init(&vm->mem, 0, VM_MAXUSER_ADDRESS_LA48); if (error != 0) { diff --git a/sys/arm64/include/vmm.h b/sys/arm64/include/vmm.h index 696a69669a2a..e67540eac66d 100644 --- a/sys/arm64/include/vmm.h +++ b/sys/arm64/include/vmm.h @@ -106,27 +106,6 @@ enum vm_reg_name { #define VM_GUEST_BASE_IPA 0x80000000UL /* Guest kernel start ipa */ -/* - * The VM name has to fit into the pathname length constraints of devfs, - * governed primarily by SPECNAMELEN. The length is the total number of - * characters in the full path, relative to the mount point and not - * including any leading '/' characters. - * A prefix and a suffix are added to the name specified by the user. - * The prefix is usually "vmm/" or "vmm.io/", but can be a few characters - * longer for future use. - * The suffix is a string that identifies a bootrom image or some similar - * image that is attached to the VM. A separator character gets added to - * the suffix automatically when generating the full path, so it must be - * accounted for, reducing the effective length by 1. - * The effective length of a VM name is 229 bytes for FreeBSD 13 and 37 - * bytes for FreeBSD 12. A minimum length is set for safety and supports - * a SPECNAMELEN as small as 32 on old systems. - */ -#define VM_MAX_PREFIXLEN 10 -#define VM_MAX_SUFFIXLEN 15 -#define VM_MAX_NAMELEN \ - (SPECNAMELEN - VM_MAX_PREFIXLEN - VM_MAX_SUFFIXLEN - 1) - #ifdef _KERNEL struct vm; struct vm_exception; diff --git a/sys/arm64/include/vmm_dev.h b/sys/arm64/include/vmm_dev.h index 219f1116c728..289ff0fe1fc9 100644 --- a/sys/arm64/include/vmm_dev.h +++ b/sys/arm64/include/vmm_dev.h @@ -31,6 +31,8 @@ #include +#include + struct vm_memmap { vm_paddr_t gpa; int segid; /* memory segment */ diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 0cbc2359f1e8..dfaba058e205 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -125,7 +125,7 @@ struct vm { volatile cpuset_t suspended_cpus; /* (i) suspended vcpus */ volatile cpuset_t halted_cpus; /* (x) cpus in a hard halt */ struct vm_mem mem; /* (i) guest memory */ - char name[VM_MAX_NAMELEN]; /* (o) virtual machine name */ + char name[VM_MAX_NAMELEN + 1]; /* (o) virtual machine name */ struct vcpu **vcpu; /* (i) guest vcpus */ struct vmm_mmio_region mmio_region[VM_MAX_MMIO_REGIONS]; /* (o) guest MMIO regions */ @@ -438,9 +438,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - if (name == NULL || strlen(name) >= VM_MAX_NAMELEN) - return (EINVAL); - vm = malloc(sizeof(struct vm), M_VMM, M_WAITOK | M_ZERO); error = vm_mem_init(&vm->mem, 0, 1ul << 39); if (error != 0) { diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 08a53bb62a85..09093fe44e2b 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -984,6 +984,9 @@ vmmdev_create(const char *name, struct ucred *cred) struct vm *vm; int error; + if (name == NULL || strlen(name) > VM_MAX_NAMELEN) + return (EINVAL); + sx_xlock(&vmmdev_mtx); sc = vmmdev_lookup(name, cred); if (sc != NULL) { diff --git a/sys/dev/vmm/vmm_dev.h b/sys/dev/vmm/vmm_dev.h index c691341d4350..89fe7ec4704d 100644 --- a/sys/dev/vmm/vmm_dev.h +++ b/sys/dev/vmm/vmm_dev.h @@ -11,8 +11,11 @@ #include #include + #include +#include + #ifdef _KERNEL struct thread; struct vm; diff --git a/sys/dev/vmm/vmm_param.h b/sys/dev/vmm/vmm_param.h new file mode 100644 index 000000000000..a5040eb0f58c --- /dev/null +++ b/sys/dev/vmm/vmm_param.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2011 NetApp, Inc. + * All rights reserved. + */ + +#ifndef _DEV_VMM_PARAM_H_ +#define _DEV_VMM_PARAM_H_ + +/* + * The VM name has to fit into the pathname length constraints of devfs, + * governed primarily by SPECNAMELEN. The length is the total number of + * characters in the full path, relative to the mount point and not + * including any leading '/' characters. + * A prefix and a suffix are added to the name specified by the user. + * The prefix is usually "vmm/" or "vmm.io/", but can be a few characters + * longer for future use. + * The suffix is a string that identifies a bootrom image or some similar + * image that is attached to the VM. A separator character gets added to + * the suffix automatically when generating the full path, so it must be + * accounted for, reducing the effective length by 1. + * The effective length of a VM name is 229 bytes for FreeBSD 13 and 37 + * bytes for FreeBSD 12. A minimum length is set for safety and supports + * a SPECNAMELEN as small as 32 on old systems. + */ +#define VM_MAX_PREFIXLEN 10 +#define VM_MAX_SUFFIXLEN 15 +#define VM_MIN_NAMELEN 6 +#define VM_MAX_NAMELEN \ + (SPECNAMELEN - VM_MAX_PREFIXLEN - VM_MAX_SUFFIXLEN - 1) + +#endif /* !_DEV_VMM_PARAM_H_ */ diff --git a/sys/riscv/include/vmm.h b/sys/riscv/include/vmm.h index e227dd825966..361140834805 100644 --- a/sys/riscv/include/vmm.h +++ b/sys/riscv/include/vmm.h @@ -103,9 +103,6 @@ enum vm_reg_name { #define VM_INTINFO_HWEXCEPTION (3 << 8) #define VM_INTINFO_SWINTR (4 << 8) -#define VM_MAX_NAMELEN 32 -#define VM_MAX_SUFFIXLEN 15 - #ifdef _KERNEL struct vm; diff --git a/sys/riscv/include/vmm_dev.h b/sys/riscv/include/vmm_dev.h index 4d30d5a1c35b..a60e545b8f52 100644 --- a/sys/riscv/include/vmm_dev.h +++ b/sys/riscv/include/vmm_dev.h @@ -38,6 +38,8 @@ #include +#include + struct vm_memmap { vm_paddr_t gpa; int segid; /* memory segment */ diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index f2995b276072..e1ba0af83fae 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -120,7 +120,7 @@ struct vm { volatile cpuset_t suspended_cpus; /* (i) suspended vcpus */ volatile cpuset_t halted_cpus; /* (x) cpus in a hard halt */ struct vm_mem mem; /* (i) [m+v] guest memory */ - char name[VM_MAX_NAMELEN]; /* (o) virtual machine name */ + char name[VM_MAX_NAMELEN + 1]; /* (o) virtual machine name */ struct vcpu **vcpu; /* (i) guest vcpus */ struct vmm_mmio_region mmio_region[VM_MAX_MMIO_REGIONS]; /* (o) guest MMIO regions */ @@ -311,9 +311,6 @@ vm_create(const char *name, struct vm **retvm) struct vm *vm; int error; - if (name == NULL || strlen(name) >= VM_MAX_NAMELEN) - return (EINVAL); - vm = malloc(sizeof(struct vm), M_VMM, M_WAITOK | M_ZERO); error = vm_mem_init(&vm->mem, 0, 1ul << 39); if (error != 0) { From nobody Wed Nov 19 04:13:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Ps14vPz6HCdq for ; Wed, 19 Nov 2025 04:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Ps0Tc8z3ggT for ; Wed, 19 Nov 2025 04:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9fY5NR3dNiQF5NUVL3U1sFk3AC+6Su7lDiSN5qnzrfA=; b=fTSnkFY8BWkHLUPxW8MLtJlB916lb7XflKowX4UB2pfKqKZUZXRJtBZzzaLAY1a+keRyal Hx8bJxbztg4+Qz23mDyJ2F2V5nRy2u/W5HsFgq/J9pk2LLHAXfbGknHiGNOOpWn+Orr5xl PwKFAPob8KAwk8oR92aQqRdVeM0fc9u28SQTBuFPQkDwccXm7XPgeAU2aUMfVpLfMGBnec iTzGijhU21K6x9R//1rej1+cSwuwKChGpjyaah/sovAaSMnsRZUxjTgRJ8VSfnrlXlEWVo MrVn3DELfyu8BIAc1bSsSJX1GN0UBLwVfa6n56si/SnisEOCMbH74PbTY4hZUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9fY5NR3dNiQF5NUVL3U1sFk3AC+6Su7lDiSN5qnzrfA=; b=WmWYBw6IOqPEc/GGIiK759dFAhgkDPqyhwe1sCpHg3wpfeSqqZegAriVSW17e6TzjrL/zT nU217us/d0PRgMxkrBnClN7dWIXk5K6vPESVJaNsJum3p1ysVvGYnnf6HhulS8ogKzp7ts J7d2LkIGCJi8LFti41iifrJrYC8+S0yFZOxxktqCsjzPAjjPrKTm+/Lrtg/JkdCjueEXkZ 5/sUxsrXeLdrA00UxOztAVdqwDZUWisDr3OC0DHKpuQbWsMU6fLygk6bJbpJ5h6U1Ncs8A EDcw340fRJ1w70eyP3NyCXjcTFv0mULQAGDXPVFPJyfr9V8Y6zleaMQCnJQCfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525601; a=rsa-sha256; cv=none; b=l+vOt1QKBGzoAkDOPIDHcb/r/6QfNqDdD4eIwQ+I6RUngwpfijN4RWbQqesyJBuYde5upz 9QwiYRm/HpU+pPJfQ1ab7bbBfMz4vHupCBH/qtPzXmQZEbQ4im6zncGQEyZCpXxmxKRwLs c3WMRyk5ZzH7YUkkl1vjI3A9JYU1yNiPQ56UFnQIrJFCL3cF+Q5lJf2IjXLZBCBGmtAEv6 /FNXT0JHoSCoIiwGrNY1BC3XaMG3oKZKMxH+rgRjFDAP9VIRr4iftxYsQVmXFlpWeq+2dO LV50ABwk8S9Xj2bkSo/aMYnAQ/RNkR5BFM2bP4H++laYNYc9O7rrvsJfjTNI2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Ps05FRz8YL for ; Wed, 19 Nov 2025 04:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 849a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: fd737810a163 - stable/15 - nvme: Fix backwards sense of error condition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fd737810a16329449d9ceb1e77e5429fdbb51953 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:21 +0000 Message-Id: <691d43e1.849a.37f97953@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd737810a16329449d9ceb1e77e5429fdbb51953 commit fd737810a16329449d9ceb1e77e5429fdbb51953 Author: Warner Losh AuthorDate: 2025-11-18 20:07:11 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:52 +0000 nvme: Fix backwards sense of error condition b21e67875bf0c tested for the good condition, not the error condition, so we'd never do anything else in this function. This was causing certain logging not to happen, and also prevented forthcoming namespace size change code from working as well. Fixes: b21e67875bf0c Sponsored by: Netflix (cherry picked from commit 27481c268916b0790c7ad16202a5b012625ce1a8) --- sys/dev/nvme/nvme_ctrlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 6ed9cb33f991..07c1bcdfbf08 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1153,7 +1153,7 @@ nvme_ctrlr_aer_task(void *arg, int pending) mtx_sleep(aer, &aer->mtx, PRIBIO, "nvme_pt", 0); mtx_unlock(&aer->mtx); - if (aer->log_page_size != (uint32_t)-1) { + if (aer->log_page_size == (uint32_t)-1) { /* * If the log page fetch for some reason completed with an * error, don't pass log page data to the consumers. In From nobody Wed Nov 19 04:13:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pt3B4bz6HCdt for ; Wed, 19 Nov 2025 04:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Pt1rM8z3grt for ; Wed, 19 Nov 2025 04:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQJhkCN3MIW2wAc4fhCo6hUl5r2co1DB1M1XPRm1m9M=; b=qgfSvZzUif/w4D9nHRt2Lx9OqifMlHWBFHTLA7fJYwYTWcsd7ZJPKZ5ihUq9urFrQGrpew oiDvcUZguUK3KLyFv2gHAYFhwityyEk/cA9EUsxMEXtRMH0C8z6sedQAksE3I//JtV4QBc 2oKC3Gf0wRnNGaW6WVj72e+dCG0dp5ZahmkbsU33b8kxC6YQfOG97nOo5s23QfqZtedVef vIxJ2FGwO35mKPRn05xZ8m2VQhfu5at7maaJ+xBAYEEXeRD9pxP6i7pplW7qXETB+CvmPI KOb6TVmkWLk67yC8zBYVXyZGi5pT++k9ssMZiLIW6v9eO9sZlcHQ7437pjhqdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQJhkCN3MIW2wAc4fhCo6hUl5r2co1DB1M1XPRm1m9M=; b=ablsZ94h+DQJLQSkKobMgWq5Sf6CVSNGebFsk0A2wRtHrbyRcCBUtrbjhfoYztvjNGdXNa 27ivD3mQviKw+yLPmu10IsBbqCmDKhe0VHR6XSxPnGbkDhBSeIRW1PutCfti4/flo7NOCU aUli1vl3uQx+Zti/Gh6Sjx0hyz2P67aLrcxCQ8oQUVVObLqQxTsMUEYvQLMzHvtJcwyICo 5hHrVAJOA98IbOfmj+nU60qag2Uj7/bG4G93sSalEPSh6KMbFRxp5pegTYoSolERywTTLm b8Fd5GcoAX81G2F2I2vZdJBchyajpCfZXE3hvSLwfDOI7GTZ1TC5k+2JZQZoZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525602; a=rsa-sha256; cv=none; b=QhaGCR4ciGzzf5ulZGnoEeR1wskt7eeoQfnKm6EerhLDOMCXrayCMdGuy8S5JevTJWH24M 5ECzAQxqbofhb2SKkv07MdganeUGdM98qwgJwwplGcRtiiV78uTmW+BjMNQCvLboGAxifD xJj1OEypvXNFQhUs1jrMNJ5/7BcDkxU6X9PfVfykxaD64Vj6oOPSibWMQo5n3bRI6xJrT/ Gyz7Qgf0PIk0UmCax11qYjCFOTtMx8I3tVZt75zh8rrnjPSnn7JyJSPF0OnHoF+mfTi96l RLXgVkFeaM+fJakv0BUTysi1y3uFQiC9YR/CEEAe5MpQD17xBA3vK3I8QNE1+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pt0rd6z8By for ; Wed, 19 Nov 2025 04:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8593 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: fe6ee00d174e - stable/15 - nvme: Notify namespace changes better List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fe6ee00d174e0d7f4c7a38db9af7b94c56579054 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:22 +0000 Message-Id: <691d43e2.8593.68367ce7@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe6ee00d174e0d7f4c7a38db9af7b94c56579054 commit fe6ee00d174e0d7f4c7a38db9af7b94c56579054 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nvme: Notify namespace changes better When we get a namespace notification, we have to reconstrut the namespace to get the new identification data from the namespace. For each namespace in the AEN, we will reconstrict it before we call the notification. We also flag it as changed for the duration of the change callback (prior versions of the patch needed to keep track, but we no longer do, so this bit may be removed). Note when we've seen the namespace so we can notify when it goes away. Co-authored-by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 20e94950c54e398049396647da36b9e2c3b639c1) --- sys/dev/nvme/nvme.h | 7 +++++-- sys/dev/nvme/nvme_ctrlr.c | 12 +++++++++++- sys/dev/nvme/nvme_ns.c | 9 ++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 17c5cdb4db87..8e69c0ffe339 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1930,8 +1930,11 @@ typedef void (*nvme_cons_async_fn_t)(void *, const struct nvme_completion *, typedef void (*nvme_cons_fail_fn_t)(void *); enum nvme_namespace_flags { - NVME_NS_DEALLOCATE_SUPPORTED = 0x1, - NVME_NS_FLUSH_SUPPORTED = 0x2, + NVME_NS_DEALLOCATE_SUPPORTED = 0x01, + NVME_NS_FLUSH_SUPPORTED = 0x02, + NVME_NS_ADDED = 0x04, + NVME_NS_CHANGED = 0x08, + NVME_NS_GONE = 0x10, }; int nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr, diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 07c1bcdfbf08..63b8643d97d7 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1216,10 +1216,20 @@ nvme_ctrlr_aer_task(void *arg, int pending) } else if (aer->log_page_id == NVME_LOG_CHANGED_NAMESPACE) { struct nvme_ns_list *nsl = (struct nvme_ns_list *)aer->log_page_buffer; + struct nvme_controller *ctrlr = aer->ctrlr; + for (int i = 0; i < nitems(nsl->ns) && nsl->ns[i] != 0; i++) { + struct nvme_namespace *ns; + uint32_t id = nsl->ns[i]; + if (nsl->ns[i] > NVME_MAX_NAMESPACES) break; - nvme_notify_ns(aer->ctrlr, nsl->ns[i]); + + ns = &ctrlr->ns[id - 1]; + ns->flags |= NVME_NS_CHANGED; + nvme_ns_construct(ns, id, ctrlr); + nvme_notify_ns(ctrlr, id); + ns->flags &= ~NVME_NS_CHANGED; } } diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index e84d2066930e..21d7965bf7a6 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -78,7 +78,7 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, break; case NVME_PASSTHROUGH_CMD: pt = (struct nvme_pt_command *)arg; - return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, + return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, 1 /* is_user_buffer */, 0 /* is_admin_cmd */)); case NVME_GET_NSID: { @@ -557,8 +557,10 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, * standard says the entire id will be zeros, so this is a * cheap way to test for that. */ - if (ns->data.nsze == 0) - return (ENXIO); + if (ns->data.nsze == 0) { + ns->flags |= NVME_NS_GONE; + return ((ns->flags & NVME_NS_ADDED) ? 0 : ENXIO); + } flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); @@ -622,6 +624,7 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, ns->cdev->si_drv2 = make_dev_alias(ns->cdev, "%sns%d", device_get_nameunit(ctrlr->dev), ns->id); ns->cdev->si_flags |= SI_UNMAPPED; + ns->flags |= NVME_NS_ADDED; return (0); } From nobody Wed Nov 19 04:13:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pw2Lqpz6HCdx for ; Wed, 19 Nov 2025 04:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Pv2BdWz3ggr for ; Wed, 19 Nov 2025 04:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/Q07TZjiHh+PEKooR+4fGit1mPVtWxRzET1GiILAZM=; b=R3ROnhNQjKXiXsFMvzbhazUwM8gocOVp2FcFodBBRATFXOwRTQCz6xkhSji4BUOMsajHl7 P8PZpdMnof0uJ6u5jSK6YsWKGFQfUYtfaNZWhg37OkrQstuZ6sfZcmpef0/PEA+e5wD4CB CLntetf12ORrV3Z7xPQYAU6ppgGAVaZubDFlJEKGSAU0zpvHh3nv5tSuliqyj3fxSVYKXC vHujKDRitLFK6ir1rTxZ7vcVKRXHRNnFpsdiD2syjgcKUs5+cjOqVO0XxFjswgMRFmh/yH 95N4puc8jZhIQM1cJwyGTuZlvRdkbzpGJ5gnMHZyyUbHsVP5LRwy2wQsh8f0pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/Q07TZjiHh+PEKooR+4fGit1mPVtWxRzET1GiILAZM=; b=IwdJHEr3wflAiqS1sxMGwHYtFxA8a+rkszpDVHarDAgf++HUXXbvWCucemQ2bB9T/XtlwF q2lZKKzbzMuL6mSb5bKm4iDjahMNy29wjx6i3PCU+i7smsy7+rUxzh5OBLbaQ8wxFj48uW yTEEk6XtW9Zr8H+jSpzFLfDSKZTK+OlzgON4LnNeJKkRZty3TZCaJnJjzGLBJSeuQyH7jQ vjLnJiBbSTY++m+eqU2CFTb7Cgd0KF75AXdOb6hQMCcGjQuCLG7CxPzYS6jMDVT0f+4bap 9YbmKj+hIqdfo14EUQAXhSkGGQYPRK2DpQQOphvRgYiNn43h35aqFAIi0hJjVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525603; a=rsa-sha256; cv=none; b=EbeP/yZtxarb5htN+gscSMRXi1m6wjXuYCa5gczoDNdJpLoYDK40LQjpqR2d3cicF9oiYw O0QOscqAUGghTTSsFpSU0lLk8GeIeV90n1KZIPU8OpAXqvdArLkPDL2MnL1V5Ml46qHNMX o/yRYqZq2Gvvv88WnjAc/WjN3EsiYZmisiPt4Abr//GC+gsCojUW0w1vgbqLyp1vetKrFN x/H50rB0gylcwJWMdu7VK63tQ36q6OkKseAdYU1HyjmwxgBsR81NlBkONuEwmCuMpNJWDE JOmI2S7qEYkrRDFnxY9t5SxV3mNaA7SlD/o9eVhdwy+hWrV5vwK895pvmBfBBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pv1ZrPz7Zr for ; Wed, 19 Nov 2025 04:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8699 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: 31412fda9fa7 - stable/15 - nvme: Refactor geom setting to function. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 31412fda9fa71d85a19604151d662ac65c301c2a Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:23 +0000 Message-Id: <691d43e3.8699.67b8660c@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=31412fda9fa71d85a19604151d662ac65c301c2a commit 31412fda9fa71d85a19604151d662ac65c301c2a Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nvme: Refactor geom setting to function. Refactor setting of geometry for the disk to its own function. No functional changes. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit dffd882d12d2a71aca464f48209ec9ae6f393b15) --- sys/cam/nvme/nvme_da.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 1c0d5e8381d8..330f4ca66e1e 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -643,6 +643,35 @@ ndacleanup(struct cam_periph *periph) cam_periph_lock(periph); } +static void +ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) +{ + struct disk *disk = softc->disk; + struct ccb_pathinq cpi; + const struct nvme_namespace_data *nsd; + const struct nvme_controller_data *cd; + uint8_t flbas_fmt, lbads, vwc_present; + + nsd = nvme_get_identify_ns(periph); + cd = nvme_get_identify_cntrl(periph); + + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); + disk->d_sectorsize = 1 << lbads; + disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); + disk->d_delmaxsize = disk->d_mediasize; + disk->d_flags = DISKFLAG_DIRECT_COMPLETION; + if (nvme_ctrlr_has_dataset_mgmt(cd)) + disk->d_flags |= DISKFLAG_CANDELETE; + vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); + if (vwc_present) + disk->d_flags |= DISKFLAG_CANFLUSHCACHE; + if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { + disk->d_flags |= DISKFLAG_UNMAPPED_BIO; + softc->unmappedio = 1; + } +} + static void ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) @@ -846,7 +875,6 @@ ndaregister(struct cam_periph *periph, void *arg) const struct nvme_namespace_data *nsd; const struct nvme_controller_data *cd; char announce_buf[80]; - uint8_t flbas_fmt, lbads, vwc_present; u_int maxio; int quirks; @@ -903,21 +931,8 @@ ndaregister(struct cam_periph *periph, void *arg) else if (maxio > maxphys) maxio = maxphys; /* for safety */ disk->d_maxsize = maxio; - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); - lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); - disk->d_sectorsize = 1 << lbads; - disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); - disk->d_delmaxsize = disk->d_mediasize; - disk->d_flags = DISKFLAG_DIRECT_COMPLETION; - if (nvme_ctrlr_has_dataset_mgmt(cd)) - disk->d_flags |= DISKFLAG_CANDELETE; - vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); - if (vwc_present) - disk->d_flags |= DISKFLAG_CANFLUSHCACHE; - if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { - disk->d_flags |= DISKFLAG_UNMAPPED_BIO; - softc->unmappedio = 1; - } + ndasetgeom(softc, periph); + /* * d_ident and d_descr are both far bigger than the length of either * the serial or model number strings. From nobody Wed Nov 19 04:13:24 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pw6M94z6HCg4 for ; Wed, 19 Nov 2025 04:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Pw3J65z3gvJ for ; Wed, 19 Nov 2025 04:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zWdoNFkzfMuFD9TbV+K7cVjddaJF6nqb4sBd9r40c1w=; b=PcfLUhyDgkd0YSAvJ6smI+BZzgwoOG7siZEOPHGFvrtdAzWuP/blSZPrb5QlTtSqrdhA5a UDx7ovMTL+6LTz6Y6NeA2MYkjybUdBvHjHpHvBvxJBkr+9tBa0KgxYpxU5oz6fp72bsrnw UBHSA4nq7Zq4xpqZvP3QmYDWJygy0muRh2l3uVgxwVedWkmQw8e2OViNuv5d+HZYaRqg0F XWG/TYpNw0F64ydn5XDvfd6cDKluEqQecjlLwRUkq/Bk67yyUlcvo9C7E0RKS14IhmeDsY 8Uxmgow8X0Lzud/BEv1nkLu9Y5ruSmMM9scig2P/eF59rCAzfukTcYLSZ8cqww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zWdoNFkzfMuFD9TbV+K7cVjddaJF6nqb4sBd9r40c1w=; b=hIhv6PvcD2wpsEcmREpD4EAgfl3X9PFHgkg6fT1u9iR/ikHUVgd8wHoZ/BU67OVjz0D/Wj ZH+Ubpd9W8WsychAHaJPf/WTzNNMw/CFaBVQpCdrMR5URvxQkDEQFKs4+vlNPg5qGb/eBY 13vIxtl4nEr2Z/nugzdHFG2pL5DngXerxbhHasxtJKmIob3k3XunnrK/1sDDUjfCsL69dD FJcE59UbbkjCMX4p3GLr428DwrRKdskrdOf81OHjGZKmcPF+XFuJqepjxqhVzKqY1UlFqN I1iHZ01I6AvT3RyIlUHk6sB/V0xCGycqPpYniz+l5p1cRqonB140bFf2hloEsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525604; a=rsa-sha256; cv=none; b=ucTI8NsNhX7p98c3SCx/3GHyYVzVGoJXsBtmGfTKIw2Dupl8oAOm/ys4cMcSQ7VKW64S2I wxszNOqAJep5zfkiuGnQbCS+pndrdIaUP/cEkdUKNps/QHBuPWKNymgvLEvRFlLXkPdX/O s9EK21BKhGUOdCyfAU5RzGntpnJaqX6c1VTmk6b7MC3aF1j48vYL9P/3vC8mhvTers2Qss pohZgyJlNZMqkewH4JDoQHqxRhxBaoliLUotDmCHhe6uqI+5SpMxIoNaRDAtdC3MZ0U2Ne R6ZzFzBF/kIg2I5fdnitlJTSF/QoUbQ0UAN8gPTKw+XgK05lAIX6Ten0epinjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pw2LtNz7x4 for ; Wed, 19 Nov 2025 04:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 91a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: 9a465b37ea17 - stable/15 - nda: React to namespace change events List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9a465b37ea17642d45597d4ee7d3283b02dfa6f0 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:24 +0000 Message-Id: <691d43e4.91a6.765ccaff@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a465b37ea17642d45597d4ee7d3283b02dfa6f0 commit 9a465b37ea17642d45597d4ee7d3283b02dfa6f0 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nda: React to namespace change events Register for AC_GETDEV_CHANGED. When we receive a namespace notification, we only create a new device if it was unconfigured. If it was configured, generate this async event. Rely on the fact that we reconstruct namespace to just get the data from the identify data and call disk_resised. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 86d3ec359a56d1b5d015718bd19ef4bda681a032) --- sys/cam/nvme/nvme_da.c | 29 ++++++++++++++++++++--------- sys/cam/nvme/nvme_xpt.c | 2 ++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 330f4ca66e1e..2eb43809f4b1 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -673,12 +673,11 @@ ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) } static void -ndaasync(void *callback_arg, uint32_t code, - struct cam_path *path, void *arg) +ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) { - struct cam_periph *periph; + struct cam_periph *periph = callback_arg; + struct nda_softc *softc; - periph = (struct cam_periph *)callback_arg; switch (code) { case AC_FOUND_DEVICE: { @@ -709,17 +708,29 @@ ndaasync(void *callback_arg, uint32_t code, "due to status 0x%x\n", status); break; } + case AC_GETDEV_CHANGED: + { + int error; + + softc = periph->softc; + ndasetgeom(softc, periph); + error = disk_resize(softc->disk, M_NOWAIT); + if (error != 0) { + xpt_print(periph->path, "disk_resize(9) failed, error = %d\n", error); + break; + } + break; + + } case AC_ADVINFO_CHANGED: { uintptr_t buftype; + softc = periph->softc; buftype = (uintptr_t)arg; if (buftype == CDAI_TYPE_PHYS_PATH) { - struct nda_softc *softc; - - softc = periph->softc; disk_attr_changed(softc->disk, "GEOM::physpath", - M_NOWAIT); + M_NOWAIT); } break; } @@ -997,7 +1008,7 @@ ndaregister(struct cam_periph *periph, void *arg) * Register for device going away and info about the drive * changing (though with NVMe, it can't) */ - xpt_register_async(AC_LOST_DEVICE | AC_ADVINFO_CHANGED, + xpt_register_async(AC_LOST_DEVICE | AC_ADVINFO_CHANGED | AC_GETDEV_CHANGED, ndaasync, periph, periph->path); softc->state = NDA_STATE_NORMAL; diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index f6667df07be0..c22d5fed350c 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -463,6 +463,8 @@ device_fail: if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; xpt_action(done_ccb); xpt_async(AC_FOUND_DEVICE, path, done_ccb); + } else { + xpt_async(AC_GETDEV_CHANGED, path, NULL); } NVME_PROBE_SET_ACTION(softc, NVME_PROBE_DONE); break; From nobody Wed Nov 19 04:13:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Py08F8z6HCl0 for ; Wed, 19 Nov 2025 04:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Px499Lz3ghF for ; Wed, 19 Nov 2025 04:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uyu+JfvO2JrBfNvN8OAKnJB6kdXP0CF+nPXK3pdsuKY=; b=Ic0pl0AtYB2FMF1AE7SQxEEOEcxEF1Gozy8et9LsyA+2iL7uEYFCLLB6ckIEYLVpIqXjAu OcD2ZQg/OPkQ4H5nbi/NM6CAjajtbnaVDgy8x5ZNh1gn3y8RekIqNt4CmiOzc9TXwtqP4x gs1XvoBhs8ArhKYHL4M3VBAYKxydLeaPxKCI8/uszgDNEpV5LMS27B8LMJF2yNRqB19d0U zSarvp5ctDhK0/+6vN7iGr6EnkTWFEr99bgGyclIcIit5GDWb2a+2Qc9Phx33m/BJvGeYS Ny839ZoLhOvGbxn0PtXpaEy8Xg092QDO+XCWpzPAB7wwGJrbB0xuVg99NMyrkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uyu+JfvO2JrBfNvN8OAKnJB6kdXP0CF+nPXK3pdsuKY=; b=s8JXvZsCPH5icqDvfxVqSjRDlrwMBOiMJjdCvf9B2q2t4GBAV+S+b0O5lvjCLsyPIorykW sSsoDV+0v5CsfMXiwuHH1sLEVVZHaVk8LSReoyU0FMV3UXRycPxOqg3Rz+jZcKLRDMGK4t MtVFJ6b5zlzjFJ80/rhtTq3VOrDXPilKWamQoNWRJnihvvEypwIJRDGPZnxKKMTA8hHzeD HQr9TcqfhcoRXV2dLNU3VgLOFfLQ/5DF/PR4x89tbTdRrf4bVLsVMgkMNV0UAZAtFJfZbl T6RRaXTZFnCM7xX3bK5O82/LbGRAqTRfYb2tz1zSd48EsjIB0qF6z8xcm9+iUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525605; a=rsa-sha256; cv=none; b=lYV155FBIGh5flaFvK/YsW66+ZENW32EcyWkeBdpnUqeT2mrKEqiitu+/XKqjTLkvzcRDW NFwCcllXDs6zRQP+uGMqkcwSjL7GrfKOiTl5tVmyAS6FmvT5Y7yoZ0FLu63JAgc8dTK3Ap 5UT30FefdA0UwjJuXbz1d3q6gAkySmsfVi1+MSgTlftWtCj3t2avywwsyfQxn6i2EuRRnY LVRVS5TZJ0Ws5KsoWvr9SITdPlnP6+1mAT+2OUruxbdURrNITGhp2Z0xyOTv2/qEXSHIVY seRuRNOWvwfpO2i2gHPATYlyP9Px++cwT9cxs7MnxS768DJMng+7w/3/56RPIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Px357kz8NY for ; Wed, 19 Nov 2025 04:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 849e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: 96a7ed1e7fb4 - stable/15 - nvd: handle namespace changes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 96a7ed1e7fb41df17e783503371533cc8db98540 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:25 +0000 Message-Id: <691d43e5.849e.20667202@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=96a7ed1e7fb41df17e783503371533cc8db98540 commit 96a7ed1e7fb41df17e783503371533cc8db98540 Author: Wanpeng Qian AuthorDate: 2025-11-18 17:24:13 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nvd: handle namespace changes Signal the new media size when the namespace changes size. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit bd769e73d8f1d5141b1c2eb2322b4c6caed5d9e0) --- sys/dev/nvd/nvd.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c index 33b43efd24c1..4737b2b03ae9 100644 --- a/sys/dev/nvd/nvd.c +++ b/sys/dev/nvd/nvd.c @@ -61,6 +61,7 @@ static void nvd_done(void *arg, const struct nvme_completion *cpl); static void nvd_gone(struct nvd_disk *ndisk); static void *nvd_new_disk(struct nvme_namespace *ns, void *ctrlr); +static void *nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr); static void *nvd_new_controller(struct nvme_controller *ctrlr); static void nvd_controller_fail(void *ctrlr); @@ -154,7 +155,7 @@ nvd_load(void) TAILQ_INIT(&ctrlr_head); TAILQ_INIT(&disk_head); - consumer_handle = nvme_register_consumer(nvd_new_disk, + consumer_handle = nvme_register_consumer(nvd_ns_changed, nvd_new_controller, NULL, nvd_controller_fail); return (consumer_handle != NULL ? 0 : -1); @@ -512,6 +513,48 @@ nvd_new_disk(struct nvme_namespace *ns, void *ctrlr_arg) return (ndisk); } +static void +nvd_resize(struct nvd_disk *ndisk) +{ + struct disk *disk = ndisk->disk; + struct nvme_namespace *ns = ndisk->ns; + + disk->d_sectorsize = nvme_ns_get_sector_size(ns); + disk->d_mediasize = (off_t)nvme_ns_get_size(ns); + disk->d_maxsize = nvme_ns_get_max_io_xfer_size(ns); + disk->d_delmaxsize = (off_t)nvme_ns_get_size(ns); + if (disk->d_delmaxsize > nvd_delete_max) + disk->d_delmaxsize = nvd_delete_max; + + disk_resize(disk, M_NOWAIT); + + printf(NVD_STR"%u: NVMe namespace resized\n", ndisk->unit); + printf(NVD_STR"%u: %juMB (%ju %u byte sectors)\n", disk->d_unit, + (uintmax_t)disk->d_mediasize / (1024*1024), + (uintmax_t)disk->d_mediasize / disk->d_sectorsize, + disk->d_sectorsize); +} + +static void * +nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr_arg) +{ + struct nvd_disk *ndisk; + struct nvd_controller *ctrlr = ctrlr_arg; + + if ((ns->flags & NVME_NS_CHANGED) == 0) + return (nvd_new_disk(ns, ctrlr_arg)); + + mtx_lock(&nvd_lock); + TAILQ_FOREACH(ndisk, &ctrlr->disk_head, ctrlr_tailq) { + if (ndisk->ns->id != ns->id) + continue; + nvd_resize(ndisk); + break; + } + mtx_unlock(&nvd_lock); + return (ctrlr_arg); +} + static void nvd_controller_fail(void *ctrlr_arg) { From nobody Wed Nov 19 04:13:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Pz01RHz6HCpT for ; Wed, 19 Nov 2025 04:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dB7Py4cmPz3gsg for ; Wed, 19 Nov 2025 04:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i6x8gXW0s1f4uFDxpFwdEkLamxsrG7Mn47x1dnzfTH0=; b=Wy3afBwa5Q1TzSp1HhO4oqEZ+2OHTWAzXzzy6WSsrvS7rmNP/s9ZmEWr9+sk5UXOqNCRJ5 ae6mmjlHOs6NOOSrc2S77EvQH+6h9ZU9naDu94H6zx9lPek9FljVdfrOhi4VoB0jaCbvu0 mNY51gWnVigeKG3mTn3y2b5RLBYZ9Cwc6tBc/GsbCqAqFQq7McgI5I2QxCnUhEW3W7VBvY RtuMjIaGf6A4OLx3aZ7+bUGDGWaRWTBxDJsLocGqA0aIrzsOZ/G+lU4q0EYPVloWfAvEZz T9E+FDQf7M+KsN0YtKYVBYdrrYRK4MJvXmA/e82rZIf7Sxyx+XOdd8aYiOwLaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i6x8gXW0s1f4uFDxpFwdEkLamxsrG7Mn47x1dnzfTH0=; b=Hf0+XggsreXBxux4fq+xcucuxJW07OmOHy2iF8DIVY0IbLn3ug/1l8rEjrY9hj2bvjNA9D xWF0H1shJsVj1a1YdTfvFwQhFy0XX6jNOrNenEFRsA0jIMGMd7z0Sq9b/vjvi908yFrJUN c3QvTAGKtBUJbIbIBc464bihb2yoPav96506XxbX1baHzLVSvvHsHIeViMbVXSXAP47y3T LwvAVDdjfCntZXt77x8S9h0F+lqo6e2y6vdIXGQGBoOgfIt9d+VUxE77zK5E8oYW2Q8f+3 CAdsy6GwWHbi20rE3Nu+DLkZA4aE+b0xOKLR9bSkMjTCzzocsJkKWBiHaBg8ZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525606; a=rsa-sha256; cv=none; b=hLXp7U9rrUJgDzqiKoLoRfKtBmO2vm6IXpUaZlm/ekMpU/9qZRWiE8j5Q3Pf6QF2P1Vzdq Drn8zOPBpCgH+3vPwaem7m9/bdbDYY1jQmsnnMAtx/YrO2z2eQj7ptx/bFOyOKh0+pH9UK d4N+1NAyRezJgmn0WC3tE22EKHdsroOc/LE0Ol+0aR7TYroOMtXK4wZurC/7HjOGDB5c27 iuCl8rvXbBghtQk0CB25G8xzQ3fRhmWat2JIJN1z8xLNYi44E/UMjWRoFFaS2fw+zaVrtx gUwdze6MvW2mz+C33fJ2tTJJ+m1HjcjPHXK8aftZkhaTzRlWQWG8YvypxPjLHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Py3mmnz8fB for ; Wed, 19 Nov 2025 04:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 365d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Warner Losh Subject: git: b7ffac04541f - stable/15 - nvme_sim: signal namespace depature List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b7ffac04541f98d3d8c6078092d59f0fed88b1ef Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:26 +0000 Message-Id: <691d43e6.365d7.2c0a2518@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b7ffac04541f98d3d8c6078092d59f0fed88b1ef commit b7ffac04541f98d3d8c6078092d59f0fed88b1ef Author: Wanpeng Qian AuthorDate: 2025-11-18 17:24:13 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:53 +0000 nvme_sim: signal namespace depature Signal when the namespace is gone so we can tear down the disk when a nvme drive is removed. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 4640f5008922c5b189d2f7b63edf73300277e6df) --- sys/dev/nvme/nvme_sim.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index a06774a64761..f7fd0cee931b 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -352,25 +352,35 @@ static void * nvme_sim_ns_change(struct nvme_namespace *ns, void *sc_arg) { struct nvme_sim_softc *sc = sc_arg; + struct cam_path *tmppath; union ccb *ccb; + if (xpt_create_path(&tmppath, /*periph*/NULL, + cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { + printf("unable to create path for rescan\n"); + return (NULL); + } + /* + * If it's gone, then signal that and leave. + */ + if (ns->flags & NVME_NS_GONE) { + xpt_async(AC_LOST_DEVICE, tmppath, NULL); + xpt_free_path(tmppath); + return (sc_arg); + } + ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) { printf("unable to alloc CCB for rescan\n"); return (NULL); } + ccb->ccb_h.path = tmppath; /* - * We map the NVMe namespace idea onto the CAM unit LUN. For - * each new namespace, we create a new CAM path for it. We then - * rescan the path to get it to enumerate. + * We map the NVMe namespace idea onto the CAM unit LUN. For each new + * namespace, scan or rescan the path to enumerate it. tmppath freed at + * end of scan. */ - if (xpt_create_path(&ccb->ccb_h.path, /*periph*/NULL, - cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { - printf("unable to create path for rescan\n"); - xpt_free_ccb(ccb); - return (NULL); - } xpt_rescan(ccb); return (sc_arg); From nobody Wed Nov 19 07:47:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8m6kJHz6HH28 for ; Wed, 19 Nov 2025 07:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBD8m5qWTz41bZ for ; Wed, 19 Nov 2025 07:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=om/NJUZIVOLgBGsGTJrA1QETt5xagL1G0Sw5N+mAgVo=; b=VeSfUJ5DxG/HoPhtmxmZua0eC/5+oLMabtEvlEyFAdP/GkGN7G3CY8IGdAug8rq9pf8s4j 6TBlHEDD5gzvcNFAAmjB9TdtMIaCpP3mWuKk7kBZ3TDvMSoboWOaHnhNAAQCFypLlqTVWE T0nQoUpHsV0diWP/CsLHa7yc15KFHs+J4+NjIaOzk/5OaC+XscXoOK1/0qZfvJT9Z+dcJW OxJ3m/FXabP1up94sv+H9Skr5Wo1UtN4oaYA/ico+4+ahd+5DpDoDg1O9qdjNrdjrv6MiO aMAEdAD4JzC0pfaGlalDlb9j6S6jycGjPH+/F4Xs3zutb+QWcvEid2Q5DF0Qlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=om/NJUZIVOLgBGsGTJrA1QETt5xagL1G0Sw5N+mAgVo=; b=saCm+NCB+j5Cc0K8SvBbD65oU+Lhard4aez2Q9C1t9xhff47Jffkkc/qBZaSNgtA/PXKC1 FAs5LvmG3xRQHI7Wdx7cCGKpmYLG2UTXVKJ9lkn4CqDrkf9yvXO5m1kQr8s9rOYc5KAxxn s9vX9bkTpD0oCB+VaFutbFd+S/aRyKV9hDPxbRdKUgHpRWeDG6nBbyHR9wXlUCdpsn4hFf GBWBs0Jz7cCp66p8uP3YJBp2pkzmszfQHw9Tt8JiI7xCquLG3urZwypuOyfC6N3W3PnDmv MizjtD/3smsba/3IZWspyr4xaORTwfGOhbfQvPXCOOhAOniqsDl4W0FhWjl4+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763538440; a=rsa-sha256; cv=none; b=c9MuaWNvx6eVWUBs3DYkPFHTosa3qsBtOEBtJBid3xXfbQ8eTBBVrw4rrvM9Siw3iDE/FG jbtOqvVRydCs6ra9VLbZiWftuTG/RtDEMbWJ6RR+4gxcl9Vz8YNadZB3rNcgjdH5kPcYjY KWEhYaEcRs2Hz6yyc2PgFXykZeVuggGCgCmSQx8I6GhFwtQDq2VbylV13wFlFhfHBqC51c 0swK/SZjoIjpiMAG6vNYYdvBuiHctovja+XdhPJkrwHkYAPx3UIE0gpr5Y/YeU7CwkEn1/ RtKBC61IgLbqOb+Ll1xCA2EL0Wl0lLEKGOj1xJJz6+lWy16jKxLk7aYdJn1caw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8m4qdyzWY6 for ; Wed, 19 Nov 2025 07:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e615 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 07:47:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 709465f2c4f1 - stable/14 - zfs: merge openzfs/zfs@079ba86d7 (zfs-2.2-release) into stable/14 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 709465f2c4f12fe9b820ca8097de9021bff0c84b Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 07:47:14 +0000 Message-Id: <691d7602.2e615.4803bdc7@gitrepo.freebsd.org> The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=709465f2c4f12fe9b820ca8097de9021bff0c84b commit 709465f2c4f12fe9b820ca8097de9021bff0c84b Merge: 18391412cecf 079ba86d7157 Author: Martin Matuska AuthorDate: 2025-11-18 23:29:00 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 23:29:00 +0000 zfs: merge openzfs/zfs@079ba86d7 (zfs-2.2-release) into stable/14 OpenZFS release 2.2.9 Notable upstream pull request merges: #16025 fdc683e86 dnode_next_offset: backtrack if lower level does not match #16197 67ea51710 Several improvements to ARC shrinking #16401 10208765e Soften pruning threshold on not evictable metadata #17434 1ced0ff5d Reduce zfs_dmu_offset_next_sync penalty #17542 2910b5f5c enforce arc_dnode_limit #17561 3a8e23d0f Skip dbuf_evict_one() from dbuf_evict_notify() for reclaim thread #17758 5e10fb6d7 Add interface to interface spa_get_worst_case_min_alloc() function #17563 91f3622a2 Faster checksum benchmark on system boot #17765 6a02c0994 zvol: Fix blk-mq sync #17780 3167b0db1 Fix 'zpool add' safety check corner cases #17904 6e4acd789 zstd: disable intrinsics #17915 5a77c19c8 BRT: Fix ranges to blocks conversion math Obtained from: OpenZFS OpenZFS commit: 079ba86d71571bf997ff688da061d8c4aa2fd052 OpenZFS tag: zfs-2.2.9 .../.github/ISSUE_TEMPLATE/feature_request.md | 2 +- .../openzfs/.github/PULL_REQUEST_TEMPLATE.md | 5 - sys/contrib/openzfs/.github/codeql-cpp.yml | 1 + .../cpp/dslDatasetHoldReleMismatch.ql | 34 ++++ .../.github/workflows/scripts/generate-ci-type.py | 12 +- .../.github/workflows/scripts/qemu-1-setup.sh | 10 ++ .../.github/workflows/scripts/qemu-2-start.sh | 178 ++++++++++++------- .../.github/workflows/scripts/qemu-3-deps-vm.sh | 16 +- .../.github/workflows/scripts/qemu-4-build-vm.sh | 23 ++- .../.github/workflows/scripts/qemu-5-setup.sh | 39 ++++- .../.github/workflows/scripts/qemu-6-tests.sh | 8 +- .../.github/workflows/zfs-qemu-packages.yml | 15 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 75 ++++---- sys/contrib/openzfs/.github/workflows/zloop.yml | 24 +-- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 47 ++++- sys/contrib/openzfs/cmd/zfs/zfs_project.c | 36 +++- sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 26 +-- sys/contrib/openzfs/config/ax_python_devel.m4 | 4 +- .../openzfs/config/kernel-dentry-operations.m4 | 10 +- sys/contrib/openzfs/config/kernel-objtool.m4 | 17 ++ .../config/kernel-pagemap-readahead-page.m4 | 23 +++ ...kernel-readpages.m4 => kernel-vfs-readpages.m4} | 0 sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 24 +++ sys/contrib/openzfs/config/kernel.m4 | 4 + sys/contrib/openzfs/config/user-statx.m4 | 34 ++++ sys/contrib/openzfs/config/user.m4 | 1 + sys/contrib/openzfs/config/zfs-build.m4 | 136 +++++++++----- sys/contrib/openzfs/configure.ac | 2 + sys/contrib/openzfs/contrib/debian/rules.in | 6 +- sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 3 +- sys/contrib/openzfs/contrib/intel_qat/readme.md | 2 +- .../pyzfs/libzfs_core/test/test_libzfs_core.py | 2 +- sys/contrib/openzfs/etc/init.d/README.md | 2 +- .../openzfs/include/os/freebsd/spl/sys/misc.h | 5 + sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + .../include/os/linux/kernel/linux/blkdev_compat.h | 18 -- .../include/os/linux/kernel/linux/dcache_compat.h | 26 --- .../include/os/linux/kernel/linux/pagemap_compat.h | 36 ++++ .../openzfs/include/os/linux/spl/sys/misc.h | 6 + sys/contrib/openzfs/include/sys/arc_impl.h | 6 +- sys/contrib/openzfs/include/sys/brt_impl.h | 2 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 2 + sys/contrib/openzfs/include/sys/spa.h | 1 + sys/contrib/openzfs/include/sys/spa_impl.h | 1 + sys/contrib/openzfs/include/sys/zfs_context.h | 5 + sys/contrib/openzfs/include/sys/zfs_project.h | 10 +- sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/include/os/linux/sys/stat.h | 5 + .../openzfs/lib/libspl/include/os/linux/sys/vfs.h | 33 ++++ .../openzfs/lib/libspl/os/linux/getmntany.c | 36 +++- sys/contrib/openzfs/man/man4/zfs.4 | 7 + sys/contrib/openzfs/module/Kbuild.in | 3 +- sys/contrib/openzfs/module/Makefile.bsd | 40 ++--- sys/contrib/openzfs/module/Makefile.in | 1 + .../openzfs/module/os/freebsd/spl/spl_misc.c | 9 + sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 13 +- .../openzfs/module/os/linux/spl/spl-thread.c | 12 ++ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 88 +++++----- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 65 +++++++ .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 56 +++++- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 102 ++++++++--- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 68 +++++-- sys/contrib/openzfs/module/zfs/arc.c | 152 +++++++++------- sys/contrib/openzfs/module/zfs/dbuf.c | 10 +- sys/contrib/openzfs/module/zfs/dmu.c | 16 +- sys/contrib/openzfs/module/zfs/dnode.c | 65 +++++-- sys/contrib/openzfs/module/zfs/spa_config.c | 2 + sys/contrib/openzfs/module/zfs/spa_misc.c | 15 ++ sys/contrib/openzfs/module/zfs/vdev.c | 15 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 2 + sys/contrib/openzfs/module/zfs/zfs_chksum.c | 69 +++++--- .../openzfs/module/zstd/include/aarch64_compat.h | 37 ---- .../openzfs/module/zstd/lib/common/compiler.h | 3 - .../openzfs/module/zstd/lib/common/zstd_internal.h | 9 + sys/contrib/openzfs/scripts/.gitignore | 1 + sys/contrib/openzfs/scripts/objtool-wrapper.in | 36 ++++ sys/contrib/openzfs/scripts/zfs-tests.sh | 9 +- sys/contrib/openzfs/tests/runfiles/common.run | 3 +- .../tests/test-runner/bin/test-runner.py.in | 61 +++++++ .../openzfs/tests/zfs-tests/tests/Makefile.am | 4 +- .../tests/functional/acl/off/posixmode.ksh | 2 +- .../tests/functional/arc/dbufstats_001_pos.ksh | 4 +- .../tests/functional/arc/dbufstats_002_pos.ksh | 2 +- .../cli_root/zfs_send/zfs_send_007_pos.ksh | 4 +- .../functional/cli_root/zpool_add/zpool_add.kshlib | 42 +++++ ...l_add_010_pos.ksh => zpool_add_warn_create.ksh} | 100 ++--------- .../cli_root/zpool_add/zpool_add_warn_degraded.ksh | 195 +++++++++++++++++++++ .../cli_root/zpool_add/zpool_add_warn_removal.ksh | 117 +++++++++++++ .../zpool_import/zpool_import_rename_001_pos.ksh | 2 +- .../functional/redacted_send/redacted_panic.ksh | 2 +- .../tests/functional/snapshot/snapshot_002_pos.ksh | 2 +- .../tests/functional/snapshot/snapshot_006_pos.ksh | 2 +- .../user_namespace/user_namespace_004.ksh | 2 +- .../functional/zvol/zvol_misc/zvol_misc_fua.ksh | 44 ++++- .../functional/zvol/zvol_misc/zvol_misc_trim.ksh | 11 +- .../functional/zvol/zvol_stress/zvol_stress.ksh | 2 +- 97 files changed, 1864 insertions(+), 661 deletions(-) diff --cc sys/contrib/openzfs/.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql index 000000000000,fb5dae35092f..fb5dae35092f mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql +++ b/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/dslDatasetHoldReleMismatch.ql diff --cc sys/contrib/openzfs/config/kernel-pagemap-readahead-page.m4 index 000000000000,30f3d56682fb..30f3d56682fb mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-pagemap-readahead-page.m4 +++ b/sys/contrib/openzfs/config/kernel-pagemap-readahead-page.m4 diff --cc sys/contrib/openzfs/config/kernel-vfs-writepage.m4 index 000000000000,d438e85b457c..d438e85b457c mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-vfs-writepage.m4 +++ b/sys/contrib/openzfs/config/kernel-vfs-writepage.m4 diff --cc sys/contrib/openzfs/config/user-statx.m4 index 000000000000,0315f93e0c20..0315f93e0c20 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/user-statx.m4 +++ b/sys/contrib/openzfs/config/user-statx.m4 diff --cc sys/contrib/openzfs/include/os/linux/kernel/linux/pagemap_compat.h index 000000000000,a0465ede0105..a0465ede0105 mode 000000,100644..100644 --- a/sys/contrib/openzfs/include/os/linux/kernel/linux/pagemap_compat.h +++ b/sys/contrib/openzfs/include/os/linux/kernel/linux/pagemap_compat.h diff --cc sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h index 000000000000,c7b567ff44a4..c7b567ff44a4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h +++ b/sys/contrib/openzfs/lib/libspl/include/os/linux/sys/vfs.h diff --cc sys/contrib/openzfs/scripts/objtool-wrapper.in index 000000000000,0451f8718233..0451f8718233 mode 000000,100644..100644 --- a/sys/contrib/openzfs/scripts/objtool-wrapper.in +++ b/sys/contrib/openzfs/scripts/objtool-wrapper.in diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh index 000000000000,ded9cb3c68f8..ded9cb3c68f8 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh index 000000000000,56feaf1f9965..56feaf1f9965 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh From nobody Wed Nov 19 07:47:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8n723Fz6HH0N for ; Wed, 19 Nov 2025 07:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBD8n5vhwz41Hd for ; Wed, 19 Nov 2025 07:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Op0MSI1SwcwxoXKF93XapXEVJYe2UCF2Kdss7K8tU+Y=; b=hi7q/JGkzrfNzhSpYAKssqp7epkSyX5aQZ7gaQN6grfNUtEfI3Pk1lZ+rqNAjPvc2cYNu9 PbCG+onVWbrgreIWKfodp0aZgqn7cJou4f2bZ5ZBnBWRQ7rVc6TPTJ8u8R/oTXHAuxg3Z8 s4quSYSWQb0XHhF7GxZN83ZwxVwhk6osm7y7Yfd5GC6IVEoq10fDCo2V7hXpVu7TrH5xbv f/G13+TCeVftQpPdGUOpLBWn29ZCyDLGA2wpKavbWhqL1fdZCE3Tk+RSr506WCmUoK9A6o 6xog59i9g6js9ak1eRIm/Lah84EzjesSh/2iPe41wpr2skzhUa1O8DPGjaKq7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Op0MSI1SwcwxoXKF93XapXEVJYe2UCF2Kdss7K8tU+Y=; b=Y0TuzM5DCDGZnBtWmrh2QzMLutAxKrqSoVnj6+egxZBR5l2uHO3jVKfHwzJfilQOQrwrLI +bWV/390piCTyA7yGS02WTBnu6kBwHAygf700eOsh31PQlpRCaSPwohd1QClcWy28Is1IB 8iWkP9L54F52x/iCTCRZp9almkQjkb8tywcc33zwlESDLYc9vjFT3NhRfygfc6pKbw/aoI 44l0uAomWMCYeYmdBdORReJmK/vb9SDb3lwAAfsZwYzv/WCATsWm1ce8Oaqi4ov16HgMDb PYNXyX9jkyuGHXu6Nh34TAd/Ec+jFbTwsVqvizD6ilDXum3ceD5ZuwfJ3nV7HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763538441; a=rsa-sha256; cv=none; b=ZmUKx0KEDW7US3ipPnxsroMu6C9hG8Zw28DKBL7D3HDvn9ScFbIdVnhTAKGA5FLZuZ9N7a UvqSVekQnU1TterdolJIUbJ/FEy5jZy7sb9JClCJyEOE8bKl762Sizf1lU6mAC6IeqsJ4e 4ioZP4l1GMbTTEWHusCjE7DRNTDDCr2+Idrr4gnKZIY10hfbb113hDovg2RvMdj5alZfRV N/cKQIh5hO+kW04a1JSjTq1+RRAsHkkEIWqLhGQIPgQSQ6TUG9it8i4HcRm9ZebaksThRv nvXG1T2RjUCqD71R7cHAEc0VPZ+at1mUiQ1Orh4Em3Le4xFQVMWKl3uWSHFMXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8n5DMgzWfZ for ; Wed, 19 Nov 2025 07:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e8fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 07:47:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 2d2d945440ff - stable/14 - zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.2.9 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2d2d945440ff3baa3475c13b3be43b06bc1fa587 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 07:47:21 +0000 Message-Id: <691d7609.2e8fd.619be253@gitrepo.freebsd.org> The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2d2d945440ff3baa3475c13b3be43b06bc1fa587 commit 2d2d945440ff3baa3475c13b3be43b06bc1fa587 Author: Martin Matuska AuthorDate: 2025-11-18 23:46:58 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 23:46:58 +0000 zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.2.9 --- sys/modules/zfs/zfs_config.h | 23 +++++++++++++++++++---- sys/modules/zfs/zfs_gitrev.h | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index b0fc72c654f3..92498273dc13 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -477,6 +477,9 @@ /* Define if you have [uuid] */ /* #undef HAVE_LIBUUID */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_STAT_H */ + /* makedev() is declared in sys/mkdev.h */ /* #undef HAVE_MAKEDEV_IN_MKDEV */ @@ -504,6 +507,9 @@ /* folio_wait_bit() exists */ /* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ +/* readahead_page() exists */ +/* #undef HAVE_PAGEMAP_READAHEAD_PAGE */ + /* part_to_dev() exists */ /* #undef HAVE_PART_TO_DEV */ @@ -602,6 +608,12 @@ /* standalone exists */ /* #undef HAVE_STANDALONE_LINUX_STDARG */ +/* statx() is available */ +/* #undef HAVE_STATX */ + +/* STATX_MNT_ID is available */ +/* #undef HAVE_STATX_MNT_ID */ + /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -722,6 +734,9 @@ /* splice_copy_file_range() is available */ /* #undef HAVE_VFS_SPLICE_COPY_FILE_RANGE */ +/* address_space_operations->writepage exists */ +/* #undef HAVE_VFS_WRITEPAGE */ + /* __vmalloc page flags exists */ /* #undef HAVE_VMALLOC_PAGE_KERNEL */ @@ -809,7 +824,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.2.8-FreeBSD_g3e4a3e161" +#define ZFS_META_ALIAS "zfs-2.2.9-FreeBSD_g079ba86d7" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -818,7 +833,7 @@ /* #undef ZFS_META_DATA */ /* Define the maximum compatible kernel version. */ -#define ZFS_META_KVER_MAX "6.15" +#define ZFS_META_KVER_MAX "6.17" /* Define the minimum compatible kernel version. */ #define ZFS_META_KVER_MIN "4.18" @@ -839,10 +854,10 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "FreeBSD_g3e4a3e161" +#define ZFS_META_RELEASE "FreeBSD_g079ba86d7" /* Define the project version. */ -#define ZFS_META_VERSION "2.2.8" +#define ZFS_META_VERSION "2.2.9" /* count is located in percpu_ref.data */ /* #undef ZFS_PERCPU_REF_COUNT_IN_DATA */ diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 7a81682b6bc3..984cb6555d08 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.2.8-0-g3e4a3e161" +#define ZFS_META_GITREV "zfs-2.2.9-0-g079ba86d7" From nobody Wed Nov 19 07:47:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8q10Ytz6HGdH for ; Wed, 19 Nov 2025 07:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBD8p6vnvz41bh for ; Wed, 19 Nov 2025 07:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HmHNMTBZJKc3XWjsd8OxdQ1dAjdm3LgzIAYq+anVoG8=; b=XJtqt9SWKMOQ28BQ17x2YNQJksn3dAma5a74EF8FBPUH5Cvz577kTMj3zbVd5AtIydwPOR nlbti4cj2CPYbj4a9qB7jJNkuTPFbP3A9GocXdkotPd6bpuGTQvY3e2iwJdAbCN6PBpz5f H7nu+NqMJ3Tzic4RmYN01UXRQCqrDYy3G13oeKTpV60b4Nhv0wf/XaaaluRUTpgpvbwwbf S1ONFfY+yHfQ9+RmcMoXAzEmus3UeWd6E5fx1Pch3MotaNKyd9k/bfwedBek6ImDF1G1ut oSqMOkHvQJ5jIR3KeC3xxkePpgdsczNZ+qJ95XUNgaagIW1lMjXgTxf5/r39rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763538443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HmHNMTBZJKc3XWjsd8OxdQ1dAjdm3LgzIAYq+anVoG8=; b=qlcy/qJMlvC0VCWDF7bdojpesDfM4D5MWlZ8CScQWsm9f/IFruBlKOn0NIVuamrXkGsrDM 5BglPOO1z3XH1dFwgatjqmK3bRP0l16oFHNeICX1gC4KVWPOoRpAl9kaA02E44jusA0nGz lg/a5Vu2RA7RS+9XaaCurZP4YdbwSvbyc9luPihnW7cYLjWnluKwK8nV/8RgJZp60vHx85 Q3idXZDx9EKFZMI8cdB67KqglCF6Bvat+3j0liyTpP9hJ3d0CJ4NxfAcJXF1znjQDT0l2N wnBVPggVIX3t6zWUVP4qnUsi0c30mgNZOlBScxz8+5sd69bvMUCIL1KvOJMPDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763538443; a=rsa-sha256; cv=none; b=QAAuItNQrM4CqcdXFxbThvelAzrvL6TKPfTNaSADtmAwp1bJT+i8uWnRkC3nubUhF0E8Px vqUced3cueCmqTfXSXPiqL1PvFUVa0qkMBHyRoftoSRmEAGW+lZYxoB1h9pFhU9qB1s+O5 SMMiDiNe3Yq2/lPnyb3Cie3T2MvpMc6NhWF7jbmM+pg9d9Ph5hUUcMDKrGqd2oVHpNklR/ uXW0x12WikEjq/6RyQDe869/9iA0YZ+5lVa5+HK5NKK91eaqFBBHtDTYM3vhBketVTKyN9 F+IccngceF0fBqOtkWZzFOB9rWW6grq3c28TkDjN8fs+G4IumAhMu5bf/zejbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBD8p5z3gzWfb for ; Wed, 19 Nov 2025 07:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2e4a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 07:47:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: b12f5537df39 - stable/14 - zfs: fix aarch64 build after zfs-2.2.9 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b12f5537df397d40ae02adf2c9ecaa7cd0b5a512 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 07:47:22 +0000 Message-Id: <691d760a.2e4a0.58ec89ca@gitrepo.freebsd.org> The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b12f5537df397d40ae02adf2c9ecaa7cd0b5a512 commit b12f5537df397d40ae02adf2c9ecaa7cd0b5a512 Author: Martin Matuska AuthorDate: 2025-11-17 19:15:33 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 23:47:32 +0000 zfs: fix aarch64 build after zfs-2.2.9 (cherry picked from commit fb709935d64d5fd4ad21cf8c69faf580760999e4) --- sys/modules/zfs/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index ad5f52d05038..71c635ef0749 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -466,8 +466,6 @@ CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICA CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .if ${MACHINE_ARCH} == "aarch64" -__ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h -CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.error_private.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.fse_compress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} From nobody Wed Nov 19 09:58:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBH42037Kz6HRj3 for ; Wed, 19 Nov 2025 09:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBH416wl8z3CMV for ; Wed, 19 Nov 2025 09: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=1763546305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+svvB2ZzZg3liwXnEjJNbOeNXN17nWB7JQzlpBzlRbo=; b=g2mDz4gkw/0x6SOgtFYjbyGhOJ+nEBu9ldf8Zo7z0zWXrm9xnbEz/DV4Pmwqd4JV7d05j4 lRPqb0u05UNIHfqe9+kQIWIctXhsvU9Mg6dIoJhvc2i62SLYigiYmVuIR9r3jiumPRD9Z1 0/PViJySTQNJBp1OxNzdEkcjJ4ZzPYuHH9V/Gi8IfrSKTffQ4/5qOrGM+tXwtIZWooFaWb WeBPtGu/U5QnthYKZVYtiKPnhMNOqGpPzf4IbZSU4Ys81JgO83FjLLBRABwXS7wTS+XA6v CVAB65NST5sZXV2Dg6Imd99b+0VEsWCnv0PoCJ7QOiBYoph7ATpAtNr+PCY5bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763546305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+svvB2ZzZg3liwXnEjJNbOeNXN17nWB7JQzlpBzlRbo=; b=DoSRULfS+ctf8ruCoQtx6HRpNLi6kedgK/z25CR4i/M2m+6ZIQXTa6yqTZ3r/irZtPvYCi PUAgpbReVINlhwQlQ4LLHoEMIipA1tWjvKVxcgTlMBrovZjieLgPVh6xiGFAfdHikCtrgj wS9HHaMHBx+KOaDGhKUdCjqXRtRPHnACuT1dj+Gn3b6634aQF/RPEu+alg1S5g0AExCWf9 XNW9NCU+IPC8uVDLzStGYrcFL/QnaOepU5wfAL4UEVhrbdrP8xCfgmhHV1U4LkZsP9oGd7 stbq4TJABEPpOAQvN/f1DxNU3EbToJq9Yu4XaYzS3jUFRK2UeJPsEl2Ocr96wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763546305; a=rsa-sha256; cv=none; b=XdkTtWLFUmqPQRAahfTi/xDDH1w1/QJuRmE28ebM8vTRQ/GJFvKI37yvcx4trCmqPD8Ltf LUOhgNcRrO/+qMOo1abXccGs39/QZAN9pLcZ52FIFlTxd3ZuAGowuBErjH3SFaoW3UdHpy A2xzGaVpzwyCa1r0ag3CA1ZkYEx/W2NubsXMVOQuyvEdRiurPCGfS3kFZFoXuXuKDSYX0z QQHRZ74A3Ime+Ri4SoRR2VOJJLzbaldEzVUYV5KN7dffp1A7PJau6jy6dfgBV60x9LhE4b 6Fb6rPdVwCsJZaxGYjKbcClR9GLujzDSvQRatXbJra9BgjlykDD4J83yN17WoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBH4163bszbGS for ; Wed, 19 Nov 2025 09:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ac2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 09:58:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Goran=?utf-8?Q? Meki=C4=87?= From: Christos Margiolis Subject: git: 282015e7a07d - stable/15 - sound examples: Extend and clean up List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 282015e7a07df0aa3e871a217213b569186cec78 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 09:58:25 +0000 Message-Id: <691d94c1.3ac2d.6b7dcabb@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=282015e7a07df0aa3e871a217213b569186cec78 commit 282015e7a07df0aa3e871a217213b569186cec78 Author: Goran Mekić AuthorDate: 2025-11-12 20:15:59 +0000 Commit: Christos Margiolis CommitDate: 2025-11-19 09:57:51 +0000 sound examples: Extend and clean up - Simplify directory and file structure. - Clean up and improve code. Add more comments. - Add polling examples. MFC after: 1 week Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D53353 (cherry picked from commit 6a569666868b36f5f436eea9d66789b6df191b8a) --- share/examples/Makefile | 14 +- share/examples/sound/kqueue.c | 79 ++++++++++ share/examples/sound/oss.h | 222 ++++++++++++++++++++++++++++ share/examples/sound/oss/README | 66 --------- share/examples/sound/oss/audio.c | 310 --------------------------------------- share/examples/sound/poll.c | 70 +++++++++ share/examples/sound/select.c | 70 +++++++++ share/examples/sound/simple.c | 147 +++++++++++++++++++ 8 files changed, 595 insertions(+), 383 deletions(-) diff --git a/share/examples/Makefile b/share/examples/Makefile index 0a65b8c40d39..09bbf820e574 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -319,13 +319,13 @@ SE_SCSI_TARGET= \ SE_DIRS+= sound SE_SOUND= \ - sndstat_nv.c \ - midi.c - -SE_DIRS+= sound/oss -SE_SOUND_OSS= \ - README \ - audio.c + kqueue.c \ + midi.c \ + oss.h \ + poll.c \ + select.c \ + simple.c \ + sndstat_nv.c SE_DIRS+= sunrpc SE_SUNRPC= Makefile diff --git a/share/examples/sound/kqueue.c b/share/examples/sound/kqueue.c new file mode 100644 index 000000000000..9117d7a389bb --- /dev/null +++ b/share/examples/sound/kqueue.c @@ -0,0 +1,79 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Goran Mekić + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include "oss.h" + +int +main(int argc, char *argv[]) +{ + struct config config = { + .device = "/dev/dsp", + .mode = O_RDWR, + .format = AFMT_S32_NE, + .sample_rate = 48000, + }; + struct kevent event = {}; + int rc, bytes, kq; + + oss_init(&config); + bytes = config.buffer_info.bytes; + + if ((kq = kqueue()) < 0) + err(1, "Failed to allocate kqueue"); + EV_SET(&event, config.fd, EVFILT_WRITE, EV_ADD | EV_CLEAR, 0, 0, 0); + if (kevent(kq, &event, 1, NULL, 0, NULL) < 0) + err(1, "Failed to register kevent"); + for (;;) { + if (kevent(kq, NULL, 0, &event, 1, NULL) < 0) { + warn("Event error"); + break; + } + if (event.flags & EV_ERROR) { + warn("Event error: %s", strerror(event.data)); + break; + } + if ((rc = read(config.fd, config.buf, bytes)) < bytes) { + warn("Requested %d bytes, but read %d!\n", bytes, rc); + break; + } + if ((rc = write(config.fd, config.buf, bytes)) < bytes) { + warn("Requested %d bytes, but wrote %d!\n", bytes, rc); + break; + } + } + EV_SET(&event, config.fd, EVFILT_WRITE, EV_DELETE, 0, 0, 0); + if (kevent(kq, &event, 1, NULL, 0, NULL) < 0) + err(1, "Failed to unregister kevent"); + close(kq); + + free(config.buf); + close(config.fd); + + return (0); +} diff --git a/share/examples/sound/oss.h b/share/examples/sound/oss.h new file mode 100644 index 000000000000..437c6d69d454 --- /dev/null +++ b/share/examples/sound/oss.h @@ -0,0 +1,222 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Goran Mekić + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include +#include +#include +#include +#include + +/* + * Minimal configuration for OSS. For real world applications, this structure + * will probably contain many more fields + */ +struct config { + char *device; + int mode; + int fd; + int format; + int sample_count; + int sample_rate; + int sample_size; + int chsamples; + int mmap; + void *buf; + oss_audioinfo audio_info; + audio_buf_info buffer_info; +}; + +/* + * The buffer size used by OSS is (2 ^ exponent) * number_of_fragments. + * Exponent values range between 4 and 16, so this function looks for the + * smallest exponent which can fit a buffer of size "x". The fragments + * determine in how many chunks the buffer will be sliced into, hence if the + * exponent is 4, and number of fragments is 2, the requested size will be 2^4 + * * 2 = 32. Please note that the buffer size is in bytes, not samples. For + * example, a 24-bit sample will be represented with 3 bytes. If you're porting + * an audio application from Linux, you should be aware that 24-bit samples on + * it are represented with 4 bytes (usually int). The idea of a total buffer + * size that holds number of fragments is to allow application to be + * number_of_fragments - 1 late. That's called jitter tolerance. + * + * Official OSS development howto: + * http://manuals.opensound.com/developer/DSP.html + */ +static inline int +size2exp(int x) +{ + int exp = 0; + + while ((1 << exp) < x) + exp++; + + return (exp); +} + +static void +oss_init(struct config *config) +{ + unsigned long request = SNDCTL_DSP_GETOSPACE; + int tmp = 0; + + if ((config->fd = open(config->device, config->mode)) < 0) + err(1, "Error opening the device %s", config->device); + + /* Get device information */ + if (ioctl(config->fd, SNDCTL_ENGINEINFO, &config->audio_info) < 0) + err(1, "Unable to get device info"); + + /* Get device capabilities */ + if (ioctl(config->fd, SNDCTL_DSP_GETCAPS, &config->audio_info.caps) < 0) + err(1, "Unable to get capabilities"); + + /* Check if device supports triggering */ + if (!(config->audio_info.caps & PCM_CAP_TRIGGER)) + errx(1, "Device doesn't support triggering!\n"); + + /* Handle memory mapped mode */ + if (config->mmap) { + if (!(config->audio_info.caps & PCM_CAP_MMAP)) + errx(1, "Device doesn't support mmap mode!\n"); + tmp = 0; + if (ioctl(config->fd, SNDCTL_DSP_COOKEDMODE, &tmp) < 0) + err(1, "Unable to set cooked mode"); + } + + /* Set sample format */ + if (ioctl(config->fd, SNDCTL_DSP_SETFMT, &config->format) < 0) + err(1, "Unable to set sample format"); + + /* Set sample channels */ + if (ioctl(config->fd, SNDCTL_DSP_CHANNELS, &config->audio_info.max_channels) < 0) + err(1, "Unable to set channels"); + + /* Set sample rate */ + if (ioctl(config->fd, SNDCTL_DSP_SPEED, &config->sample_rate) < 0) + err(1, "Unable to set sample rate"); + + /* Calculate sample size */ + switch (config->format) { + case AFMT_S8: + case AFMT_U8: + config->sample_size = 1; + break; + case AFMT_S16_BE: + case AFMT_S16_LE: + case AFMT_U16_BE: + case AFMT_U16_LE: + config->sample_size = 2; + break; + case AFMT_S24_BE: + case AFMT_S24_LE: + case AFMT_U24_BE: + case AFMT_U24_LE: + config->sample_size = 3; + break; + case AFMT_S32_BE: + case AFMT_S32_LE: + case AFMT_U32_BE: + case AFMT_U32_LE: + case AFMT_F32_BE: + case AFMT_F32_LE: + config->sample_size = 4; + break; + default: + errx(1, "Invalid audio format %d", config->format); + break; + } + + /* + * Set fragment and sample size. This part is optional as OSS has + * default values. From the kernel's perspective, there are few things + * OSS developers should be aware of: + * + * - For each sound(4)-created channel, there is a software-facing + * buffer, and a hardware-facing one. + * - The sizes of the buffers can be listed in the console with "sndctl + * swbuf hwbuf". + * - OSS ioctls only concern software-facing buffer fragments, not + * hardware. + * + * For USB sound cards, the block size is set according to the + * hw.usb.uaudio.buffer_ms sysctl, meaning 2ms at 48kHz gives 0.002 * + * 48000 = 96 samples per block. Block size should be set as multiple + * of 96, in this case. The OSS driver insists on reading/writing a + * certain number of samples at a time, one fragment full of samples. + * It is bound to do so at a fixed time frame, to avoid under- and + * overruns during communication with the hardware. + */ + config->buffer_info.fragments = 2; + tmp = size2exp(config->sample_size * config->audio_info.max_channels); + tmp = ((config->buffer_info.fragments) << 16) | tmp; + if (ioctl(config->fd, SNDCTL_DSP_SETFRAGMENT, &tmp) < 0) + err(1, "Unable to set fragment size"); + + /* Get buffer info */ + if ((config->mode & O_ACCMODE) == O_RDONLY) + request = SNDCTL_DSP_GETISPACE; + if (ioctl(config->fd, request, &config->buffer_info) < 0) + err(1, "Unable to get buffer info"); + if (config->buffer_info.fragments < 1) + config->buffer_info.fragments = config->buffer_info.fragstotal; + if (config->buffer_info.bytes < 1) + config->buffer_info.bytes = config->buffer_info.fragstotal * config->buffer_info.fragsize; + if (config->buffer_info.bytes < 1) { + errx(1, "OSS buffer error: buffer size can not be %d\n", + config->buffer_info.bytes); + } + config->sample_count = config->buffer_info.bytes / config->sample_size; + config->chsamples = config->sample_count / config->audio_info.max_channels; + config->buf = malloc(config->buffer_info.bytes); + + printf("bytes: %d, fragments: %d, fragsize: %d, fragstotal: %d, " + "samples: %d\n", + config->buffer_info.bytes, config->buffer_info.fragments, + config->buffer_info.fragsize, config->buffer_info.fragstotal, + config->sample_count); + + /* Set the trigger */ + switch (config->mode & O_ACCMODE) { + case O_RDONLY: + tmp = PCM_ENABLE_INPUT; + break; + case O_WRONLY: + tmp = PCM_ENABLE_OUTPUT; + break; + case O_RDWR: + tmp = PCM_ENABLE_INPUT | PCM_ENABLE_OUTPUT; + break; + default: + errx(1, "Invalid mode %d", config->mode); + break; + } + if (ioctl(config->fd, SNDCTL_DSP_SETTRIGGER, &tmp) < 0) + err(1, "Failed to set trigger"); +} diff --git a/share/examples/sound/oss/README b/share/examples/sound/oss/README deleted file mode 100644 index 0188a26348c8..000000000000 --- a/share/examples/sound/oss/README +++ /dev/null @@ -1,66 +0,0 @@ -Briefly summarised, a general audio application will: -- open(2) -- ioctl(2) -- read(2) -- write(2) -- close(2) - -In this example, read/write will be called in a loop for a duration of -record/playback. Usually, /dev/dsp is the device you want to open, but it can -be any OSS compatible device, even user space one created with virtual_oss. For -configuring sample rate, bit depth and all other configuring of the device -ioctl is used. As devices can support multiple sample rates and formats, what -specific application should do in case there's an error issuing ioctl, as not -all errors are fatal, is upon the developer to decide. As a general guideline -Official OSS development howto should be used. FreeBSD OSS and virtual_oss are -different to a small degree. - -For more advanced OSS and real-time applications, developers need to handle -buffers more carefully. The size of the buffer in OSS is selected using fragment -size size_selector and the buffer size is 2^size_selector for values between 4 -and 16. The formula on the official site is: - -int frag = (max_fragments << 16) | (size_selector); -ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag); - -The max_fragments determines in how many fragments the buffer will be, hence if -the size_selector is 4, the requested size is 2^4 = 16 and for the -max_fragments of 2, the total buffer size will be - -(2 ^ size_selector) * max_fragments - -or in this case 32 bytes. Please note that size of buffer is in bytes not -samples. For example, 24bit sample will be represented with 3 bytes. If you're -porting audio app from Linux, you should be aware that 24 bit samples are -represented with 4 bytes (usually int). - -FreeBSD kernel will round up max_fragments and size of fragment/buffer, so the -last thing any OSS code should do is get info about buffer with audio_buf_info -and SNDCTL_DSP_GETOSPACE. That also means that not all values of max_fragments -are permitted. - -From kernel perspective, there are few points OSS developers should be aware of: -- There is a software facing buffer (bs) and a hardware driver buffer (b) -- The sizes can be seen with cat /dev/sndstat as [b:_/_/_] [bs:_/_/_] (needed: - sysctl hw.snd.verbose=2) -- OSS ioctl only concern software buffer fragments, not hardware - -For USB the block size is according to hw.usb.uaudio.buffer_ms sysctl, meaning -2ms at 48kHz gives 0.002 * 48000 = 96 samples per block, all multiples of this -work well. Block size for virtual_oss, if used, should be set accordingly. - -OSS driver insists on reading / writing a certain number of samples at a time, -one fragment full of samples. It is bound to do so in a fixed time frame, to -avoid under- and overruns in communication with the hardware. - -The idea of a total buffer size that holds max_fragments fragments is to give -some slack and allow application to be about max_fragments - 1 fragments late. -Let's call this the jitter tolerance. The jitter tolerance may be much less if -there is a slight mismatch between the period and the samples per fragment. - -Jitter tolerance gets better if we can make either the period or the samples -per fragment considerably smaller than the other. In our case that means we -divide the total buffer size into smaller fragments, keeping overall latency at -the same level. - -Official OSS development howto: http://manuals.opensound.com/developer/DSP.html diff --git a/share/examples/sound/oss/audio.c b/share/examples/sound/oss/audio.c deleted file mode 100644 index 4dd3c8b82575..000000000000 --- a/share/examples/sound/oss/audio.c +++ /dev/null @@ -1,310 +0,0 @@ -/* - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2021 Goran Mekić - * Copyright (c) 2024 The FreeBSD Foundation - * - * Portions of this software were developed by Christos Margiolis - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#include -#include -#include -#include -#include -#include -#include - -#ifndef SAMPLE_SIZE -#define SAMPLE_SIZE 16 -#endif - -/* Format can be unsigned, in which case replace S with U */ -#if SAMPLE_SIZE == 32 -typedef int32_t sample_t; -int format = AFMT_S32_NE; /* Signed 32bit native endian format */ -#elif SAMPLE_SIZE == 16 -typedef int16_t sample_t; -int format = AFMT_S16_NE; /* Signed 16bit native endian format */ -#elif SAMPLE_SIZE == 8 -typedef int8_t sample_t; -int format = AFMT_S8_NE; /* Signed 8bit native endian format */ -#else -#error Unsupported sample format! -typedef int32_t sample_t; -int format = AFMT_S32_NE; /* Not a real value, just silencing - * compiler errors */ -#endif - -/* - * Minimal configuration for OSS - * For real world applications, this structure will probably contain many - * more fields - */ -typedef struct config { - char *device; - int channels; - int fd; - int format; - int frag; - int sample_count; - int sample_rate; - int sample_size; - int chsamples; - int mmap; - oss_audioinfo audio_info; - audio_buf_info buffer_info; -} config_t; - -/* - * Error state is indicated by value=-1 in which case application exits with - * error - */ -static inline void -check_error(const int value, const char *message) -{ - if (value == -1) - err(1, "OSS error: %s\n", message); -} - - -/* Calculate frag by giving it minimal size of buffer */ -static inline int -size2frag(int x) -{ - int frag = 0; - - while ((1 << frag) < x) - ++frag; - - return (frag); -} - -/* - * Split input buffer into channels. Input buffer is in interleaved format - * which means if we have 2 channels (L and R), this is what the buffer of 8 - * samples would contain: L,R,L,R,L,R,L,R. The result are two channels - * containing: L,L,L,L and R,R,R,R. - */ -static void -oss_split(config_t *config, sample_t *input, sample_t *output) -{ - int channel, index, i; - - for (i = 0; i < config->sample_count; ++i) { - channel = i % config->channels; - index = i / config->channels; - output[channel * index] = input[i]; - } -} - -/* - * Convert channels into interleaved format and place it in output - * buffer - */ -static void -oss_merge(config_t *config, sample_t *input, sample_t *output) -{ - int channel, index; - - for (channel = 0; channel < config->channels; ++channel) { - for (index = 0; index < config->chsamples; ++index) { - output[index * config->channels + channel] = - input[channel * index]; - } - } -} - -static void -oss_init(config_t *config) -{ - int error, tmp, min_frag; - - /* Open the device for read and write */ - config->fd = open(config->device, O_RDWR); - check_error(config->fd, "open"); - - /* Get device information */ - config->audio_info.dev = -1; - error = ioctl(config->fd, SNDCTL_ENGINEINFO, &(config->audio_info)); - check_error(error, "SNDCTL_ENGINEINFO"); - printf("min_channels: %d\n", config->audio_info.min_channels); - printf("max_channels: %d\n", config->audio_info.max_channels); - printf("latency: %d\n", config->audio_info.latency); - printf("handle: %s\n", config->audio_info.handle); - if (config->audio_info.min_rate > config->sample_rate || - config->sample_rate > config->audio_info.max_rate) { - errx(1, "%s doesn't support chosen samplerate of %dHz!\n", - config->device, config->sample_rate); - } - if (config->channels < 1) - config->channels = config->audio_info.max_channels; - - /* - * If device is going to be used in mmap mode, disable all format - * conversions. Official OSS documentation states error code should not - * be checked. - * http://manuals.opensound.com/developer/mmap_test.c.html#LOC10 - */ - if (config->mmap) { - tmp = 0; - ioctl(config->fd, SNDCTL_DSP_COOKEDMODE, &tmp); - } - - /* - * Set number of channels. If number of channels is chosen to the value - * near the one wanted, save it in config - */ - tmp = config->channels; - error = ioctl(config->fd, SNDCTL_DSP_CHANNELS, &tmp); - check_error(error, "SNDCTL_DSP_CHANNELS"); - /* Or check if tmp is close enough? */ - if (tmp != config->channels) { - errx(1, "%s doesn't support chosen channel count of %d set " - "to %d!\n", config->device, config->channels, tmp); - } - config->channels = tmp; - - /* Set format, or bit size: 8, 16, 24 or 32 bit sample */ - tmp = config->format; - error = ioctl(config->fd, SNDCTL_DSP_SETFMT, &tmp); - check_error(error, "SNDCTL_DSP_SETFMT"); - if (tmp != config->format) { - errx(1, "%s doesn't support chosen sample format!\n", - config->device); - } - - /* Most common values for samplerate (in kHz): 44.1, 48, 88.2, 96 */ - tmp = config->sample_rate; - error = ioctl(config->fd, SNDCTL_DSP_SPEED, &tmp); - check_error(error, "SNDCTL_DSP_SPEED"); - - /* Get and check device capabilities */ - error = ioctl(config->fd, SNDCTL_DSP_GETCAPS, &(config->audio_info.caps)); - check_error(error, "SNDCTL_DSP_GETCAPS"); - if (!(config->audio_info.caps & PCM_CAP_DUPLEX)) - errx(1, "Device doesn't support full duplex!\n"); - - if (config->mmap) { - if (!(config->audio_info.caps & PCM_CAP_TRIGGER)) - errx(1, "Device doesn't support triggering!\n"); - if (!(config->audio_info.caps & PCM_CAP_MMAP)) - errx(1, "Device doesn't support mmap mode!\n"); - } - - /* - * If desired frag is smaller than minimum, based on number of channels - * and format (size in bits: 8, 16, 24, 32), set that as frag. Buffer - * size is 2^frag, but the real size of the buffer will be read when - * the configuration of the device is successful - */ - min_frag = size2frag(config->sample_size * config->channels); - - if (config->frag < min_frag) - config->frag = min_frag; - - /* - * Allocate buffer in fragments. Total buffer will be split in number - * of fragments (2 by default) - */ - if (config->buffer_info.fragments < 0) - config->buffer_info.fragments = 2; - tmp = ((config->buffer_info.fragments) << 16) | config->frag; - error = ioctl(config->fd, SNDCTL_DSP_SETFRAGMENT, &tmp); - check_error(error, "SNDCTL_DSP_SETFRAGMENT"); - - /* When all is set and ready to go, get the size of buffer */ - error = ioctl(config->fd, SNDCTL_DSP_GETOSPACE, &(config->buffer_info)); - check_error(error, "SNDCTL_DSP_GETOSPACE"); - if (config->buffer_info.bytes < 1) { - errx(1, "OSS buffer error: buffer size can not be %d\n", - config->buffer_info.bytes); - } - config->sample_count = config->buffer_info.bytes / config->sample_size; - config->chsamples = config->sample_count / config->channels; -} - -int -main(int argc, char *argv[]) -{ - int ret, bytes; - int8_t *ibuf, *obuf; - config_t config = { - .device = "/dev/dsp", - .channels = -1, - .format = format, - .frag = -1, - .sample_rate = 48000, - .sample_size = sizeof(sample_t), - .buffer_info.fragments = -1, - .mmap = 0, - }; - - /* Initialize device */ - oss_init(&config); - - /* - * Allocate input and output buffers so that their size match frag_size - */ - bytes = config.buffer_info.bytes; - ibuf = malloc(bytes); - obuf = malloc(bytes); - sample_t *channels = malloc(bytes); - - printf("bytes: %d, fragments: %d, fragsize: %d, fragstotal: %d, " - "samples: %d\n", - bytes, config.buffer_info.fragments, - config.buffer_info.fragsize, config.buffer_info.fragstotal, - config.sample_count); - - /* Minimal engine: read input and copy it to the output */ - for (;;) { - ret = read(config.fd, ibuf, bytes); - if (ret < bytes) { - fprintf(stderr, "Requested %d bytes, but read %d!\n", - bytes, ret); - break; - } - oss_split(&config, (sample_t *)ibuf, channels); - /* All processing will happen here */ - oss_merge(&config, channels, (sample_t *)obuf); - ret = write(config.fd, obuf, bytes); - if (ret < bytes) { - fprintf(stderr, "Requested %d bytes, but wrote %d!\n", - bytes, ret); - break; - } - } - - /* Cleanup */ - free(channels); - free(obuf); - free(ibuf); - close(config.fd); - - return (0); -} diff --git a/share/examples/sound/poll.c b/share/examples/sound/poll.c new file mode 100644 index 000000000000..53bdf572e991 --- /dev/null +++ b/share/examples/sound/poll.c @@ -0,0 +1,70 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Goran Mekić + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include "oss.h" + +int +main(int argc, char *argv[]) +{ + struct config config = { + .device = "/dev/dsp", + .mode = O_RDWR, + .format = AFMT_S32_NE, + .sample_rate = 48000, + }; + struct pollfd pfds[1]; + int rc, bytes; + + oss_init(&config); + bytes = config.buffer_info.bytes; + + for (;;) { + pfds[0].fd = config.fd; + pfds[0].events = POLLOUT; + if (poll(pfds, sizeof(pfds) / sizeof(struct pollfd), -1) < 0) + err(1, "poll"); + if (pfds[0].revents != 0) { + if ((rc = read(config.fd, config.buf, bytes)) < bytes) { + warn("Requested %d bytes, but read %d!\n", + bytes, rc); + break; + } + if ((rc = write(config.fd, config.buf, bytes)) < bytes) { + err(1, "Requested %d bytes, but wrote %d!\n", + bytes, rc); + break; + } + } + } + + free(config.buf); + close(config.fd); + + return (0); +} diff --git a/share/examples/sound/select.c b/share/examples/sound/select.c new file mode 100644 index 000000000000..762d0b2b86a7 --- /dev/null +++ b/share/examples/sound/select.c @@ -0,0 +1,70 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Goran Mekić + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include "oss.h" + +int +main(int argc, char *argv[]) +{ + struct config config = { + .device = "/dev/dsp", + .mode = O_RDWR, + .format = AFMT_S32_NE, + .sample_rate = 48000, + }; + fd_set fds; + int rc, bytes; + + oss_init(&config); + bytes = config.buffer_info.bytes; + + for (;;) { + FD_ZERO(&fds); + FD_SET(config.fd, &fds); + if (select(config.fd + 1, &fds, NULL, NULL, NULL) < 0) + err(1, "select"); + if (FD_ISSET(config.fd, &fds)) { + if ((rc = read(config.fd, config.buf, bytes)) < bytes) { + warn("Requested %d bytes, but read %d!\n", + bytes, rc); + break; + } + if ((rc = write(config.fd, config.buf, bytes)) < bytes) { + warn("Requested %d bytes, but wrote %d!\n", + bytes, rc); + break; + } + } + } + + free(config.buf); + close(config.fd); + + return (0); +} diff --git a/share/examples/sound/simple.c b/share/examples/sound/simple.c new file mode 100644 index 000000000000..e458841f596a --- /dev/null +++ b/share/examples/sound/simple.c @@ -0,0 +1,147 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 The FreeBSD Foundation + * Copyright (c) 2025 Goran Mekić + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "oss.h" + +/* + * Split input buffer into channels. The input buffer is in interleaved format, + * which means if we have 2 channels (L and R), this is what the buffer of 8 + * samples would contain: L,R,L,R,L,R,L,R. The result of this function is a + * buffer containing: L,L,L,L,R,R,R,R. + */ +static void +to_channels(struct config *config, void *output) +{ + uint8_t *in = config->buf; + uint8_t *out = output; + int i, channel, index, offset, byte; + + /* Iterate over bytes in the input buffer */ + for (byte = 0; byte < config->buffer_info.bytes; + byte += config->sample_size) { + /* + * Get index of a sample in the input buffer measured in + * samples + */ + i = byte / config->sample_size; + + /* Get which channel is being processed */ + channel = i % config->audio_info.max_channels; + + /* Get offset of the sample inside a single channel */ + offset = i / config->audio_info.max_channels; + + /* Get index of a sample in the output buffer */ + index = (channel * config->chsamples + offset) * + config->sample_size; + + /* Copy singe sample from input to output */ + memcpy(out+index, in+byte, config->sample_size); + } +} + *** 77 LINES SKIPPED *** From nobody Wed Nov 19 09:58:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBH431by4z6HS8m for ; Wed, 19 Nov 2025 09:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBH426fBPz3CCl for ; Wed, 19 Nov 2025 09:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763546307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQbuuAZKnY5QVIBo0gYrBCDvPy9OqxgTtRMCZ8AfHqA=; b=ypwZowlriYy0tJqSOnj07/G0qi2VgHEF8SfcpxxFo1rhTSEt4mKnmO/MKcyp9RAPEwD/F7 8ETTMWEoUx2HQjN+VVfIlC8HnpFGOzK30s0pBzQ/HGdW1K3Pocfk8++Kjz4ssaNCuqLFAb 0+X6kEDZWUo1y16upLOBn0GZGqKVWqpbF3Ez2a7dj4KJ4ozG/CEBjm3YWeHqbP2YM44xjf WwUIu3qr26dzic2DAjjO3jXCoofRVtkMalJRebFuReNkf3jyJsorxxbuuNubMTGjbgWzM5 gAz0cIDYq6WYhVYp+nmZWgdGsGYyI4fdIKUQ7kZG6RFOfh0BDw1HHuq1NHEK/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763546307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQbuuAZKnY5QVIBo0gYrBCDvPy9OqxgTtRMCZ8AfHqA=; b=t3KQq+f8gLj7kWt8Hs/HOzGfw5PU7bm/2ukP9ilO2H5GKYv743v3/ZFUxY3a5zNZqC9urF yhAwQWipE+ueWsIeT2UQhXC4ebM+5mozXVy5gV3KUSmSza7Ej7YAp2xZJOdqDQnzpf2aJr 3zEXJ8EFtzuaQs3z2mbuGUpqrMQ1RwKwkgQ94eXem7/5sI+f+Bwrt39ZpFXzvLoWlEoTcF +FSkpb9q+KVqUi0nxFdncqnh/AnLTsuym29yJK3Rg4k9AvGwS65qIubyvAz47OlOGtajDH pruC7vKlE53WVxHi8SmfqDhCVD7282tIaiTxonxb6aoSnepeCihmcb1bMsEUcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763546307; a=rsa-sha256; cv=none; b=B0uVjTq9g8BgXvnQpwlIKgqOm1t+l1Uw51wX8vK1IgEQVANinPiRU8UZ+Xt6piKoDIgpCI iTv/E40gtQEABdBIElVu6/8YwAfC7Z1yAPBJg7kQyjV29uTfNpf4ZtDV009SJBuwNvc7NA RkrjLPELfQiqMOviVcDKgAMbZyY2pjW4PeUT5+edCpi3AqnXCN21QJowLOJwVdJyYl2B8/ 3M8Gciz1Jp9ZSy44Dsh7UvbhJqEaowBnhsMY06h4DkejXfN+TRjiSPCK0Z1nuO+2OS6v3e VGRonc+peUOw2cAi4qIEiVZFMp5WyY2nrYq2ud1C/OVEb1pEF635lusUfpsVQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBH426BzFzb9t for ; Wed, 19 Nov 2025 09:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b178 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 09:58:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: cff21ddcb756 - stable/15 - sound: Remove KOBJMETHOD_END re-definitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cff21ddcb7566fc0e964332ae03136e0a4861036 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 09:58:26 +0000 Message-Id: <691d94c2.3b178.64eb22b7@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=cff21ddcb7566fc0e964332ae03136e0a4861036 commit cff21ddcb7566fc0e964332ae03136e0a4861036 Author: Christos Margiolis AuthorDate: 2025-11-12 20:30:58 +0000 Commit: Christos Margiolis CommitDate: 2025-11-19 09:57:51 +0000 sound: Remove KOBJMETHOD_END re-definitions No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D53696 (cherry picked from commit 4c05ff1d5ad206d6074151f747a1dd272487555c) --- sys/dev/sound/midi/midi.c | 4 ---- sys/dev/sound/midi/mpu401.c | 4 ---- sys/dev/sound/pcm/sound.h | 4 ---- 3 files changed, 12 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 6753f864ba9c..eed7ce89a919 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -62,10 +62,6 @@ #include MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area"); -#ifndef KOBJMETHOD_END -#define KOBJMETHOD_END { NULL, NULL } -#endif - #define MIDI_DEV_MIDICTL 12 enum midi_states { diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 224ebb1b01f4..af3149ec8180 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -49,10 +49,6 @@ #include "mpu_if.h" #include "mpufoi_if.h" -#ifndef KOBJMETHOD_END -#define KOBJMETHOD_END { NULL, NULL } -#endif - #define MPU_DATAPORT 0 #define MPU_CMDPORT 1 #define MPU_STATPORT 1 diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 75fb57e33733..c5107d5fba1c 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -76,10 +76,6 @@ #include #include -#ifndef KOBJMETHOD_END -#define KOBJMETHOD_END { NULL, NULL } -#endif - struct pcm_channel; struct pcm_feeder; struct snd_dbuf; From nobody Wed Nov 19 10:09:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHKB3zqYz6HSpC for ; Wed, 19 Nov 2025 10:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHKB34Hhz3Ddv for ; Wed, 19 Nov 2025 10:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763546990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGXD4NExFgIFkm/KcwQkEdPXWxXeASjCCLy/gpdhF1Y=; b=QF3kcwTTrTavy60Z9ckGqhL2cgFnRds9URegyszHrZqrJwqRzpCngbiDb0S0uZ8xv8hdjM Sj8EhqX6q85mHoqTRHh37ETsBOu0dj1yxSr+tAr1EHmNQ1uxj6O2AHXX7P8x2FRUFmJRd2 GlXgUrmblNWde1Z+BrGDujLjj7Pp0Yt4i96aSwwx9948ixgnJDT1k61BgsTlEF/TtuX8jO AkFo79MTEIT0dE7ZNquJA1p4ftSgAsG8kPf3PVeQbYUl7vtVih7iqNObwoGNyPVLbPry2/ WmQ5XQzawbKcWZCS89NTLQfkXY8xqEVZKOjtCB2201OGPsjw9Jnh+DSK84kAMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763546990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGXD4NExFgIFkm/KcwQkEdPXWxXeASjCCLy/gpdhF1Y=; b=MO9KDTfBqN66Suw+DJTUDTKB4VJpvRXDb1zhYhRyVgMmitfcQLQbLmw6aNGbX58BdBgju1 9R3scQvEV9iWM9bUSlZZCyW0ZgcVxJdvjusj/7rsGFqOLGrtCiGgZvhkQpNVWg/wf9zMl8 2RAMZPt47nloR04APhGY8tEMlKSmgsQGRBhJF818d0rRcyHBAET4Mp6KWXhysCILFLlUb1 K74x7JMP15UG9kSq/hvaElhytHaFo04tQaeXh+KZJhq7nlkGVxWWfC9pX3WjzvtVNIrjbE +BrrP1A0h8jxqeiDk9sbe5Lw7NZ8qHr1ojkSWzVXBQAwkknMdEpyzExFpP4ygA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763546990; a=rsa-sha256; cv=none; b=bIxONYHEiOiYrszACxShUdQynQvhhcgOzTEShgffzEFC1N/ljMcWDF5bQMTo17zseyeDec aT7eQk592mrXMCmkBL2FA85vv+DWE0Vv6ub5RTcm7HbWvVAy6txbSu9MIWrMw4EldlLwTz nkOJ5L2Ae0zpqo9jZBeCR4ma6v6pnq2o5l5jklOMwEP6gc/kZhlb2eT2JNr5pvcqGss9EJ 6pTImCwq7GV1q2sV8UzJTzmRrMhumaHgYIZ2XKGrxNsWAqr0NCu7vJYlUfA0wl+pOapE3j qWXIxtpZirq/3XUrUZhh+MmXXhZYDMzsVQqH4PnZ9BGUDBnmh2/sxpMdErka9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHKB28RZzcQ3 for ; Wed, 19 Nov 2025 10:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:09:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a2754976efe2 - stable/14 - nvmecontrol(8): Fix a typo in an error message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a2754976efe2f8989dd056f6126020a4bbfc4e32 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:09:50 +0000 Message-Id: <691d976e.3b0ae.5187c1f6@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a2754976efe2f8989dd056f6126020a4bbfc4e32 commit a2754976efe2f8989dd056f6126020a4bbfc4e32 Author: Gordon Bergling AuthorDate: 2025-10-26 15:08:31 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:09:37 +0000 nvmecontrol(8): Fix a typo in an error message - s/speciifed/specified/ (cherry picked from commit 44004bcffabc3372d6812c2e0c4bf90386919e21) --- sbin/nvmecontrol/perftest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c index 0afab9951e50..c98e0fbab8e4 100644 --- a/sbin/nvmecontrol/perftest.c +++ b/sbin/nvmecontrol/perftest.c @@ -172,7 +172,7 @@ perftest(const struct cmd *f, int argc, char *argv[]) arg_help(argc, argv, f); } if (opt.time == 0) { - fprintf(stderr, "No time speciifed\n"); + fprintf(stderr, "No time specified\n"); arg_help(argc, argv, f); } io_test.time = opt.time; From nobody Wed Nov 19 10:10:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHLT2RQpz6HSTk for ; Wed, 19 Nov 2025 10:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHLT1XjJz3DmK for ; Wed, 19 Nov 2025 10:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzNjtAP/CD0vkahbW+sD6kMUoRFJrx7wzdkHsjv3CVE=; b=gK4FBbSkTd4QcFLu1JeVKodBTl9Mhaqh3CoL4+lWgiqzYTk074jrCOxe3U57y9sEqiTGq7 1d4UxnSsYMIDBOHQmb7XR95Aa8MTNq3pUDX6u0I0QAHLD7ioFVZ0eG61A4e5UKJ0nydSFC rHbUqTXgD/Iq1HzLnLNhVw1E66PYUZ35y40wUKpykVUispL9CByg+UyT4rKd8aPVRsxlFv pVYtoT1JwbpcJJDH0m9aSKR4BdnbcUkwwagxp5+LtTmHChw03qDEYHx+YTCDNwjUMv+d7Z 8CvZixSNbYZM2IR8Ib7MLAPHDjfJWkrvRWw9SP8C61MLHTostLcxwLeQVLAxQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzNjtAP/CD0vkahbW+sD6kMUoRFJrx7wzdkHsjv3CVE=; b=ac9u7eRjHrWTfq/DZTIr4EHh1spg+IbPZa7d/NZwZk3vL5Ph5yQrLLBdAhMMaBics0iTyv Qk7LIhChzq1gJgUi4j3O4BlhyLCt7A0hAxTMKYB4npUqKJRRYdtYDgIwfUPRV6QLsrL2j9 E8+TJY2SBrZHlfFZ08OctgD1hV7r0tV42bH9fvR004Rwd0C2ohgZ1aJsr8cjqwmq01PFmf zdzh0sPbl/cdENChM4lNjju6qm7scyBlkAvLFG+4snmVcv3IGkO6WT3VqWjO/yN+3HV6ad DlFYAxLqhj0a2SouBFJPwpJ6NPtBU/CJeNBnznDgk+qNlYE5MBy+dPSNmnV7QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547057; a=rsa-sha256; cv=none; b=YvQYff+LOtirtUsw3NMBW38tbqIZri8b9d7qjRhpWc6dG6xnYnsrOb7xHRVsE9hyeJK5VD oA5c5omFZlzCkEHrHxYG2LO3mAxTtUtGbgI73aXuFiWZLo5icj7A/Dhe9neiwQYOoVqhQj lpiLFiQzz+SWr4j+DcX7du2xG47/rjmPEo5SKEiwFx72ISjSqS92t7yzAildYMnAbPrf9q UiColxrIJ2xSz7TCtmzVQZstgQ3mULNqDhByfqH8WSHiePpIe8l+AJXeQG3dv6jii1X9Dq pBIsqoXY8fYz7iUHyoprQMAqM7pzgoqPqn0109rYuj/PErcJs9vsqCloKxEslw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHLT0vzYzbjV for ; Wed, 19 Nov 2025 10:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c336 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:10:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 906934ac391c - stable/14 - rtlbtfw(8): Fix a typo in an error message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 906934ac391c815f0cd23406545c15ba5c79ea6d Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:10:57 +0000 Message-Id: <691d97b1.3c336.289fd212@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=906934ac391c815f0cd23406545c15ba5c79ea6d commit 906934ac391c815f0cd23406545c15ba5c79ea6d Author: Gordon Bergling AuthorDate: 2025-10-26 15:26:21 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:10:44 +0000 rtlbtfw(8): Fix a typo in an error message - s/Parseing/Parsing/ (cherry picked from commit 39d43543b306ac686aa684303ae972c386ccea12) --- usr.sbin/bluetooth/rtlbtfw/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bluetooth/rtlbtfw/main.c b/usr.sbin/bluetooth/rtlbtfw/main.c index e87a98036265..13551fe47900 100644 --- a/usr.sbin/bluetooth/rtlbtfw/main.c +++ b/usr.sbin/bluetooth/rtlbtfw/main.c @@ -482,7 +482,7 @@ main(int argc, char *argv[]) } else r = rtlbt_parse_fwfile_v1(&fw, rom_version); if (r < 0) { - rtlbt_err("Parseing firmware file failed"); + rtlbt_err("Parsing firmware file failed"); goto shutdown; } From nobody Wed Nov 19 10:11:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHM83ccQz6HSV4 for ; Wed, 19 Nov 2025 10:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHM80njpz3FMy for ; Wed, 19 Nov 2025 10:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hgBX3O6Ox4WM9gxdmc4FQEutwqeXk5eJHHd9Zj0GL7A=; b=k4kOmsscpaw2dPSWnQ7Jh13SA/LgjXOd2CY4mYg7MzxE09wEFE1ntUAnojSR+bB/Rtp5Te liQqm+wAxgMKdVff9QUJnd4O+JMrOdPMMQr/0tKRbotGR9bcfgwCnL5yqfG+AWxvFZKPWT Cz9wHP98vm+KPon6IVhk+lHzv83DqgwzKFuxiszOTwRdlnX1lYMjO2iYAwAMpo676UQR88 l0Y+6ZYS4aSwxcgbOq9gDg6esRAK/Xh5HE28++UA663VIq6RQB/QdUemSZqATFO1eV228L af0fQ/62Lp86DnHEt1BIU+0idaGptafUpkPvm9Ua88QjYZMszHkYeMNSxB4juQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hgBX3O6Ox4WM9gxdmc4FQEutwqeXk5eJHHd9Zj0GL7A=; b=hzVtT0G4FvVWR06C4ZWJ40ixZxNz/TPCDn1db0KFdGDsr4t/Jhhb2J2NTGvqAmVfEN0EIz YyVRbYtE6FPVyinkq7Z/IZ/K8diw4OTAKbKlZpqtosx/4Y+5yzm9bZ/hhXt+uTXOUEbJZG tvQPE55ErZGs0lZVBD7p5wbNHenGbb0LeqNJC2+Sj71YxysXW0B+p149hcqpws0dffSwVm 6lH4Qq8avrDPdl/uu8xwzuO0eeHResw1gqoc3NhY3Q6HpbAv2136ENJgSAF1ZuX64MQ874 RxR+G19Z3rge1xLED04aaQiIPI8TQYd4sAvgwS1otxG/FhP1IOO7beBK7uAI/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547092; a=rsa-sha256; cv=none; b=vSjIOCdkLgTOa20vwUh16hrwIJu5tDlp88yTGKZIZ2/Glu+PL5o1jVopgdHQfz/KQNovlO M7XiSv+eyoNAiwzK8k9imhx+2sQl36hxjgIcQCErZe+SO+nBnucfVI7mTazXXpKgSfRybV 7NED8doATKx+lOUeETbjEs3TTlzIJIbN4jtp/kjwOrvrTaK9ehbhsApp1XuzUTSR95tkDz AzajDdFYbu2Oy/EOEgmD0rjPnT3mVI/fCgV1dt8+vyrLX4Y2COJA8/8yj2F3v8Up8PT/JH p7BnbPHeVWFykosX7yb2DhP0iqajil2M4tM+11XrE5rJlgtYo3h023J9a9ucGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHM80PTZzc0m for ; Wed, 19 Nov 2025 10:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d193 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:11:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e39f64a7a3eb - stable/14 - pmcstat(8): Fix a typo in an error message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e39f64a7a3ebb39e47b62c84ebd5c8e40d08b99d Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:11:32 +0000 Message-Id: <691d97d4.3d193.58c5faeb@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e39f64a7a3ebb39e47b62c84ebd5c8e40d08b99d commit e39f64a7a3ebb39e47b62c84ebd5c8e40d08b99d Author: Gordon Bergling AuthorDate: 2025-10-26 15:29:08 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:11:21 +0000 pmcstat(8): Fix a typo in an error message - s/evalation/evaluation/ (cherry picked from commit 780a50c729c7bc0ac1750947223feadd918b17e8) --- usr.sbin/pmcstat/pmcstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c index c36cee436e55..49a0e0ce1046 100644 --- a/usr.sbin/pmcstat/pmcstat.c +++ b/usr.sbin/pmcstat/pmcstat.c @@ -216,7 +216,7 @@ pmcstat_find_targets(const char *spec) SLIST_INSERT_HEAD(&args.pa_targets, pt, pt_next); } else if (rv != REG_NOMATCH) { regerror(rv, ®, errbuf, sizeof(errbuf)); - errx(EX_SOFTWARE, "ERROR: Regex evalation failed: %s", + errx(EX_SOFTWARE, "ERROR: Regex evaluation failed: %s", errbuf); } } From nobody Wed Nov 19 10:12:24 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHN86C9Rz6HSmY for ; Wed, 19 Nov 2025 10:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHN83Zk5z3G6H for ; Wed, 19 Nov 2025 10:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bHbqKJ310i3eaCro5tk7aqZrs8i2IMRbxxFqIeORiM=; b=Dc/iVBsg1vlxE7GSW3ItLU5qF4LzrsSLmFpNOox1LUKGPI+WrmdDsxNB+mmmaVTIVEUsKQ +OfytgD6PvA3FJ3JJ8l3fAbbvFe/0Y8Gwfj78qs/ocsXfqBRxavjxDunOIqs9oeSErvZWy w3X1Bt8QM0DhJVMCrb+6DarR7aG78qzuNe5p7jmGBjPlGW5cGyl1VGPXg6n8XCSbFz3tBa iOzaMmp/3Zze6H4vI+ZfPs9A4IlfYRS1hJ+LuzdrJhkO1T4GGAYwReGvAzzTIDhAGgF7Zt 75JOEcBzZep+2ldM0zonpRDWy/NNNxcxXRWW1pC2+YFiC7d8DbuFIkNzqyMcMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bHbqKJ310i3eaCro5tk7aqZrs8i2IMRbxxFqIeORiM=; b=w/wwz4IpDSoOkMPXKnAxuvVRloHgEylAxIrPymdjNH1qZ5n0TqLftw+txtTXEkl/b/AGyP p+sVgdxFiTRMZpToGdC6xHqG4W+6UTD9TM6uy2Btq5QoZLwMPcHalzQWzs0+cWvtP3MW3t HK2xZ3CH6sxzNa8YwsqJKlzgx9h02vM5YijSMHuceQ955MxkVpr9TuGZtraDgkWYzVjTWU LCatqkV3y/N1BglKV+efEwkTJ8odKQHBFjRZuIHzoTIDsq8y/xglH++pstlyY/hOqFlnq6 K0Xj5uCcTVI5T2tIy7N7nUcz6kCld8uEYXLBgWD7KTYfbCY2LnItieqOz6KGBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547144; a=rsa-sha256; cv=none; b=ZYPJ+p3B+CvrNZiYc3rNDtJo2C5sVZMS92EW1Ubu1Rzigxpz1mBOgE18GA6Fh0R/E3PVT2 rTdaRE2S2UxOwNE/POhl8FoVxAB1cxQIHEs+k2KgK9K4Y3v1s8UZgBrjS1lSQNNcDOsJp/ kqx1jBu60KS1tgLM4Wjw8Bp6apsKx4der5GaVT6eG3X0Wo0MlmVnrEL6aK5PvFrduEzLkA 0yujAkMYKoekdUBJFItRZbDkolLOj+FpF7lTAkeNZSJOHyBp/oasW4/jvI5tznwE38fCf+ 3HL3i8pdveMBNx7q7dz/5Q8VePaGLA4EAVi1By1aY1xSSGp93mkq4EP+pXXiAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHN837m5zcQY for ; Wed, 19 Nov 2025 10:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ad57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:12:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d4ada3b1f8d5 - stable/14 - fwcontrol(8): Fix a typo in a message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d4ada3b1f8d59835284635f470656f029bdc4345 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:12:24 +0000 Message-Id: <691d9808.3ad57.59229e4e@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d4ada3b1f8d59835284635f470656f029bdc4345 commit d4ada3b1f8d59835284635f470656f029bdc4345 Author: Gordon Bergling AuthorDate: 2025-10-26 15:30:48 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:12:13 +0000 fwcontrol(8): Fix a typo in a message - s/verndor/vendor/ (cherry picked from commit 56a72214a35965197932b6366ffad0fe1e3fc398) --- usr.sbin/fwcontrol/fwcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c index ce908341a42a..195697475973 100644 --- a/usr.sbin/fwcontrol/fwcontrol.c +++ b/usr.sbin/fwcontrol/fwcontrol.c @@ -440,7 +440,7 @@ show_crom(u_int32_t *crom_buf) if (hdr->info_len == 1) { /* minimum ROM */ reg = (struct csrreg *)hdr; - printf("verndor ID: 0x%06x\n", reg->val); + printf("vendor ID: 0x%06x\n", reg->val); return; } printf("info_len=%d crc_len=%d crc=0x%04x", From nobody Wed Nov 19 10:12:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHNq0SgKz6HT68 for ; Wed, 19 Nov 2025 10:12:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHNp6rMWz3GNM for ; Wed, 19 Nov 2025 10:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCat4Uec1lmtV5+IeHzPwuyDb0n8i5xi3g6peBK/WHM=; b=QlmdmS8BrMzTiQGZCtXL299IDocD3hdeGN2zjY5nA/2foORBycvewfORDBOztFXglZxz+v y2I1PocI4hrfKc/sUW9D16eFsKtunJjSWqdBTDAeHy8yXroxVNsQ0kwnuNqx4X34tnWkJQ 2kLGXSvXnWIFO5beOjh4TQR0FcfW3DbnKKsstQxiIVLS/6bV+b4kCXDm+oci8YXBSyROJn FA8wCpjBiB/rwkemN8dIBJfNSnTVjO6aJ+BJSGUP7CZ0IEovtjC8AGUrSyGoTZ4OSCjMxi tzSXo3YNoOEgex2iXmz7tV7f9CPH89VLp5hb38eFXABmpjsw8fe94JiED9DQPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hCat4Uec1lmtV5+IeHzPwuyDb0n8i5xi3g6peBK/WHM=; b=NpwjANOIVXhPXQosu8sbkRaSgGY357mr43ScvaAZw0uCozHD7NarHC5Z7VZLUJR8CIYw5j gcdl5KpWBh6jvKkl2p9gJiJbhF7ZiVKHqKBX6940Z4Kp7M1JSjlL6IJ5wgRbelhSxehdDv 2ZtLOICU2B3tdKciqWzM+mr303T3n7G0UxdO9F7g65YuWJT7oQ9p+AD91iyrqPdgtLLkPV SaFXcidXBqXKUSu/XdBMcyPfCThfjnihrQ03avTL6bIzvFNi1cKbe2rGQxdiSUXhnTNn4r hMAUtAd6BrATicz4Vjw1EEtWc1ta5KA+3WGQOc/LesjfkfVjZWXLNlgebVSZ/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547179; a=rsa-sha256; cv=none; b=xQ5xRZlCi/ENvXF4iavjhYhnx878bh3XeIFvGStsOwaJ7o7wBVHoHVZl2+2e0RewNePMpQ KcDGCh0GArC5/t/pSnmSvVT728EuwwfPEMswykJPVlDDnR1Uordw1ahtisg621TGTVoIuL YHMceTWvN7HYZt3qEs21mFqBfkyvuJP8VN6sWqFJn+FH84AQRBWlhCgjHBC2W7c8QRQ2mf qZPm9Tdmblu9/+sev03B+MtOhYb2avxa5s4l9baMdlBfSmK2fRNMdTH0A2SQB5zYW6WJdo bq04VGdpj8v9yLWIf7w/QFHFg0bIh/KoF4pR4tHtdC7p0y17Soi9so2iSVeRmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHNp6Q27zc1B for ; Wed, 19 Nov 2025 10:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d197 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:12:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9eae326a58eb - stable/14 - PCI_IOV_ADD_VF.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9eae326a58ebfcd30f44f6e2cf88bb0efd02fd7e Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:12:58 +0000 Message-Id: <691d982a.3d197.597a9b49@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9eae326a58ebfcd30f44f6e2cf88bb0efd02fd7e commit 9eae326a58ebfcd30f44f6e2cf88bb0efd02fd7e Author: Gordon Bergling AuthorDate: 2025-10-26 15:34:56 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:12:49 +0000 PCI_IOV_ADD_VF.9: Fix a typo in the manual page - s/initializating/initializing/ (cherry picked from commit d81fe0b206325b40e13625f5684ec8d19fdccf04) --- share/man/man9/PCI_IOV_ADD_VF.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/PCI_IOV_ADD_VF.9 b/share/man/man9/PCI_IOV_ADD_VF.9 index d13cb6e1ddc9..97acac0e9df3 100644 --- a/share/man/man9/PCI_IOV_ADD_VF.9 +++ b/share/man/man9/PCI_IOV_ADD_VF.9 @@ -41,7 +41,7 @@ The .Fn PCI_IOV_ADD_VF method is called by the PCI Single-Root I/O Virtualization .Pq SR-IOV -infrastructure when it is initializating a new Virtual Function (VF) as a child +infrastructure when it is initializing a new Virtual Function (VF) as a child of the given Physical Function (PF) device. This method will not be called until a successful call to .Xr PCI_IOV_INIT 9 From nobody Wed Nov 19 10:13:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHPw2dkJz6HSyv for ; Wed, 19 Nov 2025 10:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHPw1pLQz3GcX for ; Wed, 19 Nov 2025 10:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XHTvMj8x/R5MV45goupM5KhgzUG0phLKddGLZKN2TlQ=; b=BNmx0njE++E0Nl3Iqf2OMNN6mSCqreZoZim8KByse+sjS1zBaZdqOdj/MKdlN1SW0k3WGg nKSURE2/ey2Ewh3JGqzf/fa9Wu2maN1cHXHkmpGW8UATgbb+aq3lje+Y3yKyoh6mAjT2m2 /1lTIIVWWDOf3yJkDhtPCFxXHCmxkOZeGfoq2ynhMUi9Yyv/e0X0w3MQD98HztvZ5MnV1N L+kZLnnZC49Rd3fMTXu64z1j25vl+crK4xfcPJRqu3dKfxiwbKTsg8xXTLhlAvndJblA+J 5fMlnAbtzpJDxR5yp1feCvZVZ3b9hdpyNgR6j+A7tIrDdU0Z3MtC4fdpOwyT+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XHTvMj8x/R5MV45goupM5KhgzUG0phLKddGLZKN2TlQ=; b=gSH4njQr4pDiWH/4VTar6oeBhDxZZppaHhQqwT57I/ZdMsxZGSU8mRMozG/h+CaUzRtOjp SCBXPN5gtWv+cHotc1QfUbVSmKzSQ+nK9dKu7FPxCgNfS7Qn5D0+kXgdfGNAkL1SNgQ5wq 5l8ZU8XEF2rpijDyZSoa4+SlINoUNDEZundicwlMUIveVwJLk6FNpgKWBAM1IRoddbfNXz Zx/AkqdtGv9TUv/SkdzLVBBKrkdCIee0fs9/VLO/wF4A7tkT9hLGex9y6wPvjG7EwNXSFZ Mw4tiXwYI36QyJIi4tgk66qVRJE3Pf1Ms0YUyqQ1pTx+zsw5xlx5R8VNFv7P0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547236; a=rsa-sha256; cv=none; b=In+5tHNYvJrUEnchuERrbmcXMjDkO+aOm4QdaqI2vNOsUstJQoGAlfdaqXTeN3/PGEl5B/ pRidncFKvatDX71yvsp+pZiV3FwlRBVyBAnFc5SA1U53Up2kji8TI2Jl3fCyKcHkYK4knh kEolQIJW9ezGf4HdUeXR3wI5dbjUAXE6RuLeHQHHuTO+dO0Zp2+i136Kbij0wg9TxBY6aq tjba069X4MrMgQ4ovpLC5rtJDwVBgWOSc+sEYFmW3DQN3ZZnfoOIlfvhRkMM7Q2rf82g+p MSG+UC31gLbZc6VM6vuMByz9uoeZdzIeuhHbK+hfBHtwTRZmcGoNE1NJBnwQjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHPw1PRKzcjQ for ; Wed, 19 Nov 2025 10:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0e7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:13:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: af45b1efc9b5 - stable/14 - atomic.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: af45b1efc9b55ddf1a623b94b81d09b4bdac3b05 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:13:56 +0000 Message-Id: <691d9864.3b0e7.49abeac3@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=af45b1efc9b55ddf1a623b94b81d09b4bdac3b05 commit af45b1efc9b55ddf1a623b94b81d09b4bdac3b05 Author: Gordon Bergling AuthorDate: 2025-10-26 15:35:50 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:13:46 +0000 atomic.9: Fix a typo in the manual page - s/constrast/contrast/ (cherry picked from commit 2f263badccf842470323b64613eccb0c0b9a12c1) --- share/man/man9/atomic.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9 index af94b5773f0e..b027a0ff0bca 100644 --- a/share/man/man9/atomic.9 +++ b/share/man/man9/atomic.9 @@ -306,7 +306,7 @@ In C11, a release fence by one thread synchronizes with an acquire fence by another thread when an atomic load that is prior to the acquire fence (by program order) reads the value written by an atomic store that is subsequent to the release fence. -In constrast, in +In contrast, in .Fx , because of the atomicity of ordinary, naturally aligned loads and stores, fences can also be synchronized by ordinary loads From nobody Wed Nov 19 10:14:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHQV1GSNz6HT1m for ; Wed, 19 Nov 2025 10:14:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHQT5gKGz3H3S for ; Wed, 19 Nov 2025 10:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ko5vNYB7i1h1DqZnZaJDE28lODulO81+Ybx9HbfVyzw=; b=IsOcyhaBzGEX1zfmgedUMbT0fOxnkbkSgIiVi5B/oZvjVjWvpHUARZKKVzxCOdY+fsSq3W gmh15ShJEUkO1oZhwKK+yX9Sj6xjzI9o7fraiF97n4hLP59r+M2j5FyzP3OzOeYo2k9Il6 DSy0SA/PaUn+du2kMX+JCAnVaeeCgJSAIpNgi6cykccNhawguSW/WKAblcqahHR3JM90hl P4Ug98om9p96pbr+Z7+t7NZecmc+Ms/BUNjyPleU5U/MAJaUub9Ewd+Hi+5LGIAiD4ax7x Z7/6+3yyxanLqVXf+8isnwR+NWUx3vUBlznuKgMXW3W7H6Rlu7KNgCn06tzjqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ko5vNYB7i1h1DqZnZaJDE28lODulO81+Ybx9HbfVyzw=; b=wOuuinrbc5dGwTpSjA82Jj3OR3x+oS+lc6LpjOCuI/uUDaM0jZ5xTIyVyNsgZbP8F4KhBn LIaMftezyYaSedTfcxFuItJPkoivek8IR9ZDg6Xje+J/kWtalDjb9/PNw7kmDErFV8TATo Jnol8IelsuZwX8r5ktGj1XYupq43ZhPEjFhKhK9dCSCZYzg7LIoFni9SW42zU9p23kMjx1 8DAq4ceMSrem+Ewr+/DCqvUBygSmseN/hubXuhoXZYdrBczl//j1uqhZ4Vtnxl9Axw5YSt U4CVVr3G65hiDjSp3PYIpVZK3n6k8DgfNYxmlvsDuetw2/NVtzcEc+i+OgZMFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547265; a=rsa-sha256; cv=none; b=XCxTz3k1xP07ZaKQfIEwFos63J8HXWGZB0Ck2FpgyKFhjg8PFFVsIThT37s/+qL9hMTBEy 3dkfAIUFKGYkKy8YiYmZ6Pk5j8VL5KqHOeTNs07IBTiOoYht41SlJPy4GMALbkEDvB4Exx Tw7fTPNLVbQxfz2JjpKwcFPR0uNjMjfF6F+dOMR9ABlG7D7WfAtGqk+BQIWTsbTXAxPWBQ xZRyc3yUfe7WhyGEzbBUKaDxCDNbOtJDU+1J06J+lJCN43C8NJn1SnamOh/u6kfAFqMAf6 sACuVZ31kO5j/ZiM5QAFpChLWljUbJYz+VjkLq95abIEu6LU6t2bX42xo739RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHQT58xMzcN7 for ; Wed, 19 Nov 2025 10:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b047 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:14:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: b92d5b797f05 - stable/14 - bhnd.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b92d5b797f05e695fa33e86891ae1dab00cc05e1 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:14:25 +0000 Message-Id: <691d9881.3b047.dead555@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b92d5b797f05e695fa33e86891ae1dab00cc05e1 commit b92d5b797f05e695fa33e86891ae1dab00cc05e1 Author: Gordon Bergling AuthorDate: 2025-10-26 15:36:51 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:14:16 +0000 bhnd.9: Fix a typo in the manual page - s/devce/device/ (cherry picked from commit 3ceaf4d80401fab49895a5ac3bb1fe602f588da8) --- share/man/man9/bhnd.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/bhnd.9 b/share/man/man9/bhnd.9 index 722ae6b6a393..ed3007ea748d 100644 --- a/share/man/man9/bhnd.9 +++ b/share/man/man9/bhnd.9 @@ -2350,7 +2350,7 @@ function retains and returns a reference to the provider registered for .Fa service with the parent .Xr bhnd 4 -bus of devce +bus of device .Fa dev , if available. On success, the caller is responsible for releasing this provider reference From nobody Wed Nov 19 10:15:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHRJ5gPlz6HT09 for ; Wed, 19 Nov 2025 10:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHRJ4Rpnz3HBw for ; Wed, 19 Nov 2025 10:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+R8LgkOoWME8HDNNdaa3cKDWlwC/LTbGoGhBf+0GZ4Q=; b=jJo4rLpcK1OSy3H4RLHAHdpx6ckOgHp26HJ8mdOfs7ghG2wozIQ6IcNdHxLANmkf1Z1qa+ t0T6aIwFchF/+wV4b6h1CvN8BE4k4kYLQUc45DnnL2D9mZqxf070U1xD7bUqHFNVtIuxJ1 X7AbCH+9Fa5JXS3avwS/PlIIC/QTG4e4VFwpQO4uN9qMncWViHjKpakE0FcuPIlHOvcBJc GHPAiW6dAkD8/FUOKTbTFXdHgS7HotIoVqv5a+SHPKktVfAmvB7BUSYBjiqzysN97cySAo loXq8Xq7+7/5ykuOQxGSWaN2/NJ+Oky6EVu6FYt76w0zT/vtJxX7zMlv0Ysnpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+R8LgkOoWME8HDNNdaa3cKDWlwC/LTbGoGhBf+0GZ4Q=; b=xt9eBCe4dQAZM+FUUSZIOhQ8t0bxcPOc/q8HkgJvUjyYYBQNyZx0Okpr6kqNUcN+f1LSGL e24pTo5iTy83sjP35hdz1C3gdYWfBeXeNmAyXLCQdpYtAkg1L5kijvT/AC//NeGXeav5w5 qnTgpEZqFg84p0SKE6z4JgVIHs13/vMptJMW7NrFml0gfbJvip8D1tHuEMMh2+atuZ+fk4 J4MUrAhkOgeiUkO6U9m4DRebDRRfoZHH/T75EvEMPQqHXcHjoEoQiaqzAGrMKuOa8jifD7 tg8jQETCz/YOdUB9oh7zB2+udDYzojmeRWSkC+fNo/T6j5r/jCafMq83zLMvpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547308; a=rsa-sha256; cv=none; b=YMZGgqHwgGpnahYrXrIJQJIKsoV3beAiHTWr7aq6O1UGdDYDUr3G9tK7JRO73mvBNnqq9t cOsyeMJ+NBmSnEpHhXeENuRI6rFIuXlIvKCY7G4r6iLJ/B0r09o+KLbeE4z2bRb1B69S/Q 8T3/Gt1enqw+7Mpd7vUBGQ0JKE/ELrfTTqZ/DXu0aefIDfDK7PtP1fxkGhTj+F/+vy2qbb 8KmJILjCYff4XXifM9QrvGYd1FldhT3oX2IskNPFsJCQ+Zs+HNlS5xumXextfob4dDJGBm GKCnk/pTl2/Qx0QVJascXPaWC9isppooFlPejR2DoXPeMKEpvVYbzb2Ta5agrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHRJ3wLXzcTB for ; Wed, 19 Nov 2025 10:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c0d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:15:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 4539d9f3b473 - stable/14 - bus_dma.9: Fix two typos in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4539d9f3b4731d489f5018ef9dec627683aea33d Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:15:08 +0000 Message-Id: <691d98ac.3c0d8.f969b5d@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4539d9f3b4731d489f5018ef9dec627683aea33d commit 4539d9f3b4731d489f5018ef9dec627683aea33d Author: Gordon Bergling AuthorDate: 2025-10-26 15:38:29 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:14:58 +0000 bus_dma.9: Fix two typos in the manual page - s/decribes/describes/ - s/Muliple/Multiple/ (cherry picked from commit 5215760811a5ce75d77f9017e392445014e6b1bb) --- share/man/man9/bus_dma.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/bus_dma.9 b/share/man/man9/bus_dma.9 index 832ddb4daa22..922365d1f772 100644 --- a/share/man/man9/bus_dma.9 +++ b/share/man/man9/bus_dma.9 @@ -197,7 +197,7 @@ in addition to restrictions that differ between unrelated groups of transactions, the driver can first create a .Dq parent -tag that decribes the common restrictions. +tag that describes the common restrictions. The per-group tags can then inherit these restrictions from this .Dq parent tag rather than having to list them explicitly when creating the per-group tags. @@ -741,7 +741,7 @@ Fills in the selected fields of the template with a variable number of key-value parameters. The macros listed below take an argument of the specified type and encapsulate it into a key-value structure that is directly usable as a parameter argument. -Muliple parameters may be provided at once. +Multiple parameters may be provided at once. .Bd -literal BD_PARENT() void * BD_ALIGNMENT() uintmax_t From nobody Wed Nov 19 10:15:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHRv0vjxz6HTC2 for ; Wed, 19 Nov 2025 10:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHRv06Lrz3HZd for ; Wed, 19 Nov 2025 10:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K4bl2w0QpFtmrP+wEfHgNWRUDpPvQv864j/ZBcQAAVE=; b=EvJr6C6N7eYToxI8lYZ+zP1PO7tjIonYNN0n+dGlPR8D1B7AdsMvz+yAz1MwhoEpcxZNEf 8MDR/XIxWrNri1thXU8FWPMCmVGigOIsI+T7C6+PmfntkSdYoBDLoJdCY6vgBhPjovb21Z XOfpUmUYQgHw7+HcDauC7hrAGSoKRdjC4a/iWYBkl527yC5saj0s0OUh1Opf8TF4Wzt/go mwcPjb/D8j4WOyfa8JYbPVawpw11eTLWjL+z8mqoCKxw5bOPrwAFOMPeHEYr6y+qW7woLz C9VfYX+nvQtipGOWiz8819xJ0JnrBtmHp21WC1eOk4Ee9T+T0ygip4u38a7DXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K4bl2w0QpFtmrP+wEfHgNWRUDpPvQv864j/ZBcQAAVE=; b=VoRxdB+sw9R2fADb1MeRQxibSluidcE4/kNJHS66kytfrot6L0GplmhecCE9jbKZGjA1gB ++JYTl/HXNXDl9fvH/y1dyPryOBKrOFZ5ZXVe1ieh4bv0UH3Fx+NB9RF1Bj7YdJrcRPaMb 0Q+k+2WZXBgcW5p7mdOg7/gqPTNoCUds46WjdadKNQ1I9Y44SP3/a+dVOEMCf9pbNSpuQZ pWZdTjOKjvWmK/izk4iRLALFmXo6gD73OPeeoStQtF7uPcqHGUt7gII8O6yhzCr/sS/O3C rMX0e1GO2GYbCrImr+A9HWJOIOQCgj5KUCsefobeJrNMuCC/miUIOiywgwxSIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547339; a=rsa-sha256; cv=none; b=Ko6hppCMJ3w9VLTPJaJabtK8lo5rq6s27nIE1Um2GXRmXKK4uiX4rKUJolH/z6LFJf5OGn 9CoSrT8M0AAHK9uLljo9xJ6i7ma1Hd2Hea0QFZ/Pi5zrXkvy4cWhZSumzHzgy9M0G56nxy QESwPIhUR0U1/TLoOwhcLkxaqxuIPl7t8g2VuqSOrVsQ+hODQfDBBaTPNePZoHUpG6Smf7 0l1jK6rhm72xv5l53dWRL5hcn9RLuybq9WPYxyQWmkyDZqEcP+fRTxucL0Wf6cueyOrerw GdN6lnh2tFUDFRkVNSeukeT3LxppOetRFIB8bFH4yRAm757A1CkdM4GXNZILZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHRt6qMJzc1D for ; Wed, 19 Nov 2025 10:15:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d377 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:15:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 29f2f316a179 - stable/14 - crypto_request.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 29f2f316a179cf6c4c7bd9b45b6637bea05c67b1 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:15:38 +0000 Message-Id: <691d98ca.3d377.55d33a80@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=29f2f316a179cf6c4c7bd9b45b6637bea05c67b1 commit 29f2f316a179cf6c4c7bd9b45b6637bea05c67b1 Author: Gordon Bergling AuthorDate: 2025-10-26 15:40:47 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:15:28 +0000 crypto_request.9: Fix a typo in the manual page - s/througput/throughput/ (cherry picked from commit a1e76a3af8d64b400100d8ab595eeb32cd79d358) --- share/man/man9/crypto_request.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/crypto_request.9 b/share/man/man9/crypto_request.9 index 45c3b62eea26..0cbcd1c01c50 100644 --- a/share/man/man9/crypto_request.9 +++ b/share/man/man9/crypto_request.9 @@ -383,7 +383,7 @@ depending on whether the driver is implemented by software or hardware. dispatches the request asynchronously. If the driver is inherently synchronous, the request is queued to a taskqueue backed by a pool of worker threads. -This can increase througput by allowing requests from a single producer to be +This can increase throughput by allowing requests from a single producer to be processed in parallel. By default the pool is sized to provide one thread for each CPU. Worker threads dequeue requests and pass them to the driver asynchronously. From nobody Wed Nov 19 10:16:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHST0Fk6z6HTC7 for ; Wed, 19 Nov 2025 10:16:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHSS6Xbzz3Hcn for ; Wed, 19 Nov 2025 10:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5PXIfjHbDua6B9Bl/j3esiNb5G0DK1ooE152YmJ1Sew=; b=kh5z2qNZNqvpbBds6QptNMfL7P9qpQSxs+ybhh1hKSACgUrjDlk8IzhGDtgNubucbHv/+J ym0vrNraQpBlUcdlVPmfzRWwxm8RkArivJOKu/X1O3OlD155Q6UDHyGsbK5T3MIcWXJzxb zPy1ENU4gT9VGNRqr2es/4SZRp5k6+Yw6DvD3kE1vPVVKrDRgw/oFxgSIVNkQuZaLeZh1m mR6tPJgAno1l6HGnLq9iVTcukstbvhS0SzMt6KEVIy3kWUXhzEDTJ+soj55RHeIBYmXY/i 4a7Z9gfVk32OGx2ZlDSVF03LXaM9KsYF35EvhccUgULDJyihrpsCGESNcrCEBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5PXIfjHbDua6B9Bl/j3esiNb5G0DK1ooE152YmJ1Sew=; b=E+KSq3vpo+4Y5pyhw/t7kLvz6P6hl4IxdEzN8sSBEGjkr/uX5ZA9EYPSQAS+nyEloD6yJt TvnBzKVKK/i7+ajcuzAJvw42NDXMoADePE4GhHigxt1zYvqu2D6/v7/c0QcLXE/9Bh7rRO zj6vjQ6DOkDD4C6AOSIGHYQ3JX8TdZAglwmGZU4d8iu4G4FaDls9bfirrRFvVrhq0/CyP2 X45aFpAlxPbY7URleoGMcQipUY0r6qM8UOuNeveRR4dtVDDjT3XHcOkbJeuTmWDYg0iCDx HbS4gKtuuvbmCsw5LorhsWf31Ps6GRIeXtv302SjP9Z8/8tQw4BQdajhDQe4iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547369; a=rsa-sha256; cv=none; b=wSryJ+PPsfeZYYt19WHnkdRrzAhllZfjwjRq8q0crN6xyTp4pAaWK9nWnz0wzvfOh2XeVj i/BC7yYyqsfvbdF8NWQGrxP3tUXpDJ/g0Xdsxc7sjKjL5Cn0OrLnlP1vSYcvoiTSUbGtwM Lsj1BkU2dq0QSPKTqq0hglYtgXwgqx0k5ZaHHKkZaJbS01+O8sAnw3w1GCSd4ayaivnM99 cdO1kmI/J8wjlEZCWB30/OSCO7Pp00rA2eEoApEQVtvJmW4agRzqcOeK6iHujQFvK2OhFY jxj6Z77v4Fo+pas1YOkM8T3Vf57wXpJpVxghG0c6pV4LDQR431mlaX6UOVclrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHSS66xZzcN9 for ; Wed, 19 Nov 2025 10:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3af7f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:16:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fef3a18a0b55 - stable/14 - domain.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fef3a18a0b55d62d0a6e0411e0bcef7724bc5847 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:16:08 +0000 Message-Id: <691d98e8.3af7f.6a5c02ab@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fef3a18a0b55d62d0a6e0411e0bcef7724bc5847 commit fef3a18a0b55d62d0a6e0411e0bcef7724bc5847 Author: Gordon Bergling AuthorDate: 2025-10-26 15:41:37 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:15:57 +0000 domain.9: Fix a typo in the manual page - s/exprimental/experimental/ (cherry picked from commit e17c87d4a27509ed8324e69056b06dec878db064) --- share/man/man9/domain.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9 index dab8cff89e12..d7e743eaf247 100644 --- a/share/man/man9/domain.9 +++ b/share/man/man9/domain.9 @@ -173,7 +173,7 @@ Once a domain is added it cannot be completely unloaded. This is because there is no reference counting system in place to determine if there are any active references from sockets within that domain. -However, the exprimental +However, the experimental .Fn domain_remove exists, and unloadable domains may be supported in the future. .Pp From nobody Wed Nov 19 10:17:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHV75jv4z6HTM7 for ; Wed, 19 Nov 2025 10:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHV72WXhz3JLX for ; Wed, 19 Nov 2025 10:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFGl71EVgTD5zsYlkTdGRv1/9Q3gNJurIaKXwg2/yJU=; b=HFAe1CK1HqCNIp/up+suBV60OEjqBa4iTtWXlKxmd8bedt3Qe4Rf2JqB0hpPOJa6PQLXxs HX2vCzp5zWizMf/T/WPkRU+k+ZX6gFYlijNp6V8f2+dOPaF8kNBNTQRO5MlpfnIFs13tfP scm4jBrHTO8BUJGP3+UE8AVewCh0Xr8eeFmDISAwik3zpzB906uOSb8RP/lnM+UdBdeX78 aeNcWVggXbP0mM90EbFb5iKlPJpoc8HpSy/VYxz7ef2Lq48/UJxXffOkQ1+9n1wfTGWALu WOKJ2OcAxVCM8tTLWJL0/m9LpSjRPbxp6KtDv6ajoZpp97ZgKW3zidJtQFOsXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFGl71EVgTD5zsYlkTdGRv1/9Q3gNJurIaKXwg2/yJU=; b=NQ/ZVR+2YpSryO80twSltjmpYnnHY7c5g0P4TNHWWcGY8BWUK/1tC9wAW65nYuR+4gHBYY zJWI+BDkXMCN17TEbrIq8AdLWnerZx0a7G+0jb3wKc0ewJwT2ypJwz0BDUYcsnqiLVEGkr Q+kh3MVfnryACfWpYnv2pUt+iSlRpdIhay1ZOqvmDSq3eYojo+BF08+bIfyoQhA4hFC1xk PweXW7poigHXViTirMcds391aeX0sI77UF+wWH/geNq/WpZU2xZV6sP1BxmrsaPZ3Lh4lI vjHxO58pbV9sJaFPnVfKPeLVcn6xOvwCV8c9wLa1ZPnlW6O2W7UoUbEEPJOsvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547455; a=rsa-sha256; cv=none; b=ZfOeBgYE7Ug2iDnSapTwkMsJI+zplxknOnry+gjjgenx0SbrwLz7xujbiA+dtewCTd1tzv 0zdHxZa88CHYxj6/alSAc88beQHdDMo5BvxruKRJ742BLDbNC20WSIrNJhqT0CXpIev/Ec d4dXcn1YgmlNTUUoymKz2xnvFdrSfl4izsx8foprBteMibq+bcTs6oh3YFKtMwtJo8rCUZ f+DU1P9xSE2ZZyrqDEhPJdP3oLEbeS6gXcoLZ3dWpKyXtSW3LSNvgOeQzMYeN01YAqHEuV 2U8T1srWJevzGGfk+RXRhq8kFK+DMY26k9VWtqO2XT81ovLUubWnDxqp6v/HzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHV7230tzcjV for ; Wed, 19 Nov 2025 10:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ad5b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:17:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 3319c8d1e4de - stable/14 - gone_in.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3319c8d1e4decbec638e3437d7b347b5c93026bf Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:17:30 +0000 Message-Id: <691d993a.3ad5b.670b0627@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3319c8d1e4decbec638e3437d7b347b5c93026bf commit 3319c8d1e4decbec638e3437d7b347b5c93026bf Author: Gordon Bergling AuthorDate: 2025-10-26 15:44:30 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:17:18 +0000 gone_in.9: Fix a typo in the manual page - s/Initializaiton/Initialization/ (cherry picked from commit 576e735efb85cae5213621981ed33ced8878a352) --- share/man/man9/gone_in.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/gone_in.9 b/share/man/man9/gone_in.9 index 7521adfda204..ebdc1ab19bfa 100644 --- a/share/man/man9/gone_in.9 +++ b/share/man/man9/gone_in.9 @@ -1,6 +1,6 @@ .\" Copyright (c) 2021 The FreeBSD Foundation .\" -.\" This document was written by Ed Maste under sponsorhip from +.\" This document was written by Ed Maste under sponsorship from .\" The FreeBSD Foundation. .\" .\" Redistribution and use in source and binary forms, with or without @@ -72,7 +72,7 @@ Obsolete code will be removed soon: void sample_init(void) { - /* Initializaiton code omitted. */ + /* Initialization code omitted. */ gone_in(14, "Giant-locked filesystem"); } From nobody Wed Nov 19 10:18:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHW871xXz6HT6N for ; Wed, 19 Nov 2025 10:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHW86SNZz3JjY for ; Wed, 19 Nov 2025 10:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oP7w2vGMFHAe1kFfI+8TkygVEPb4gdaL8g2lyKSi9AA=; b=aV3emBgQiObafLJ6TjPHo4bxttDeiCZFEnZOCRq2GDIFwvo4PaF/kdAUT/+z4a5NMrmmnM mCRt+/9XVxPJcPbF4tSYnbLeMQRh7lw7ZtG/DZtJ5fYWl0wrBoT6G5EXgIT37P1kVikpaQ Zk3LTRkTkTSf1ZWnBE21KMosNT8H/WBF9UUts8IsF8WfnAha+1LbmHgIRubdwOgVNPyCcP OPiA4Eln1XuJzVoUB7oFF5yNBr9VXqP++957HnTdr11uCkIQbev6H4N7hBoMYa3jjQjkkd THZAhLRmlcFh8EyTVwwAE2F0FlJTWOlDLJwHNkf4s6uWS+syPlu2OYLIZuOqkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oP7w2vGMFHAe1kFfI+8TkygVEPb4gdaL8g2lyKSi9AA=; b=xKgmmQT3F4MJaP6f9gHk2ZNQkGTnq+KzpEymE1uZ4rM4ApdriYK6XGwEuEH9FUsgGCSnRf YtO2W1aqSvtSrgKnswXdNyy99d7QX+VLQD+ysbyfCamjPWMSB7/ciQLMLXP09B3b5Lin80 gQTsrMIS4aC5ziFaBMe0EMi7Yg6XxgPA/f7BR63fl9TSvbn5osL+Nw9/TxTMGhTxeVDnKW 3Y1/H4ki9lxvI9yBJaChR4kX+oB7DhIRng6ByIAp5brDihUxz0bfS6WoaKiXF4DMYeN1I5 rDMw1VrRdLfMyrQabFq5hdqp3e6xN3MmyYA5JR7+njipTB2DGfjDLcHPjEuZKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547508; a=rsa-sha256; cv=none; b=Oh1xkeIPEPKGtzcIOJxH44v5Rf84QxwHvgStg7ljtLcOZ8zuRmV/4ztGYVjwLTt0qQFQGq CdwfyeGNKN3FM/hnhLRyffdBXy41Tevo5j5ndWivUn+J+sc0Mx/ROl6xQRAO64X28c99cD +COOU7B7MTlURsfwU9kQjcC3CXZhxd4tXLk1UU2dWGboC+My+IsMQ4YXzmjIagNaW6Rba7 1l8UE8n/X9ZDx3u07DTpBcPfx7+NYtc46IORenlIsDIlDwykS/XV+39R3A7nwJzOELk79r QG6agib9Cj9Y2DCEI9qV7EZaLxAWdP8x6DC7k09zeUjUC7k5NvxLcYdvS9BVbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHW85rChzcjW for ; Wed, 19 Nov 2025 10:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bf49 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:18:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a05a924995ae - stable/14 - nvmem.9: Fix multiple typos in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a05a924995ae4bc98db31c2dfd6d96148cd96382 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:18:28 +0000 Message-Id: <691d9974.3bf49.5c6bd09b@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a05a924995ae4bc98db31c2dfd6d96148cd96382 commit a05a924995ae4bc98db31c2dfd6d96148cd96382 Author: Gordon Bergling AuthorDate: 2025-10-26 15:46:26 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:18:14 +0000 nvmem.9: Fix multiple typos in the manual page - s/sucess/success/ (cherry picked from commit 005603cd3dee7610587f1193f9529eb2a42781d7) --- share/man/man9/nvmem.9 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man9/nvmem.9 b/share/man/man9/nvmem.9 index 812cd09a5e35..fa88cbb91854 100644 --- a/share/man/man9/nvmem.9 +++ b/share/man/man9/nvmem.9 @@ -59,19 +59,19 @@ Get the size of the cell base on the reg property on the node. Return the size or ENOENT if the cell name wasn't found .It Fn nvmem_read_cell_by_name "phandle_t node" "const char *name" "void *cell" "size_t buflen" Get the cell content based on the name. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .It Fn nvmem_read_cell_by_idx "phandle_t node" "int idx" "void *cell" "size_t buflen" Get the cell content based on the id. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .It Fn nvmem_write_cell_by_name "phandle_t node" "const char *name" "void *cell" "size_t buflen" Write the cell content based on the name. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .It Fn nvmem_write_cell_by_idx "phandle_t node" "int idx" "void *cell" "size_t buflen" Write the cell content based on the id. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .El .Sh DEVICE METHODS From nobody Wed Nov 19 10:18:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHWk6s25z6HTP4 for ; Wed, 19 Nov 2025 10:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHWk6Dg3z3Jnk for ; Wed, 19 Nov 2025 10:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n1xwy/bqMwEH37sjK7wvMdYi7L7rWv9WBP3abPl6tJ0=; b=IBr5ILEqNtJTMxZwkwWEJDphmkUz8fnPnt2fSg2H6AAUQ9G7FN6X4MokilZ/LWDG43dSyO JYMRY6MlCEMRNqZXXjrFXpfYeor3lo70o0IbcaTxaj7OILBksRGxb46ao7X5LUZsnf/Ir9 dicgymjEw0abP49mDuBN5JJHni8xvluew73CqSYdM7KKkXNmMEBhCXd/2nxhWDOV2mZXxd 0CoKl4YdoXS4yiueHIJ4yUhZLOG7+bJpHdF+HjdKZn7yy7TItedNniWsoR3wgFV7qDl52l Rh15zRQAhds6QLiY5zC9WNK38DuA8oZ7TQh9yYM/4qnjcjTUz/Xo7xxIgKIBzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n1xwy/bqMwEH37sjK7wvMdYi7L7rWv9WBP3abPl6tJ0=; b=wm2lhWQ+pA3xH/iJkBhNR5yR45kvoueypHtvSKWj7kkVH58xnHPGawDgFwA40zAzJMrl9W mi8PgJqZUZaFkitbO47bdOe9W+zPM8Flu4HqRznKG5PkARKJ8rvY6sTC5uW5JMHRoPz9+T m8Q5UnjElcpQDlfTESSas50aPW9xk9F+IW6F4sLXVgLz9TjsWTgkRnaZFnKq4UdzkHAIf2 Nrj3UYFeOoJb1ITfIQ/1HU8L0BxVFRcYPvvrRMU/y8f6s+RH+nCrmrVmlOXLTpmnKn7cOd KewB6IELMespfeBZ5P/b2nmSrX9k+/O6XfFwvX4AfBfh0d0pbd97Mdc1FqMyGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547538; a=rsa-sha256; cv=none; b=b+obOLwhMPqHNtbxkAhfZWCy3Pzye6CNFfrStO1eH1AP0SSuTpnjZVAYZrs71BJqFFbGjY R8hu73l9fNL6g+subdzhNw7qiUCyZB6uGs7q/+9sluf5S2SsiK6T4o5smALC6jdF86t10e N1Q+9YTl1gM3XHc5Y8rKamR1TEEZes/mmreVQovypRc029kyMyzGEHCl+dqWPI2LQb+FWd RIKXetEGdwxOmgWnKw7EHznE7gRr8/ZzuFngk4gA2p1TINTYqLp9ivkhLYWnNnrDu8D9rX AZKepMoYnsj+NRWr4x2jGy/0z7aP4JZilCHoRTRehiYMEiDL8/nKhYu7mqvdYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHWk5Wd7zcQf for ; Wed, 19 Nov 2025 10:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b1fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:18:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: b20d8a0ba402 - stable/14 - ofw_bus_is_compatible.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b20d8a0ba40215569405f6f79131bb001623da98 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:18:58 +0000 Message-Id: <691d9992.3b1fb.5544ad18@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b20d8a0ba40215569405f6f79131bb001623da98 commit b20d8a0ba40215569405f6f79131bb001623da98 Author: Gordon Bergling AuthorDate: 2025-10-26 15:47:44 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:18:47 +0000 ofw_bus_is_compatible.9: Fix a typo in the manual page - s/compatibile/compatible/ (cherry picked from commit b1f96b1c4c95df5c04e067c638e52c9652f86721) --- share/man/man9/ofw_bus_is_compatible.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/ofw_bus_is_compatible.9 b/share/man/man9/ofw_bus_is_compatible.9 index 1b44807e84e8..fcfe8755cf86 100644 --- a/share/man/man9/ofw_bus_is_compatible.9 +++ b/share/man/man9/ofw_bus_is_compatible.9 @@ -61,7 +61,7 @@ older revisions of the driver. If hardware revision B is backward compatible with revision A device tree node can signal this compatibility by providing both "vndr,hrdwrA" and "vndr,hrdwrB" strings in -the "compatibile" property value. +the "compatible" property value. This way older driver can use features available only in revision A, and the new version of the driver can take advantage of revision B feature set. From nobody Wed Nov 19 10:19:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBHXH65l7z6HT6h for ; Wed, 19 Nov 2025 10:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBHXH5Sm5z3K3L for ; Wed, 19 Nov 2025 10:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Jp/x2Vw/rWpz6nFVeQSkUjEcTCyQeyRnUQjT/EOIpM=; b=sz1NuOiET51+lLy5/ABhDG6gkPhoDPGJ1DIzgR3NG82LEPh+UDieBKcSMINZoMq0TQs8tJ nZ+gXfydqZ1TNfKiRFfQG99aciX553sP+tW8Fc+gIcUDlV+WVrKbMuqePpxKEt43LGnm17 E1ijILnd07zwdwbnYsXlGRxFz4N4qh/kW0CQ5iJPY1byJoYSE+JEVOSZeFeAQbNc6X2f8e 7Np7zynCelG8UMHSpS1jMJy0igL3O3xG5Lsb754aekguYSJ9kr3dKSBrQ4k6l6SDpbCAqt +h2FdFqAVwZdaKqPJkMY60x6fnFDtMcfIeRpZ8oHrqICxIjjaH08RH5lgEq3kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763547567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Jp/x2Vw/rWpz6nFVeQSkUjEcTCyQeyRnUQjT/EOIpM=; b=Sd8y2CVZVdfsW5Dk+H8veIkCiBklk7bAKzK8ib21vSUIs/dgvA4c363PdoX+uqq9INa/EP eFgENPrwMs6hxM7/CzuqCBRyXJK8/lqzHj2hdmedIhSihJCWGhspXFTaMGzm4GiNLaargT zRtZQ5BPZC6u05BUDdnAmZsiqEftYaZ23Ie4s6EwZZgydh70X0Ak73054+DeQVXkSsLxZ1 MgrNHbTP/jH/EEI3slnmwm152ha2zI26CrgzgR+vEDI8kTokhrBQk9sk/x8pi+2PQXoN3V IjAFs6orZCdzBK0p4g+NJ4eHnUXrl/DJAT4nvEiLl7yR0d2NF2lnBJO3rfguRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763547567; a=rsa-sha256; cv=none; b=jGEsakl2OwpEN20GeqmMw/gJtujdkBu6D5u3Riad1fjM6Zd8ALDxsri+f6u1D3Qr2mpOVd u8WWm74N3inyeT89NDd8Oe/rCB6gCCaeKG9VNfyalGYaGOloQ/eqo+LeL4awwdUTul2JRl yY1gHNqqkNbMiEuP6+u62G27/CXAlfZynAofyH45BqXf+Znp6VFiYnEo5oanAVC/flY6MX kSo82lEAcKcN7x3Xk3a+FrfyFeRKf/TiEsWz/aOR8VT+050hL5cB0Nx3P3lAse9FpYlYWT 0Zu0I+BPL0kDRK1KD0gH/3DdFcLyLTuv/U4CVcOIkAb06cZV5ZIriUFzkT2V9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBHXH53PYzc1J for ; Wed, 19 Nov 2025 10:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c33a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:19:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c00ad4a56c78 - stable/14 - pci.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c00ad4a56c7861aae85db455854c3e786f496ff8 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:19:27 +0000 Message-Id: <691d99af.3c33a.794b2abc@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c00ad4a56c7861aae85db455854c3e786f496ff8 commit c00ad4a56c7861aae85db455854c3e786f496ff8 Author: Gordon Bergling AuthorDate: 2025-10-26 15:48:36 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 10:19:16 +0000 pci.9: Fix a typo in the manual page - s/maxmimum/maximum/ (cherry picked from commit a859a5c6978de121efc7771351d32550ee430b7c) --- share/man/man9/pci.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index 8f772e76ba99..b01b51683b4f 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -523,7 +523,7 @@ device is not a PCI-express device, returns zero. When completion timeouts are disabled for .Fa dev , -this function returns the maxmimum timeout that would be used if timeouts +this function returns the maximum timeout that would be used if timeouts were enabled. .Pp The From nobody Wed Nov 19 10:57:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJNc1QYSz6HWmp for ; Wed, 19 Nov 2025 10:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJNc0Jv7z3Nd6 for ; Wed, 19 Nov 2025 10:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4yJbTUBDDChmxQyQ01veeFrPrOZcIwtW9nUK27dCJQ=; b=T1hCv2Y2L7xhL+zlJJABR/YDGmZ8QSwg5xQAvwZNEtnGUcAjRfN1M9WlrG6SD2Ett0unxC ePjdB2ZF1yp/iCNGR1/tBc8AT6liiaefB/XF2WQR97ADIfW8t3Bx4uB0msCTCSYTqh0vb0 tyVK1Tj1MrXBtYBziHb7KtItSfS9p+H9o4dA8DQbVbrjsjpfBilm2KRt+Wu7GOF2+GmZdk dhuLm9iOtcd54vSKCnGr8m8C6VoeyAStWZaQl7AvEA1/PZZz+JkuA+fMQButYEYhywD3// bYI3FIySXW1aKiZtzmegHCdIVkj28N/BXLFdXdi7G22FhlsTyCSudHnMMQrYMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4yJbTUBDDChmxQyQ01veeFrPrOZcIwtW9nUK27dCJQ=; b=jzD0XLuv9vNZv1rwuwFKJ/1WW2IHzNzQ+EqLBLUfrQMtzoJuoWx9XXmmnrVIbQ5PU/8KeM xdmInWuFMzESnzQrm1k/5POJTNvY5olMAgFz/9+sQswIdi+JKsjy79cjvqbDhWILJLUUai QWPHepunBYyz3JAgZ9Nis3QRKHvSZLWqlp6bJDvZyzetNxhCCqb6A2W3FKW3HEPBXmTT2p lS3zK8QyZwEGHhpybdRTI00l1wMR6RxqxudvlwVftT1/LDG6GYU7iiotTE4vSgPr9NZA+o K4BnclgfKttupV5MBFajGbYx7aCBwR+GVNAi38xtTPG6xJcC3bIIxlmApem/oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549872; a=rsa-sha256; cv=none; b=oHnm5qTxL/4RFZHZRXCpyB+4uhC0aj3gbPAQhcJHhwiXO0kHUi5rnvDEcZpUOJV7RByCLl PdqHcDMTCdBS/S9oQYp0XvsLkY4WXoFxsACG+vDKFpf3mJ9GGhNUe3x/fA9RHt7n76lSy2 CIt0vixeNiA5LebOdzkerRXQ+FCoc3F9y8i3nA455wfQW9kpcCQRrVFyaaKjmMED2de5uV cGIM500n+2BTcId6mEDjBy+OBBiP/xfor0RkZL7eR6HuPAiaHnm05tZ1eQLfHP0blceeuq Oo/RbsnTq8J5cOIDnJI9FTWqP7WKuS7Vnw6qq0OMUoygCc4CpToJZL/CXUfN7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJNb60jlzd0w for ; Wed, 19 Nov 2025 10:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8c92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:57:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 758d7ce63a61 - stable/15 - date: Improve nanosecond support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 758d7ce63a617a5bb1d18b5259216a753587e057 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:57:51 +0000 Message-Id: <691da2af.8c92.63ebe696@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=758d7ce63a617a5bb1d18b5259216a753587e057 commit 758d7ce63a617a5bb1d18b5259216a753587e057 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-11 14:58:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:56:50 +0000 date: Improve nanosecond support Add support for a field width, which defaults to 9 if unspecified or zero. If the width is not exactly 9, we have to either cut off digits or append zeroes to make up the difference. If the width is a dash, we pick a width based on the clock's reported resolution. This brings us in line with GNU coreutils. PR: 287080 MFC after: 1 week Reviewed by: 0mp Differential Revision: https://reviews.freebsd.org/D53667 (cherry picked from commit 38839c872e7af6a1424009bf07d6b4450e9ca61d) --- bin/date/date.1 | 50 ++++++++++-- bin/date/date.c | 148 ++++++++++++++++++++++++----------- bin/date/tests/format_string_test.sh | 2 + 3 files changed, 147 insertions(+), 53 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index f68892bd408d..374a687fcbdc 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 5, 2025 +.Dd November 10, 2025 .Dt DATE 1 .Os .Sh NAME @@ -186,7 +186,7 @@ Print the date and time represented by .Ar seconds , where .Ar seconds -is the number of seconds since the Epoch +is the number of seconds since the Unix Epoch (00:00:00 UTC, January 1, 1970; see .Xr time 3 ) , @@ -321,20 +321,43 @@ Refer to the examples below for further details. .Pp An operand with a leading plus .Pq Sq + -sign signals a user-defined format string +sign specifies a user-defined format string which specifies the format in which to display the date and time. The format string may contain any of the conversion specifications described in the .Xr strftime 3 -manual page and -.Ql \&%N -for nanoseconds, as well as any arbitrary text. +manual page, as well as any arbitrary text. +.Pp +The following extensions to the regular +.Xr strftime 3 +syntax are supported: +.Bl -tag -width "xxxx" +.It Cm \&% Ns Ar n Ns Cm N +Replaced by the +.Ar n Ns +-digit fractional part of the number of seconds since the Unix Epoch. +If +.Ar n +is omitted or zero, a default value of 9 is used, resulting in a +number with nanosecond resolution (hence the choice of the letter +.Sq N +for this conversion). +Note that the underlying clock may not necessarily support nanosecond +resolution. +.It Cm \&%-N +As above, but automatically choose the precision based on the reported +resolution of the underlying clock. +If the +.Fl r +option was specified, the default precision of 9 digits is used. +.El +.Pp A newline .Pq Ql \en character is always output after the characters specified by the format string. The format string for the default display is -.Dq +%+ . +.Dq %+ . .Pp If an operand does not have a leading plus sign, it is interpreted as a value for setting the system's notion of the current date and time. @@ -448,6 +471,13 @@ The utility exits 0 on success, 1 if unable to set the date, and 2 if able to set the local date, but unable to set it globally. .Sh EXAMPLES +The command +.Pp +.Dl "date +%s.%3N" +.Pp +will print the time elapsed since the Unix Epoch with millisecond +precision. +.Pp The command: .Pp .Dl "date ""+DATE: %Y-%m-%d%nTIME: %H:%M:%S""" @@ -619,3 +649,9 @@ The .Ql \&%N conversion specification was added in .Fx 14.1 . +Support for the +.Ql \&% Ns Ar n Ns Cm N +and +.Ql \&%-N +variants was added in +.Fx 15.1 . diff --git a/bin/date/date.c b/bin/date/date.c index 01797084c0d6..9a40ac43d58b 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -55,10 +56,10 @@ static void badformat(void); static void iso8601_usage(const char *) __dead2; static void multipleformats(void); static void printdate(const char *); -static void printisodate(struct tm *, long); +static void printisodate(struct tm *, long, long); static void setthetime(const char *, const char *, int, struct timespec *); static size_t strftime_ns(char * __restrict, size_t, const char * __restrict, - const struct tm * __restrict, long); + const struct tm * __restrict, long, long); static void usage(void) __dead2; static const struct iso8601_fmt { @@ -78,26 +79,24 @@ static const char *rfc2822_format = "%a, %d %b %Y %T %z"; int main(int argc, char *argv[]) { - struct timespec ts; + struct timespec ts = { 0, 0 }, tres = { 0, 1 }; int ch, rflag; bool Iflag, jflag, Rflag; const char *format; char buf[1024]; - char *fmt, *outzone = NULL; - char *tmp; + char *end, *fmt, *outzone = NULL; struct vary *v; const struct vary *badv; struct tm *lt; struct stat sb; size_t i; + intmax_t number; v = NULL; fmt = NULL; (void) setlocale(LC_TIME, ""); rflag = 0; Iflag = jflag = Rflag = 0; - ts.tv_sec = 0; - ts.tv_nsec = 0; while ((ch = getopt(argc, argv, "f:I::jnRr:uv:z:")) != -1) switch((char)ch) { case 'f': @@ -131,13 +130,15 @@ main(int argc, char *argv[]) break; case 'r': /* user specified seconds */ rflag = 1; - ts.tv_sec = strtoq(optarg, &tmp, 0); - if (*tmp != 0) { - if (stat(optarg, &sb) == 0) { - ts.tv_sec = sb.st_mtim.tv_sec; - ts.tv_nsec = sb.st_mtim.tv_nsec; - } else - usage(); + number = strtoimax(optarg, &end, 0); + if (end > optarg && *end == '\0') { + ts.tv_sec = number; + ts.tv_nsec = 0; + } else if (stat(optarg, &sb) == 0) { + ts.tv_sec = sb.st_mtim.tv_sec; + ts.tv_nsec = sb.st_mtim.tv_nsec; + } else { + usage(); } break; case 'u': /* do everything in UTC */ @@ -155,8 +156,12 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - if (!rflag && clock_gettime(CLOCK_REALTIME, &ts) == -1) - err(1, "clock_gettime"); + if (!rflag) { + if (clock_gettime(CLOCK_REALTIME, &ts) == -1) + err(1, "clock_gettime"); + if (clock_getres(CLOCK_REALTIME, &tres) == -1) + err(1, "clock_getres"); + } format = "%+"; @@ -191,14 +196,14 @@ main(int argc, char *argv[]) badv = vary_apply(v, lt); if (badv) { fprintf(stderr, "%s: Cannot apply date adjustment\n", - badv->arg); + badv->arg); vary_destroy(v); usage(); } vary_destroy(v); if (Iflag) - printisodate(lt, ts.tv_nsec); + printisodate(lt, ts.tv_nsec, tres.tv_nsec); if (format == rfc2822_format) /* @@ -208,7 +213,8 @@ main(int argc, char *argv[]) setlocale(LC_TIME, "C"); - (void)strftime_ns(buf, sizeof(buf), format, lt, ts.tv_nsec); + (void)strftime_ns(buf, sizeof(buf), format, lt, + ts.tv_nsec, tres.tv_nsec); printdate(buf); } @@ -222,7 +228,7 @@ printdate(const char *buf) } static void -printisodate(struct tm *lt, long nsec) +printisodate(struct tm *lt, long nsec, long res) { const struct iso8601_fmt *it; char fmtbuf[64], buf[64], tzbuf[8]; @@ -231,10 +237,10 @@ printisodate(struct tm *lt, long nsec) for (it = iso8601_fmts; it <= iso8601_selected; it++) strlcat(fmtbuf, it->format_string, sizeof(fmtbuf)); - (void)strftime_ns(buf, sizeof(buf), fmtbuf, lt, nsec); + (void)strftime_ns(buf, sizeof(buf), fmtbuf, lt, nsec, res); if (iso8601_selected > iso8601_fmts) { - (void)strftime_ns(tzbuf, sizeof(tzbuf), "%z", lt, nsec); + (void)strftime_ns(tzbuf, sizeof(tzbuf), "%z", lt, nsec, res); memmove(&tzbuf[4], &tzbuf[3], 3); tzbuf[3] = ':'; strlcat(buf, tzbuf, sizeof(buf)); @@ -370,16 +376,17 @@ setthetime(const char *fmt, const char *p, int jflag, struct timespec *ts) */ static size_t strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format, - const struct tm * __restrict t, long nsec) + const struct tm * __restrict t, long nsec, long res) { - size_t prefixlen; size_t ret; char *newformat; char *oldformat; const char *prefix; const char *suffix; const char *tok; - bool seen_percent; + long number; + int i, len, prefixlen, width, zeroes; + bool seen_percent, seen_dash, seen_width; seen_percent = false; if ((newformat = strdup(format)) == NULL) @@ -392,36 +399,85 @@ strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format, * If the previous token was a percent sign, * then there are two percent tokens in a row. */ - if (seen_percent) + if (seen_percent) { seen_percent = false; - else + } else { seen_percent = true; + seen_dash = seen_width = false; + prefixlen = tok - newformat; + width = 0; + } break; case 'N': - if (seen_percent) { - oldformat = newformat; - prefix = oldformat; - prefixlen = tok - oldformat - 1; - suffix = tok + 1; + if (!seen_percent) + break; + oldformat = newformat; + prefix = oldformat; + suffix = tok + 1; + /* + * Prepare the number we are about to print. If + * the requested width is less than 9, we need to + * cut off the least significant digits. If it is + * more than 9, we will have to append zeroes. + */ + if (seen_dash) { /* - * Construct a new format string from the - * prefix (i.e., the part of the old format - * from its beginning to the currently handled - * "%N" conversion specification), the - * nanoseconds, and the suffix (i.e., the part - * of the old format from the next token to the - * end). + * Calculate number of singificant digits + * based on res which is the clock's + * resolution in nanoseconds. */ - if (asprintf(&newformat, "%.*s%.9ld%s", - (int)prefixlen, prefix, nsec, - suffix) < 0) { - err(1, "asprintf"); - } - free(oldformat); - tok = newformat + prefixlen + 9; + for (width = 9, number = res; + width > 0 && number > 0; + width--, number /= 10) + /* nothing */; + } + number = nsec; + zeroes = 0; + if (width == 0) { + width = 9; + } else if (width > 9) { + zeroes = width - 9; + width = 9; + } else { + for (i = 0; i < 9 - width; i++) + number /= 10; } + /* + * Construct a new format string from the prefix + * (i.e., the part of the old format from its + * beginning to the currently handled "%N" + * conversion specification), the nanoseconds, and + * the suffix (i.e., the part of the old format + * from the next token to the end). + */ + asprintf(&newformat, "%.*s%.*ld%.*d%n%s", prefixlen, + prefix, width, number, zeroes, 0, &len, suffix); + if (newformat == NULL) + err(1, "asprintf"); + free(oldformat); + tok = newformat + len - 1; seen_percent = false; break; + case '-': + if (seen_percent) { + if (seen_dash || seen_width) { + seen_percent = false; + break; + } + seen_dash = true; + } + break; + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + if (seen_percent) { + if (seen_dash) { + seen_percent = false; + break; + } + width = width * 10 + *tok - '0'; + seen_width = true; + } + break; default: seen_percent = false; break; diff --git a/bin/date/tests/format_string_test.sh b/bin/date/tests/format_string_test.sh index c2fe2111373f..5f199a3b5fd6 100755 --- a/bin/date/tests/format_string_test.sh +++ b/bin/date/tests/format_string_test.sh @@ -132,6 +132,8 @@ atf_init_test_cases() format_string_test M M 04 20 format_string_test m m 02 11 format_string_test N N 000000000 000000000 + format_string_test 3N 3N 000 000 + format_string_test 12N 12N 000000000000 000000000000 format_string_test p p AM PM format_string_test R R 07:04 21:20 format_string_test r r "07:04:03 AM" "09:20:00 PM" From nobody Wed Nov 19 10:57:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJNd1gGLz6HWRH for ; Wed, 19 Nov 2025 10:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJNc6d0Xz3NNp for ; Wed, 19 Nov 2025 10:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flsXq64ukJWdO5OuwOpFWe6wGjrytt5KG/eBXwrUQ3Q=; b=beJQ541w1GnGnQ62OOD7faILlSpt7JCBTv9Q9gMRJB/5UdiIgmS9n8hw9DOeujNICzWjiY vnoq+p6TTpv0gGYRSByKGL8Cm7pKI9OD7qn6bDufkKqAnoGX2Abxh0/hUmDJAoFdie2+C2 2/IAaqXQtMYs4VygcuPpvQbwnOimIqUXTyCKw2PidGTTr712zRuEwjfblj2H8RHWZvZZj+ i2ReusE0rA94Qqnhrmx7aaQ5iQzbZ054O91S4vxXm/SUjhgnyivNcP4haFPDr/ucF+BEYX LZyZf+F1iEmc4h9xVRUm1o5T67GyADxaZQGZhO01Y6RNsIo8GCYm6x4R/pBAdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flsXq64ukJWdO5OuwOpFWe6wGjrytt5KG/eBXwrUQ3Q=; b=NU5Um+fO7+im0iw+5lcC85AX84+0dJ84JKT4Y0voMNef1BxxL19255YVY77vp4KjHVf7+0 zOyy4DVGbAZk9cKtOs6aqaqgMRo4ZFMV7ncsDdaJKzqwB5NUu5GHnvyEwFphi0AKxEIJuk 5+vjNWrtKpSli3L3gUucIUc0RaGtaHioSUMeFVL1COsRYM6EsVZIG600rSoMMF6vj/U1NI nSu1L5XJRqPBdyHYaViY+rU/bFFZ2JSof+OuS3YBm5G2PhS5f4XYf01vhVI549rTsZmOLh u9zOt7dfFVn/cTCtSJqV84+l5j9Xeq1OFu+rTfK2lh51ozLggb38WbTUD/rBhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549872; a=rsa-sha256; cv=none; b=XMxjcQRPpTaEEqCkq8lz+rtBkb7kQDoSC+nX/ZefpTcNWadWvly9dQwvEW18iQ/3PkEK2i qgSSKow0AI54pMCuVj/spCya3pj2UOVwEISAuOcN9rock46JhwwrSMtj5QecbNVVut7QBf DyiEzQLDvYAcg7eU6XvVqy63dYsPLwO4EWnm1F97UhTbk5WbM5igJ9KSxIJ0Okjnn5eOMM 5/xCQnJ5Y2QoUqNuB/CxJjZhMZGto4LWyhSQrxApySwNcj6ofRS9KJnEf6N6SG9y8uuznS xXKdSIVpC7ujBsSbyaQJUtQXCjEA9weKaPNlkVtccrYPM8nmBMke8WvWazX4Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJNc5z1Xzd0y for ; Wed, 19 Nov 2025 10:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8b23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:57:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a87ffad35b05 - stable/15 - tarfs: Fix support for large files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a87ffad35b05fef35a7ff157f5ec7f0c4e7c6667 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:57:52 +0000 Message-Id: <691da2b0.8b23.39bf461b@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a87ffad35b05fef35a7ff157f5ec7f0c4e7c6667 commit a87ffad35b05fef35a7ff157f5ec7f0c4e7c6667 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-12 21:23:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:56:50 +0000 tarfs: Fix support for large files * When fast-forwarding through a zstd frame, we incorrectly used the min() inline function instead of the MIN() macro. The function truncates the result to unsigned int, resulting in a decompression error when trying to seek more than 4 GB into the frame. * POSIX states that a size extended header record overrides the size field in the header if present, and that one must be included if the size of the file exceeds 8 GB (the size field maxes out at 64 GB). * Reduce repetition in the exthdr parser by deduplicating the syntax error handler. MFC after: 1 week Sponsored by: Klara, Inc. Fixes: 69d94f4c7608 ("Add tarfs, a filesystem backed by tarballs.") Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D53718 (cherry picked from commit a34a57d4b4eba88dfa5541d7d77b63b01c1a1a9a) --- sys/fs/tarfs/tarfs_io.c | 2 +- sys/fs/tarfs/tarfs_vfsops.c | 48 +++++++++++++++++++--------------------- tests/sys/fs/tarfs/tarfs_test.sh | 27 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 26 deletions(-) diff --git a/sys/fs/tarfs/tarfs_io.c b/sys/fs/tarfs/tarfs_io.c index a3d8df62d7df..e250c5cbce5a 100644 --- a/sys/fs/tarfs/tarfs_io.c +++ b/sys/fs/tarfs/tarfs_io.c @@ -444,7 +444,7 @@ tarfs_zread_zstd(struct tarfs_zio *zio, struct uio *uiop) } if (zio->opos < off) { /* to be discarded */ - zob.size = min(off - zio->opos, len); + zob.size = MIN(off - zio->opos, len); zob.pos = 0; } else { zob.size = len; diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index a534b18ebf34..e1ba925ccb0f 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -441,7 +441,7 @@ tarfs_alloc_one(struct tarfs_mount *tmp, size_t *blknump) int endmarker = 0; char *namep, *sep; struct tarfs_node *parent, *tnp, *other; - size_t namelen = 0, linklen = 0, realsize = 0, sz; + size_t namelen = 0, linklen = 0, realsize = 0, extsize = 0, sz; ssize_t res; dev_t rdev; gid_t gid; @@ -588,10 +588,7 @@ again: char *eol, *key, *value, *sep; size_t len = strtoul(line, &sep, 10); if (len == 0 || sep == line || *sep != ' ') { - TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", - __func__); - error = EINVAL; - goto bad; + goto syntax; } if ((uintptr_t)line + len < (uintptr_t)line || line + len > exthdr + sz) { @@ -606,16 +603,18 @@ again: key = sep + 1; sep = strchr(key, '='); if (sep == NULL) { - TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", - __func__); - error = EINVAL; - goto bad; + goto syntax; } *sep = '\0'; value = sep + 1; TARFS_DPF(ALLOC, "%s: exthdr %s=%s\n", __func__, key, value); - if (strcmp(key, "path") == 0) { + if (strcmp(key, "size") == 0) { + extsize = strtol(value, &sep, 10); + if (sep != eol) { + goto syntax; + } + } else if (strcmp(key, "path") == 0) { name = value; namelen = eol - value; } else if (strcmp(key, "linkpath") == 0) { @@ -625,47 +624,42 @@ again: sparse = true; major = strtol(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.minor") == 0) { sparse = true; minor = strtol(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.name") == 0) { sparse = true; name = value; namelen = eol - value; if (namelen == 0) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.realsize") == 0) { sparse = true; realsize = strtoul(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "SCHILY.fflags") == 0) { flags |= tarfs_strtofflags(value, &sep); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } } goto again; } + /* do we have a size from an exthdr? */ + if (extsize > 0) { + sz = extsize; + } + /* sparse file consistency checks */ if (sparse) { TARFS_DPF(ALLOC, "%s: %s: sparse %ld.%ld (%zu bytes)\n", __func__, @@ -832,6 +826,10 @@ skip: sbuf_delete(namebuf); } return (0); +syntax: + TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", __func__); + error = EINVAL; + goto bad; eof: TARFS_DPF(IO, "%s: premature end of file\n", __func__); error = EIO; diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index d4de71271985..505bfc5325f0 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -396,6 +396,32 @@ tarfs_git_archive_cleanup() { tarfs_cleanup } +atf_test_case tarfs_large cleanup +tarfs_large_head() { + atf_set "descr" "Test support for large files" + atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" + atf_set "timeout" "600" +} +tarfs_large_body() { + tarfs_setup + local tarball="${PWD}/tarfs_test.tar.zst" + local exp off + for exp in 31 32 33 34 35 36 ; do + for off in 1 0 ; do + local size=$(((1<; Wed, 19 Nov 2025 10:57:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJNf0CkHz3N8y for ; Wed, 19 Nov 2025 10:57:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4xaM5DrmWmXCetCEo87P501OWaor9BX786ALYJEF5Hs=; b=d/2WyjhLc9b4yv4N2ijN3WBSd2MIdVtGi1hRXrg9/rxJRhYS4Zn+CngYVFkcE0cBQ0pPGL /SIzSLVU/g6haryyvYCO9cVQvZYdnpwZ7jxxxbw1Vgy2v0/IrdPif8TCsH31KnDuhXEio7 n/4crsXxsOr6AifhUqzh8HryN+VZ44sx+49hqWUpLneEkF/227K7Sl4ylyPckKFZUtcwVK Y4sKH+Mw0SJySy9ue9z+7HuSSW8o96atnWfXe2gbp9W+rMuOWJEAkxzz8oDOGBOJAy3T3l eyZ9iVFjjJMrSHG1CGRjVB9ClJvSBKRgIqf333KJtxIzwIpzY6s+eiYJ/+Fjug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4xaM5DrmWmXCetCEo87P501OWaor9BX786ALYJEF5Hs=; b=FZs9DxW96mnAOfiHEVMAw6zUcW/4wj03O18GHfjEVuFg/Iw6Sw91H06tnsRNrm6FrRjf+g bAc9q2/78IBRLInLtE9sLHhiRHI64MyX+Yj0gpMf6larABkmZopuzBG480NmBRptjFn29t 9vFt5T7knSqmD7pQaF5j/kThMnA8BHAGOR0BL8wO1uGGrxYX9X2ApIO4Bu1E8jySI6XrlB EPhUlftE2lAyllq9ntreIAPNxi2BCyZ6BaCIKAPuNNGOlgwjR8w1SyJdKeBJ6Am1hYi7Km tX8snAXXJ6sL6kk83lt1B/LSQdYJ+DoUZBzBrCS5CfDpqjl5jEyApVMbL0xaBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549874; a=rsa-sha256; cv=none; b=NqNrNktEZaxa3EBhhSiHXyj476lbHjCvQQsGPrwUgx7a9FSJsStu6i0l//ZlMs56avS4N5 v++yuzxIP//2zwgaK6+mnFQSjq+ZZiJXvTcFraLSUC7akDMWdxUX79fBGAPPgtdUWihCQF s1fsII3HY6znIBQ0V2+M1QB5VY36t+AOHBGRhJ6CVzEg72ebixaPWk3TNfIMKX55diUR/L yqDLi/isB0t/xjUA5t4A2/0o9MgyWwrWDBrxIEdKLAoxlbVjWkY4ezjnilmHXAB9A9Jaxq YyjCfbUcMoyVEDuvOXWsAgWlzpiDFCrJgti+Dve5rQbSE/moxvNZVqzr/l7dpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJNd6qVjzdRD for ; Wed, 19 Nov 2025 10:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ffeb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:57:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d019d36707d3 - stable/15 - quot: Rewrite -n mode input parser List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d019d36707d35a982d527f568dd68179f6f747b2 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:57:53 +0000 Message-Id: <691da2b1.3ffeb.2785c685@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d019d36707d35a982d527f568dd68179f6f747b2 commit d019d36707d35a982d527f568dd68179f6f747b2 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-14 14:28:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:56:50 +0000 quot: Rewrite -n mode input parser The existing parser was needlessly complicated and wildly inconsistent in how it handled invalid input. Rewrite using getline() and treat invalid input consistently: silently ignore lines that don't begin with a number, and print a warning if the inode number is out of range. PR: 290992 MFC after: 1 week Reviewed by: obrien Differential Revision: https://reviews.freebsd.org/D53726 (cherry picked from commit fa272a5276865a97b01823fe6546940eaaf1b164) --- usr.sbin/quot/quot.8 | 3 ++- usr.sbin/quot/quot.c | 47 +++++++++++++++++++++------------------- usr.sbin/quot/tests/quot_test.sh | 19 ++++++++++++++++ 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 32e666e2a863..69c0a2d84b9b 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -27,7 +27,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 15, 2025 +.Dd November 13, 2025 .Dt QUOT 8 .Os .Sh NAME @@ -60,6 +60,7 @@ By default, all sizes are reported in 512-byte block counts. Given a list of inodes (plus some optional data on each line) in the standard input, for each file print out the owner (plus the remainder of the input line). +Lines that do not begin with a number are ignored. This is traditionally used in the pipe: .Bd -literal -offset indent diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 5dda36ac8499..d2f7646f7041 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -390,41 +391,43 @@ douser(int fd, struct fs *super) static void donames(int fd, struct fs *super) { - int c; - ino_t maxino; - uintmax_t inode; union dinode *dp; + char *end, *line; + size_t cap; + ssize_t len; + intmax_t inode, maxino; maxino = super->fs_ncg * super->fs_ipg - 1; - /* first skip the name of the filesystem */ - while ((c = getchar()) != EOF && (c < '0' || c > '9')) - while ((c = getchar()) != EOF && c != '\n'); - ungetc(c, stdin); - while (scanf("%ju", &inode) == 1) { - if (inode > maxino) { - warnx("illegal inode %ju", inode); - return; + line = NULL; + cap = 0; + while ((len = getline(&line, &cap, stdin)) > 0) { + if (len > 0 && line[len - 1] == '\n') + line[--len] = '\0'; + inode = strtoimax(line, &end, 10); + /* + * Silently ignore lines that do not begin with a number. + * For backward compatibility reasons, we do not require + * the optional comment to be preceded by whitespace. + */ + if (end == line) + continue; + if (inode <= 0 || inode > maxino) { + warnx("invalid inode %jd", inode); + continue; } if ((dp = get_inode(fd, super, inode)) != NULL && !isfree(super, dp)) { printf("%s\t", user(DIP(super, dp, di_uid))->name); /* now skip whitespace */ - while ((c = getchar()) == ' ' || c == '\t') - /* nothing */; + while (*end == ' ' || *end == '\t') + end++; /* and print out the remainder of the input line */ - while (c != EOF && c != '\n') { - putchar(c); - c = getchar(); - } - putchar('\n'); + printf("%s\n", end); } else { /* skip this line */ - while ((c = getchar()) != EOF && c != '\n') - /* nothing */; } - if (c == EOF) - break; } + free(line); } static void diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh index 21088d162a53..c5e6717adca1 100644 --- a/usr.sbin/quot/tests/quot_test.sh +++ b/usr.sbin/quot/tests/quot_test.sh @@ -15,6 +15,8 @@ quot_setup() atf_check mount /dev/$dev "$mnt" echo "/dev/$dev: ($mnt)" >expect printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect + printf "%s\n" "/dev/$dev" >ninput + echo "/dev/$dev: ($mnt)" >nexpect } # Create a directory owned by a given UID @@ -23,12 +25,25 @@ quot_adduid() local uid=$1 atf_check install -d -o $uid -g 0 mnt/$uid printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect + ls -di mnt/$uid >>ninput + printf "%s\t%s\n" "#$uid" mnt/$uid >>nexpect } # Perform the tests quot_test() { local dev=$(cat dev) + # Deliberately add invalid lines to our -n input before the + # valid ones to verify that quot does not abort on first + # error. Note that quot deliberately ignores initial lines + # that don't start with a number, and that after encountering + # at least one line that does start with a number, quot would + # previously terminate on encountering one that doesn't (now + # it simply ignores them). This also tests that we don't + # require whitespace between the inode number and the comment. + echo "0zero" >>ninput + echo "invalid" >>ninput + echo "-1minusone" >>ninput # Create inodes owned by a large number of users to exercise # hash collisions and rehashing. The code uses an open hash # table that starts out with only 8 entries and doubles every @@ -50,6 +65,10 @@ quot_test() atf_check mount -ur /dev/$dev atf_check -o file:expect quot -fkN /dev/$dev atf_check -o file:expect quot -fkN $(realpath mnt) + # Test -n option + atf_check -o file:nexpect \ + -e inline:"quot: invalid inode 0\nquot: invalid inode -1\n" \ + quot -Nn /dev/$dev ; Wed, 19 Nov 2025 10:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJNg2BMFz3NdG for ; Wed, 19 Nov 2025 10:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dtZ0sXvDJBWS+f46h3OoQcTGoh0w4fspa1nDc99pHC4=; b=t/W6JRE1CQ1tT7fSEgxuiOCUuPoclL67JiD1BkpS9x5vAfQ92esMlL6DQrSwAPGFWyCMKp CVUhlK1G9jZGYj+rL/PFxSQ3hVfhhyjceEfOpbFp/Edqe8j2J0vp+oeugvRAU9fdtZtwxm nu86HSXDCy00BaWNUSk6L6Ch+s7e3LhBYV/KDL8gX8jdQC8JE2i/wr2loKvEjnKFfU9QrQ bUS6WFnUupr5R2jWZTsi1SPeYhM9voVZH/Ehbxm/WVjntbkEqEfaZHReEzSQLhS1wtLpDu MT8Wi1ZvA2syFNKCUmEk6QoPBboXu31Xc49pRArvZI43FYv62r2XJ1Dy6b2KUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dtZ0sXvDJBWS+f46h3OoQcTGoh0w4fspa1nDc99pHC4=; b=aeuRaJFHb+RpX8p0wPY5W+pbfv1z6pdG/dUcULZ5puWIYVkTdWRdXsjAwPyRdjg3THkBII Nd/XRNvjoRD/ZKHtt2m8nUhP7YM6PaJcBXfwsnB2Q7S1eLSY8eg9N+BN8bcfs5NGhG7AcX JeqWhiiPeZqsCrhleNIvsIsdCC2Xqh5TWYke8GhzKDjGDe37xCRKunP0CG9QxO8q1CtPmK YacRGqxElfGsRAH0tA1TF6mtBq6lmBTX93OqZfUlu+4iLUZXdz6I+SsXEeVdqIFqdwkjwt ZARKaJKp7x+ctQi4uvVGAG9yg3OHxppdDR77/QkL4jLSyHlUrLHaZGuqWN2IHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549875; a=rsa-sha256; cv=none; b=f7TVQT+zf8DLR9MvrN0KneH1zmSTmQ5Bdcc9X7+Gn8SxXYje6uOLX8SjoQpVPt9KqH08EA agoxBfiwX/t1y/cXvjrVO78ZoexQfKaN2/uD00SkgqVk46dqlCtZFdiMJix0py7z7enpl6 KLrxsCqFV0BdEYsBGBF/vH6tDreo0NABH71KL23q7nEBK+UVOh/uwGPVUReKDyf8pwizaN Ym7fFEPhu9u/zFuOOZcnNk7qRQ+JfyPMwrXvlkfQ+mCDOyXtUT59KjAw7sX/HuCzoE7/DP IRPW4I+ISAxA4H1GZFT5+taDddwzkw/J/1uNAt9bE6GPYuwZdw01t1GjljPFBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJNg0XQYzdDh for ; Wed, 19 Nov 2025 10:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 81f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:57:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 9a7afecc503b - stable/15 - quot: Improve manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9a7afecc503b1364132a60d2342b4b56811cf439 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:57:55 +0000 Message-Id: <691da2b3.81f0.116beb68@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9a7afecc503b1364132a60d2342b4b56811cf439 commit 9a7afecc503b1364132a60d2342b4b56811cf439 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-14 14:28:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:56:50 +0000 quot: Improve manual page * Rewrite the first paragraph to clarify that quot(8) only supports FFS. * Document which options can or cannot be combined with each other. MFC after: 1 week Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D53727 (cherry picked from commit 2f3adab9d512faec3e1891e505d1888db5d0240e) --- usr.sbin/quot/quot.8 | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 69c0a2d84b9b..b4b40bf395e9 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -41,7 +41,9 @@ The .Nm utility -is used to gather statistics about the disk usage for each local user. +is used to gather per-user disk usage statistics from +.Xr ffs 7 +file systems. .Pp The following options are available: .Bl -tag -width indent @@ -51,8 +53,16 @@ Include statistics for all mounted file systems. Display three columns containing number of blocks per file, number of files in this category, and aggregate total of blocks in files with this or lower size. +This option is mutually exclusive with the +.Fl n +option. .It Fl f For each user, display count of files and space occupied. +This option has no effect if combined with the +.Fl c +or +.Fl n +options. .It Fl k Force the numbers to be reported in kilobyte counts. By default, all sizes are reported in 512-byte block counts. @@ -69,9 +79,17 @@ ls -i | sed -e 's,^ *,,' | sort -k 1n | quot -n filesystem .Ed .Pp to get a report of files and their owners. +This option is mutually exclusive with the +.Fl c +option. .It Fl v In addition to the default output, display the number of files not accessed within 30, 60 and 90 days. +This option has no effect if combined with the +.Fl c +or +.Fl n +options. .El .Sh ENVIRONMENT .Bl -tag -width BLOCKSIZE @@ -88,6 +106,7 @@ size block. .Xr quota 1 , .Xr getmntinfo 3 , .Xr fstab 5 , +.Xr ffs 7 , .Xr mount 8 .Sh HISTORY This implementation of From nobody Wed Nov 19 10:58:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJP83xgzz6HWpv for ; Wed, 19 Nov 2025 10:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJP76sHyz3PKV for ; Wed, 19 Nov 2025 10:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUq1u9ArtfJf7Ok+ogTT0ZaeJ33zeMPPYPxPEmShBzY=; b=L2ZWsT12c/ae8yRw2wnP+UGnXu1CyB4fRBt5ruZCkZxoYlWpy+7/RtrkX5cQbbxjs/6Tsh d8zV0LEBuOWViIqjFsxvDlAaWiN58dnHNteKAAWruukfqztXvdOtSUGyxVLf7U9tI8WLbj Yo046281lRzpjF/tR+loDiy1NzopDZpanKfGM8lBPBeX6+It2TAwvkPX3tLlbidXiq+GoY o3eNlNC4Zl9TLKo7DAb/cLnUXWT76LkB+2PZWXqxIDq39fYxkpqikpXh5jt7YLm7PvFQ00 9TUjCyaPft6Zvnse3d1r7otcDIIDnpWUE+DpZhBr4dzkUwmeYrxlcsENUq/Wwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUq1u9ArtfJf7Ok+ogTT0ZaeJ33zeMPPYPxPEmShBzY=; b=x9Pl6ZT8OYT0oa8nPk3bmnEKovkdmzSX3zuBwJFqqiXeCh1IlxP6Oaw32TlYm1UFgDKbUk zShmfuqtWa4o0KpWQkNH72Y1PCd+7g/uYW6kwPuiVZ2ZD3FBtHMM747/kU5kbiO0g4Sp9g EY+U7RCgfIlc37dsEAsL4hi5tzlfZJawJcRcI1JofZYcJx7/LTEGLG8kIOxzLsadr/hKVS J1NeRavTtAAIUJ56jtAPtaJf3AO8qCBnX5SJlkxVY1/DHpqWaDQFXK7q07MXhm6Qpds1CD JyBarDMMH/7Vcij93GDX71cwTP7Uo2vfYByM6uJsim8TUmpXACaLTQ7yAVHZMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549900; a=rsa-sha256; cv=none; b=iKjZC47m09lr19XmKIUSJv4LOPKXP0H7EfKIKquGDrAqjvASZbgEVgF9JecRh7JVJL2yk9 eXOM1aU/ZdFLvzmPkfh3FT2RMvFF/LToZVzd13s2JOsmrpa0DgxV/PiSoxSZHf+rKXcRs5 BCVkdHQ+SjH5GxPt4W7SOaBIx2Q1TYWVi8V95rpD5g+O7iNlUjcTRmDfhK7CLg5xqkp+EC zMBbkQVVxN7eJUsEiHMW8eEwsCKszZJFcbA5rTGeN+RyvnaqOL4iFfAv4UQyaOoN2SNBi4 qMVflmNHDmFzwE6i3b6W1/uzjAPK+JUNVK8hDvtkfXkl8gOQX34Q9QwAuArsJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJP75Wf0zddy for ; Wed, 19 Nov 2025 10:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ffef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:58:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b0abbe05dfa1 - stable/14 - date: Improve nanosecond support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0abbe05dfa144ff6ceabeb317e9493a13c0917d Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:58:19 +0000 Message-Id: <691da2cb.3ffef.737c02dd@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b0abbe05dfa144ff6ceabeb317e9493a13c0917d commit b0abbe05dfa144ff6ceabeb317e9493a13c0917d Author: Dag-Erling Smørgrav AuthorDate: 2025-11-11 14:58:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:57:39 +0000 date: Improve nanosecond support Add support for a field width, which defaults to 9 if unspecified or zero. If the width is not exactly 9, we have to either cut off digits or append zeroes to make up the difference. If the width is a dash, we pick a width based on the clock's reported resolution. This brings us in line with GNU coreutils. PR: 287080 MFC after: 1 week Reviewed by: 0mp Differential Revision: https://reviews.freebsd.org/D53667 (cherry picked from commit 38839c872e7af6a1424009bf07d6b4450e9ca61d) --- bin/date/date.1 | 50 ++++++++++-- bin/date/date.c | 148 ++++++++++++++++++++++++----------- bin/date/tests/format_string_test.sh | 2 + 3 files changed, 147 insertions(+), 53 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index f68892bd408d..374a687fcbdc 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 5, 2025 +.Dd November 10, 2025 .Dt DATE 1 .Os .Sh NAME @@ -186,7 +186,7 @@ Print the date and time represented by .Ar seconds , where .Ar seconds -is the number of seconds since the Epoch +is the number of seconds since the Unix Epoch (00:00:00 UTC, January 1, 1970; see .Xr time 3 ) , @@ -321,20 +321,43 @@ Refer to the examples below for further details. .Pp An operand with a leading plus .Pq Sq + -sign signals a user-defined format string +sign specifies a user-defined format string which specifies the format in which to display the date and time. The format string may contain any of the conversion specifications described in the .Xr strftime 3 -manual page and -.Ql \&%N -for nanoseconds, as well as any arbitrary text. +manual page, as well as any arbitrary text. +.Pp +The following extensions to the regular +.Xr strftime 3 +syntax are supported: +.Bl -tag -width "xxxx" +.It Cm \&% Ns Ar n Ns Cm N +Replaced by the +.Ar n Ns +-digit fractional part of the number of seconds since the Unix Epoch. +If +.Ar n +is omitted or zero, a default value of 9 is used, resulting in a +number with nanosecond resolution (hence the choice of the letter +.Sq N +for this conversion). +Note that the underlying clock may not necessarily support nanosecond +resolution. +.It Cm \&%-N +As above, but automatically choose the precision based on the reported +resolution of the underlying clock. +If the +.Fl r +option was specified, the default precision of 9 digits is used. +.El +.Pp A newline .Pq Ql \en character is always output after the characters specified by the format string. The format string for the default display is -.Dq +%+ . +.Dq %+ . .Pp If an operand does not have a leading plus sign, it is interpreted as a value for setting the system's notion of the current date and time. @@ -448,6 +471,13 @@ The utility exits 0 on success, 1 if unable to set the date, and 2 if able to set the local date, but unable to set it globally. .Sh EXAMPLES +The command +.Pp +.Dl "date +%s.%3N" +.Pp +will print the time elapsed since the Unix Epoch with millisecond +precision. +.Pp The command: .Pp .Dl "date ""+DATE: %Y-%m-%d%nTIME: %H:%M:%S""" @@ -619,3 +649,9 @@ The .Ql \&%N conversion specification was added in .Fx 14.1 . +Support for the +.Ql \&% Ns Ar n Ns Cm N +and +.Ql \&%-N +variants was added in +.Fx 15.1 . diff --git a/bin/date/date.c b/bin/date/date.c index d32993dc1eda..993254c85e94 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -49,6 +49,7 @@ static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95"; #include #include #include +#include #include #include #include @@ -68,10 +69,10 @@ static void badformat(void); static void iso8601_usage(const char *) __dead2; static void multipleformats(void); static void printdate(const char *); -static void printisodate(struct tm *, long); +static void printisodate(struct tm *, long, long); static void setthetime(const char *, const char *, int, struct timespec *); static size_t strftime_ns(char * __restrict, size_t, const char * __restrict, - const struct tm * __restrict, long); + const struct tm * __restrict, long, long); static void usage(void) __dead2; static const struct iso8601_fmt { @@ -91,26 +92,24 @@ static const char *rfc2822_format = "%a, %d %b %Y %T %z"; int main(int argc, char *argv[]) { - struct timespec ts; + struct timespec ts = { 0, 0 }, tres = { 0, 1 }; int ch, rflag; bool Iflag, jflag, Rflag; const char *format; char buf[1024]; - char *fmt, *outzone = NULL; - char *tmp; + char *end, *fmt, *outzone = NULL; struct vary *v; const struct vary *badv; struct tm *lt; struct stat sb; size_t i; + intmax_t number; v = NULL; fmt = NULL; (void) setlocale(LC_TIME, ""); rflag = 0; Iflag = jflag = Rflag = 0; - ts.tv_sec = 0; - ts.tv_nsec = 0; while ((ch = getopt(argc, argv, "f:I::jnRr:uv:z:")) != -1) switch((char)ch) { case 'f': @@ -144,13 +143,15 @@ main(int argc, char *argv[]) break; case 'r': /* user specified seconds */ rflag = 1; - ts.tv_sec = strtoq(optarg, &tmp, 0); - if (*tmp != 0) { - if (stat(optarg, &sb) == 0) { - ts.tv_sec = sb.st_mtim.tv_sec; - ts.tv_nsec = sb.st_mtim.tv_nsec; - } else - usage(); + number = strtoimax(optarg, &end, 0); + if (end > optarg && *end == '\0') { + ts.tv_sec = number; + ts.tv_nsec = 0; + } else if (stat(optarg, &sb) == 0) { + ts.tv_sec = sb.st_mtim.tv_sec; + ts.tv_nsec = sb.st_mtim.tv_nsec; + } else { + usage(); } break; case 'u': /* do everything in UTC */ @@ -168,8 +169,12 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - if (!rflag && clock_gettime(CLOCK_REALTIME, &ts) == -1) - err(1, "clock_gettime"); + if (!rflag) { + if (clock_gettime(CLOCK_REALTIME, &ts) == -1) + err(1, "clock_gettime"); + if (clock_getres(CLOCK_REALTIME, &tres) == -1) + err(1, "clock_getres"); + } format = "%+"; @@ -204,14 +209,14 @@ main(int argc, char *argv[]) badv = vary_apply(v, lt); if (badv) { fprintf(stderr, "%s: Cannot apply date adjustment\n", - badv->arg); + badv->arg); vary_destroy(v); usage(); } vary_destroy(v); if (Iflag) - printisodate(lt, ts.tv_nsec); + printisodate(lt, ts.tv_nsec, tres.tv_nsec); if (format == rfc2822_format) /* @@ -221,7 +226,8 @@ main(int argc, char *argv[]) setlocale(LC_TIME, "C"); - (void)strftime_ns(buf, sizeof(buf), format, lt, ts.tv_nsec); + (void)strftime_ns(buf, sizeof(buf), format, lt, + ts.tv_nsec, tres.tv_nsec); printdate(buf); } @@ -235,7 +241,7 @@ printdate(const char *buf) } static void -printisodate(struct tm *lt, long nsec) +printisodate(struct tm *lt, long nsec, long res) { const struct iso8601_fmt *it; char fmtbuf[64], buf[64], tzbuf[8]; @@ -244,10 +250,10 @@ printisodate(struct tm *lt, long nsec) for (it = iso8601_fmts; it <= iso8601_selected; it++) strlcat(fmtbuf, it->format_string, sizeof(fmtbuf)); - (void)strftime_ns(buf, sizeof(buf), fmtbuf, lt, nsec); + (void)strftime_ns(buf, sizeof(buf), fmtbuf, lt, nsec, res); if (iso8601_selected > iso8601_fmts) { - (void)strftime_ns(tzbuf, sizeof(tzbuf), "%z", lt, nsec); + (void)strftime_ns(tzbuf, sizeof(tzbuf), "%z", lt, nsec, res); memmove(&tzbuf[4], &tzbuf[3], 3); tzbuf[3] = ':'; strlcat(buf, tzbuf, sizeof(buf)); @@ -383,16 +389,17 @@ setthetime(const char *fmt, const char *p, int jflag, struct timespec *ts) */ static size_t strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format, - const struct tm * __restrict t, long nsec) + const struct tm * __restrict t, long nsec, long res) { - size_t prefixlen; size_t ret; char *newformat; char *oldformat; const char *prefix; const char *suffix; const char *tok; - bool seen_percent; + long number; + int i, len, prefixlen, width, zeroes; + bool seen_percent, seen_dash, seen_width; seen_percent = false; if ((newformat = strdup(format)) == NULL) @@ -405,36 +412,85 @@ strftime_ns(char * __restrict s, size_t maxsize, const char * __restrict format, * If the previous token was a percent sign, * then there are two percent tokens in a row. */ - if (seen_percent) + if (seen_percent) { seen_percent = false; - else + } else { seen_percent = true; + seen_dash = seen_width = false; + prefixlen = tok - newformat; + width = 0; + } break; case 'N': - if (seen_percent) { - oldformat = newformat; - prefix = oldformat; - prefixlen = tok - oldformat - 1; - suffix = tok + 1; + if (!seen_percent) + break; + oldformat = newformat; + prefix = oldformat; + suffix = tok + 1; + /* + * Prepare the number we are about to print. If + * the requested width is less than 9, we need to + * cut off the least significant digits. If it is + * more than 9, we will have to append zeroes. + */ + if (seen_dash) { /* - * Construct a new format string from the - * prefix (i.e., the part of the old format - * from its beginning to the currently handled - * "%N" conversion specification), the - * nanoseconds, and the suffix (i.e., the part - * of the old format from the next token to the - * end). + * Calculate number of singificant digits + * based on res which is the clock's + * resolution in nanoseconds. */ - if (asprintf(&newformat, "%.*s%.9ld%s", - (int)prefixlen, prefix, nsec, - suffix) < 0) { - err(1, "asprintf"); - } - free(oldformat); - tok = newformat + prefixlen + 9; + for (width = 9, number = res; + width > 0 && number > 0; + width--, number /= 10) + /* nothing */; + } + number = nsec; + zeroes = 0; + if (width == 0) { + width = 9; + } else if (width > 9) { + zeroes = width - 9; + width = 9; + } else { + for (i = 0; i < 9 - width; i++) + number /= 10; } + /* + * Construct a new format string from the prefix + * (i.e., the part of the old format from its + * beginning to the currently handled "%N" + * conversion specification), the nanoseconds, and + * the suffix (i.e., the part of the old format + * from the next token to the end). + */ + asprintf(&newformat, "%.*s%.*ld%.*d%n%s", prefixlen, + prefix, width, number, zeroes, 0, &len, suffix); + if (newformat == NULL) + err(1, "asprintf"); + free(oldformat); + tok = newformat + len - 1; seen_percent = false; break; + case '-': + if (seen_percent) { + if (seen_dash || seen_width) { + seen_percent = false; + break; + } + seen_dash = true; + } + break; + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': + if (seen_percent) { + if (seen_dash) { + seen_percent = false; + break; + } + width = width * 10 + *tok - '0'; + seen_width = true; + } + break; default: seen_percent = false; break; diff --git a/bin/date/tests/format_string_test.sh b/bin/date/tests/format_string_test.sh index c2fe2111373f..5f199a3b5fd6 100755 --- a/bin/date/tests/format_string_test.sh +++ b/bin/date/tests/format_string_test.sh @@ -132,6 +132,8 @@ atf_init_test_cases() format_string_test M M 04 20 format_string_test m m 02 11 format_string_test N N 000000000 000000000 + format_string_test 3N 3N 000 000 + format_string_test 12N 12N 000000000000 000000000000 format_string_test p p AM PM format_string_test R R 07:04 21:20 format_string_test r r "07:04:03 AM" "09:20:00 PM" From nobody Wed Nov 19 10:58:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJP93H3Rz6HWvd for ; Wed, 19 Nov 2025 10:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJP86vFGz3PPc for ; Wed, 19 Nov 2025 10:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KuNiQ40NoHOWktDtYo5AV6OMcfitr7Mj16Eok7aQqjE=; b=exf3vSTcXWFAo9BOpIF2AawaqFnm83INCfhT6fo+4pw19NvpRefb9U5V+5wtiOv37/ZBD3 bHD0QyDzGTMwssXpNLsxqMR0BqZkne1Ro/puKEj6smko+if6FJkdoQA/UdmGtJ9CHrO5sH tAMyyzJCQRMQjyvHAjfaa9O23lJnjKI3d3MSOzEivM7NHdW6CinCrbDtZDS6lGwO30qVVe iOXzVJsiEtDd1mbH/LI+STl1crrlLYEbWr038+egm5kaDYh7Vd26+BudsYZ7tDo42CPNuL DyXR4sQY/VufpFis55Z1dGD8zVg/kB/n5hFlQ8eyYpfBGRtsEGQTXVJGLKJi4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763549901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KuNiQ40NoHOWktDtYo5AV6OMcfitr7Mj16Eok7aQqjE=; b=JtZbGMxjgqgVCbNppPzokrphuP7MG/QugIRtZZeTZW6MXbb9OOl2aho7EXexvaROVecS9i y3PnWgcf8ZHpCyt6wVKqYED/JdSml9MMzVxvrGYNA1LoF8DMG/ol5M+e16wQv35GcxqK/a 6RpoVreiz96lXTGfnEfsLz5lKr9C6arsgi4K0VENIY6I64FRQYN3yF99zpII2QGudAhNpV wM9NleSDF02GUB20tGw9D0kZVW7w1WDHKnmaa0oXky+kroUBVlx00RAf63k6pfW2l0gLvV Npw+RsL19MQPllL2N9ifvzYAjwkQothAW9ElVuc+BWZI/Ctuia0q0tQ2iSLaKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763549901; a=rsa-sha256; cv=none; b=PlEOiGxcKZKt9ABZp+i6XxxprW7Ta8qcecizk8cf3oqlMWccGv5Q1sNUoKCNPCUB3N1TyU vqQI7vlocQuNC3QCP/riCIC6YH0s5fcKMhwwlIg6/TNrTEh7LJ6us3oZ6Ggmk4tx2WN0EA 1s1s6+S+pyRCz/7kjicDCvkBp7+cyWsRQwjsIWDEo3HlMnv8vg33e/wlf6+/glfhNPziKw GuYC4C/O3yzYfWroF6xyUCk9EPTK4QwDOssWT+b9w296PCFvzpM8Lu7EJtGq4npwl+rmAX SpsH6tUqzwpovdF9rCq1jUiY7VKSbbkualUjSK0WN0XWZiJw+xixFpHf1VPCTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJP86QglzdDj for ; Wed, 19 Nov 2025 10:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eefc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 10:58:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 35c612fbabd8 - stable/14 - tarfs: Fix support for large files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35c612fbabd8a6fd23e65881595873d0797da4b8 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 10:58:20 +0000 Message-Id: <691da2cc.3eefc.7e6b46e4@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=35c612fbabd8a6fd23e65881595873d0797da4b8 commit 35c612fbabd8a6fd23e65881595873d0797da4b8 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-12 21:23:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 10:57:40 +0000 tarfs: Fix support for large files * When fast-forwarding through a zstd frame, we incorrectly used the min() inline function instead of the MIN() macro. The function truncates the result to unsigned int, resulting in a decompression error when trying to seek more than 4 GB into the frame. * POSIX states that a size extended header record overrides the size field in the header if present, and that one must be included if the size of the file exceeds 8 GB (the size field maxes out at 64 GB). * Reduce repetition in the exthdr parser by deduplicating the syntax error handler. MFC after: 1 week Sponsored by: Klara, Inc. Fixes: 69d94f4c7608 ("Add tarfs, a filesystem backed by tarballs.") Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D53718 (cherry picked from commit a34a57d4b4eba88dfa5541d7d77b63b01c1a1a9a) --- sys/fs/tarfs/tarfs_io.c | 2 +- sys/fs/tarfs/tarfs_vfsops.c | 48 +++++++++++++++++++--------------------- tests/sys/fs/tarfs/tarfs_test.sh | 27 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 26 deletions(-) diff --git a/sys/fs/tarfs/tarfs_io.c b/sys/fs/tarfs/tarfs_io.c index a3d8df62d7df..e250c5cbce5a 100644 --- a/sys/fs/tarfs/tarfs_io.c +++ b/sys/fs/tarfs/tarfs_io.c @@ -444,7 +444,7 @@ tarfs_zread_zstd(struct tarfs_zio *zio, struct uio *uiop) } if (zio->opos < off) { /* to be discarded */ - zob.size = min(off - zio->opos, len); + zob.size = MIN(off - zio->opos, len); zob.pos = 0; } else { zob.size = len; diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index a534b18ebf34..e1ba925ccb0f 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -441,7 +441,7 @@ tarfs_alloc_one(struct tarfs_mount *tmp, size_t *blknump) int endmarker = 0; char *namep, *sep; struct tarfs_node *parent, *tnp, *other; - size_t namelen = 0, linklen = 0, realsize = 0, sz; + size_t namelen = 0, linklen = 0, realsize = 0, extsize = 0, sz; ssize_t res; dev_t rdev; gid_t gid; @@ -588,10 +588,7 @@ again: char *eol, *key, *value, *sep; size_t len = strtoul(line, &sep, 10); if (len == 0 || sep == line || *sep != ' ') { - TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", - __func__); - error = EINVAL; - goto bad; + goto syntax; } if ((uintptr_t)line + len < (uintptr_t)line || line + len > exthdr + sz) { @@ -606,16 +603,18 @@ again: key = sep + 1; sep = strchr(key, '='); if (sep == NULL) { - TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", - __func__); - error = EINVAL; - goto bad; + goto syntax; } *sep = '\0'; value = sep + 1; TARFS_DPF(ALLOC, "%s: exthdr %s=%s\n", __func__, key, value); - if (strcmp(key, "path") == 0) { + if (strcmp(key, "size") == 0) { + extsize = strtol(value, &sep, 10); + if (sep != eol) { + goto syntax; + } + } else if (strcmp(key, "path") == 0) { name = value; namelen = eol - value; } else if (strcmp(key, "linkpath") == 0) { @@ -625,47 +624,42 @@ again: sparse = true; major = strtol(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.minor") == 0) { sparse = true; minor = strtol(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.name") == 0) { sparse = true; name = value; namelen = eol - value; if (namelen == 0) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "GNU.sparse.realsize") == 0) { sparse = true; realsize = strtoul(value, &sep, 10); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } else if (strcmp(key, "SCHILY.fflags") == 0) { flags |= tarfs_strtofflags(value, &sep); if (sep != eol) { - printf("exthdr syntax error\n"); - error = EINVAL; - goto bad; + goto syntax; } } } goto again; } + /* do we have a size from an exthdr? */ + if (extsize > 0) { + sz = extsize; + } + /* sparse file consistency checks */ if (sparse) { TARFS_DPF(ALLOC, "%s: %s: sparse %ld.%ld (%zu bytes)\n", __func__, @@ -832,6 +826,10 @@ skip: sbuf_delete(namebuf); } return (0); +syntax: + TARFS_DPF(ALLOC, "%s: exthdr syntax error\n", __func__); + error = EINVAL; + goto bad; eof: TARFS_DPF(IO, "%s: premature end of file\n", __func__); error = EIO; diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index d4de71271985..505bfc5325f0 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -396,6 +396,32 @@ tarfs_git_archive_cleanup() { tarfs_cleanup } +atf_test_case tarfs_large cleanup +tarfs_large_head() { + atf_set "descr" "Test support for large files" + atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" + atf_set "timeout" "600" +} +tarfs_large_body() { + tarfs_setup + local tarball="${PWD}/tarfs_test.tar.zst" + local exp off + for exp in 31 32 33 34 35 36 ; do + for off in 1 0 ; do + local size=$(((1<; Wed, 19 Nov 2025 11:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJhd0bRmz3R8n for ; Wed, 19 Nov 2025 11:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8aAsuH5mU48rZGdAFU0clLA6LETT92nZFARECyzRKYI=; b=xywfzdjPf1fNxX8ZoiiZuZZaqBMNwzN30gwZa/eD03zduKg0e+mdfoj6LtJ57yNKJHL8G8 eHpA73PtkaLWAT94kA10/I2UHmwOOJUtO4o7Px8eoR5NeyVg83J0XVkJzm6QxKkR9rfHy7 udHhxcnKY3Q2Q2rrOziQrDRMVBTA/8BApzGSsboebwlNMrfcL52L0r/yTCgsDibJUz6fPT IXR3lXI9QO/iGHf121ymZKYxGcCJbgX2RKhiqOwKVHMkvs6DNw+MlBfxODMKKyKpeXneh2 tBhEBWw3+xscowUkDT2Z/FcN8GuSI2KnyClrkbOr97mb9CA24smrorrKKbgkHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8aAsuH5mU48rZGdAFU0clLA6LETT92nZFARECyzRKYI=; b=R53Xe9ysWYAsUWlYuQHQuZ0QOqEPqcT8yEnGmuxvr8fB5Ghi2tqcx4RcVLD8JLU0MxKM1t GbLAlVl6QSoOcTFouZXkEEHd5utav1yUfj8YwXdh6hXaukgAMQxXNpgHbD/i+UfNvCv2y7 spbp78Us4yp/YetCPEBkfeNensgMWBDyS2e1kC+ZiC2gxwyDbAH+QAL8BnC2q22ACfnRwf GIoOCqRaGZqpeGF/+aEybx0PyKSELL2bjNzpw4xuIcsjlc/Neli9h8htAaSWCeXdI3yR4q jO2NLjSvq086T7U5yYWszwtkrVdTubUcqDhRjNyDF02131IPE3IKpxfso3ba+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550705; a=rsa-sha256; cv=none; b=DQEf+LYtmcqBu8Wmp4xnCwyha/BfvYT6dJUjYILLE3zNg6pHNItlgpQ7y5kyiOMHilZNLQ WNUPyXl2KWimM3wgwp1Zu09GfU/pNGYLMJKWWsM8qLAYWiC6a8LwTTm6Nj3yBoFhM0YTbF E2Jnw1+rTkYvjJavpJth6KS4uipZRSV+oyogqh9S163OQjXBViB5yiruzwwAL7q4pBraa8 bPd3v06sqZCF41HrCqaiXbBsCC5uFEgEI0186sIu4Skb9vqox8c0ujMHw0S7nltY/w+bwr xt2vXEOLZC3OKiiHrpe7VPCgJuR0r3Z66JnFktjjZAQ0MaNwcHJ1xYsTFACLzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJhd0BPCzdgP for ; Wed, 19 Nov 2025 11:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id aae5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:11:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: b709dbfe4875 - stable/14 - refcount.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b709dbfe4875e3ac8bd2d25d8c500886668e0d23 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:11:45 +0000 Message-Id: <691da5f1.aae5.77a2fbc7@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b709dbfe4875e3ac8bd2d25d8c500886668e0d23 commit b709dbfe4875e3ac8bd2d25d8c500886668e0d23 Author: Gordon Bergling AuthorDate: 2025-10-26 15:49:28 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:11:33 +0000 refcount.9: Fix a typo in the manual page - s/sucessfully/successfully/ (cherry picked from commit 40fae644ba9a27227ca6f7c290e54fcef462b341) --- share/man/man9/refcount.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/refcount.9 b/share/man/man9/refcount.9 index 78631f9a865a..7375f429a607 100644 --- a/share/man/man9/refcount.9 +++ b/share/man/man9/refcount.9 @@ -106,7 +106,7 @@ but additionally checks that the value does not overflow as result of the operation. It returns .Dv true -if the reference was sucessfully obtained, and +if the reference was successfully obtained, and .Dv false if it was not, due to the overflow. .Pp From nobody Wed Nov 19 11:12:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJjD4LPhz6HXkm for ; Wed, 19 Nov 2025 11:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJjD3PQnz3Rjv for ; Wed, 19 Nov 2025 11:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EkskUM5uKi6SeUnfxIF/QLOVPrDUmKgkf4AeN6dmakY=; b=cl1W9nt5AN0bWpF2Ac9jg450e6XL0SYZBKSAdCY0juquE39hcmzMbbVTsKEvFMvKCL97cP uQo+TFR/hjEzYntvD+AbT1sVrThXRJxaX25hQFnSvTKLZpAfuUQluahuU9po5NcpYAnblA YLDGHF32/rWNeDf5Pee7Ht50JqIiPIBtLpWNLzYiLJovOaG8ieYujxWh8cLmwcugocqBDc nTH8WUiQ74BzoPy5CpJmWEGoki9CdJMVRBqd6XcVvw3+Gams5ptjsZqgp8qkJ48o7qQSow ppJZyPAQs6aIx4obeXXAyfjdyQ4pEHrzOnTRh56jrUep7CvHPSASaK+pJ6nHdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EkskUM5uKi6SeUnfxIF/QLOVPrDUmKgkf4AeN6dmakY=; b=WotFf36aqNn91fpniwYhZW88rJ0sVPzy5oKlKVnNpztqGX3MXHDIOScSCudTpO2VfSQZoY DeRlUDF21J25ddEmEPvEaQogvJnomLYO7O2rjUC41aSmjY4Qx0t5TEs3uzezq0rRZzpADs 2DWThedo1fCCXD0436W7CglvDWiHo0eq3KGhc623bWI7559uNA09iNAG8fjDh/QeWW17a9 XdtVyXZkBBU0uGwltpfOs24kt7vFTSX+XHUJ7fL2W1Q7h1w71Bem8TB4ZTmbn4AeChirxJ jwXcI29mo+TsOSDED3ou/m3HPKZXCXytrwlUddHGC3++04X/cp6iZ0Nv4PfusA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550736; a=rsa-sha256; cv=none; b=yOjMEZJ+MdNdVBC4SZA/mCtGeh1QqGGMQFv3ECcRIfLEDjxcjowhjNYBHsXMgQgxdUevVJ tytwpd+lkXyCy3kXPNzBkdoeUTfiC6ZUweAhR1kHZFtfAxt+ncb+Uwk4kG/QTNzUIicCpS 9GyIWQnS6TdbVWJ6KVxhgBgdQOgSqo/st3yrZOXWNtw+imiJlM4U2lYR3iEyl+ocsITJIf rIK0Zj7xHxIZt5OCmIvSGqpZvgOI49kCyP0UfZqCogR4uqzk/XN5jFu37tC8rCAKjhtGQ9 XKH5jud5zGDAZzGDVXYWgN3TRz/P5k7u/gGHVHg/Gn8CWokGS6cOJufQ+RwlNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJjD2x56zdgX for ; Wed, 19 Nov 2025 11:12:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a3e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:12:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 695ff7a3a562 - stable/14 - seqc.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 695ff7a3a56278d642fb74677770c98060c320dd Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:12:16 +0000 Message-Id: <691da610.a3e2.23467b4b@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=695ff7a3a56278d642fb74677770c98060c320dd commit 695ff7a3a56278d642fb74677770c98060c320dd Author: Gordon Bergling AuthorDate: 2025-10-26 15:50:26 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:12:05 +0000 seqc.9: Fix a typo in the manual page - s/changees/changes/ (cherry picked from commit fe45f7ddb53f16198a60cd015c20f5fc524aed89) --- share/man/man9/seqc.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/seqc.9 b/share/man/man9/seqc.9 index e13d73ecb5d7..b1e59b6b7af1 100644 --- a/share/man/man9/seqc.9 +++ b/share/man/man9/seqc.9 @@ -81,7 +81,7 @@ repeated. In case when sequence number is odd the object change is in progress and the reader will wait until the write will the sequence number will become even. .Sh EXAMPLES -The following example for a writer changees the +The following example for a writer changes the .Va var1 and .Va var2 From nobody Wed Nov 19 11:13:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJkN6dhMz6HY4k for ; Wed, 19 Nov 2025 11:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJkN67Y5z3SRX for ; Wed, 19 Nov 2025 11:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8LfFywjWHELfBP1rh6bCb1x/s70geK6mAzMkIturl0=; b=p00POBN/ghtfO4n+vQVX27LHgbJoLryEW/vXGz+j+6JgaggLHGTdWTe6avMIwwbBPWYsO7 9pLk1lHLIRRBEprqkSzguE6QR5NrT0xSWidnpiWpjQ3dwRXFVR+3l0Syy5H7PLZIZsSpFj yHLFjKsfaG2UsFe6hZO8dhhQOTNEqt1gDwcP+YZck2Xh1Z+m8tmhG4CzRuECvXb9y9ZxA2 /elat0Zg+WsrRGMtJ9NoNcvPhyCkt9qAeVLioLGnGTciC31ap4udoV0djkJIz/bq3GaDwF RvB/kvL/fSM9wtx4qPsmGrlnN0L6HACyOnmGYrk0nrtAPwQFEXDjP4wW8pgWVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8LfFywjWHELfBP1rh6bCb1x/s70geK6mAzMkIturl0=; b=ISsBA2SLVnDudcp+g53CiSPI+OsAhX61A3GMOYHAlaFn6w1Pi+I4kBTvu3srD18gY/fU1C ZskZG9wHPnytauz29WQaTBGP+vzEYT2mdlNQWWbfqtN5BJHp06t5sAhdDWNl4XMUu9HFkT eqJnCgWmqd6y5/ne0opgCxK0+efkY291Qai4UfToOocd/j2s59BA27N7eqNlhne0Ju+EaV jdimy9WLcEya3WGwe8hsDtoFmwwHCfpnEJH8RBux3HsmWFJRfsqQUgBPRlefNCjt7uCP0m oqucVk5Eo/oePlor0pz2T2H46CGaMr75wY0H9z9g9rUbhyNUUIMp/7tBvsnAAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550796; a=rsa-sha256; cv=none; b=rNiciTnsBCemxTUNrlaIe7nT14MBdJvObZ7MHepdrm/Bvc1fs3Dm/E3FkayhTAIb9NVpRF 2yfguZi7IgGNfmjc5RyITOikNE7TcxmRfyD64ejHNU5tsSR8wdkUHHDcUQctlI3278oDY4 7nAeHYewQJykTE+M4th3Ln38X4Sbu9vJ7dvivRo+PulYN7tyIhOe4y3OvhVmPX3zO3Llaw COkrCvhsho2+MniZC1UBFoVzQrCU0uhtVkcUqF22+InEadyczWLqyjZ7aff/y/ByQeryhw RCqmladgmUXeHnDFnKLFqKPB10e70KEIiiXFPoYWQoh8S8PYfbZ7NK2K9eM5jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJkN5f7szdgt for ; Wed, 19 Nov 2025 11:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 99cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:13:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 727a1f189d28 - stable/14 - vn_fullpath.9: Fix two typos in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 727a1f189d2871bb3a45d28e9d286e534930622c Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:13:16 +0000 Message-Id: <691da64c.99cb.1ce987f8@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=727a1f189d2871bb3a45d28e9d286e534930622c commit 727a1f189d2871bb3a45d28e9d286e534930622c Author: Gordon Bergling AuthorDate: 2025-10-26 15:53:22 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:13:05 +0000 vn_fullpath.9: Fix two typos in the manual page - s/resulting/resulting/ - s/initally/initially/ (cherry picked from commit 3b79697040a7d3f9a4a21fb2e66d9031feb6af84) --- share/man/man9/vn_fullpath.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/vn_fullpath.9 b/share/man/man9/vn_fullpath.9 index 9815abc3c86c..af459ed281c0 100644 --- a/share/man/man9/vn_fullpath.9 +++ b/share/man/man9/vn_fullpath.9 @@ -107,7 +107,7 @@ than one name (hard links), not all file systems use the name cache be used for more than one file (in the context of file systems covering other file systems); a file may have no name (if deleted but still open or referenced). -However, the resulting string may still be more useable to a user than +However, the resulting string may still be more usable to a user than a vnode pointer value, or a device number and inode number. Code consuming the results of this function should anticipate (and properly handle) failure. @@ -187,7 +187,7 @@ otherwise, an error number is returned. .Xr free 9 .Sh AUTHORS .An -nosplit -This manual page was initally written by +This manual page was initially written by .An Robert Watson Aq Mt rwatson@FreeBSD.org to describe the .Fn vn_fullpath From nobody Wed Nov 19 11:13:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJl05Kp1z6HYBJ for ; Wed, 19 Nov 2025 11:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJl03DYPz3Sdn for ; Wed, 19 Nov 2025 11:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jvjuoAlowXEXLdTIPgfGiKa0LLRODeGhuHlsxOD8xLo=; b=YfGpeYFxdJdJOWR8MTfckrwsNgSDAYtRabbwUYhmSPLTqYHUWaAiiOBkdDV/1Us0e13jSQ htOzvPtPb7uDrCoZSqZHQ3yakFSW1nVQu2u+I77D4Z8QXpXkC02pLCaOeTDrlizohiQqI+ H5wefDb+IeiX0cUf2g6fNcdbdVG86F4+fAa+SbnrDoQhVbe19/yV/ITwhpo/nfrX0Nxfft qDBw6A3x6AA8aeVHEYxqJ/UI+w8K0KZ7pJebyXoX0R/0OlIc046NAUdLXpvLU9pW+XwrQ2 oBrr56Vpo3fuiPcMD2ShKi3w3+pPG52hU6FB+TYSt0gujslC7ZdG6PeaZrrW7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jvjuoAlowXEXLdTIPgfGiKa0LLRODeGhuHlsxOD8xLo=; b=tNhdtVoSOlc2u0TzyqgJNCKvZIEDmmwG2ZXXbOka/9ZrG7yQdFRl0lbPGoVibD/xKubUVN 0D7vA4EnvB69ZIk1yhp1EPoed7e2BzYoev/4GkzQYmSNOea9R5UcZRsng5mAlXv8VrUdLY dXhjTykt/Z269Wtw/YU1Lzqv7FCGUVOdMIlS4eeE7xtoDhTR4qHMXK7UliMP3F4ys8M8a9 f4hA1xQlCoRsQ//GKCQa1Qgo+B54Eey3rSWhyRTc8yDpBoYOfSmf6W4KccHjzSYae9BWg9 P3fR/YxpMJpGpMv/digNwQ46VmCf4gHEypL27wa3+QpHUEGGLRDraiGKlCXjbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550828; a=rsa-sha256; cv=none; b=BNdB9KnqyBoNcTDpXtLJ3jmQMvRypVWE0wI1TAS8L6eiKoPxfhGD7V7b3ZxJhIWjs0+hXQ GKAkE6zXcpT1iFLezMkQhpfp3cQBibdpEPx1WYgDQABPLB1UbffDNqUOT66z3Ekr9jcEGg yj4I1Myz7RLU4r247MhnlbVCIvmsaNC+zPvgDwgbEykhJwnnKTw+xOeyyvpNjdkhNOopR/ R0vIKW+xWDjpyNanXg0Q/hD31XHfqCbFb2Y2uo97yKphpKaK7sHQs16SLc7nSWeA5n1afH lO27Acl5ToOuBBoLcgUdXIGhX3DAkLzhErwRkle5cmCOZUkssqsEzbocxzu2sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJl02ptBzf5l for ; Wed, 19 Nov 2025 11:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9cdf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:13:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 305382935a4f - stable/14 - arm/nvidia/tegra: Fix a couple of typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 305382935a4f9fb687f02d36efc2814c5bf88fb7 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:13:48 +0000 Message-Id: <691da66c.9cdf.41d064ff@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=305382935a4f9fb687f02d36efc2814c5bf88fb7 commit 305382935a4f9fb687f02d36efc2814c5bf88fb7 Author: Gordon Bergling AuthorDate: 2025-10-28 08:04:33 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:13:36 +0000 arm/nvidia/tegra: Fix a couple of typos in kernel messages - s/intialization/initialization/ - s/Cannott/Cannot/ - s/ivalid/invalid/ - s/wating/waiting/ (cherry picked from commit b87836e824ea40793317d551eb13a8e2814f83f9) --- sys/arm/nvidia/tegra_ahci.c | 2 +- sys/arm/nvidia/tegra_lic.c | 4 ++-- sys/arm/nvidia/tegra_mc.c | 2 +- sys/arm/nvidia/tegra_xhci.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c index b2ca1f9e496b..3f314af2f098 100644 --- a/sys/arm/nvidia/tegra_ahci.c +++ b/sys/arm/nvidia/tegra_ahci.c @@ -526,7 +526,7 @@ tegra_ahci_ctrl_init(struct tegra_ahci_sc *sc) rv = sc->soc->init(sc); if (rv != 0) { device_printf(sc->dev, - "SOC specific intialization failed: %d\n", rv); + "SOC specific initialization failed: %d\n", rv); return (rv); } } diff --git a/sys/arm/nvidia/tegra_lic.c b/sys/arm/nvidia/tegra_lic.c index e1d641635351..6956dc0ca849 100644 --- a/sys/arm/nvidia/tegra_lic.c +++ b/sys/arm/nvidia/tegra_lic.c @@ -213,12 +213,12 @@ tegra_lic_attach(device_t dev) } sc->parent = OF_device_from_xref(parent_xref); if (sc->parent == NULL) { - device_printf(dev, "Cannott find parent controller\n"); + device_printf(dev, "Cannot find parent controller\n"); goto fail; } if (bus_alloc_resources(dev, lic_spec, sc->mem_res)) { - device_printf(dev, "Cannott allocate resources\n"); + device_printf(dev, "Cannot allocate resources\n"); goto fail; } diff --git a/sys/arm/nvidia/tegra_mc.c b/sys/arm/nvidia/tegra_mc.c index 4c567657a96b..76fe51b63f50 100644 --- a/sys/arm/nvidia/tegra_mc.c +++ b/sys/arm/nvidia/tegra_mc.c @@ -157,7 +157,7 @@ tegra_mc_intr(void *arg) if (stat & MC_INT_DECERR_VPR) printf(" - VPR requirements violated\n"); if (stat & MC_INT_INVALID_APB_ASID_UPDATE) - printf(" - ivalid APB ASID update\n"); + printf(" - invalid APB ASID update\n"); if (stat & MC_INT_INVALID_SMMU_PAGE) printf(" - SMMU address translation error\n"); if (stat & MC_INT_ARBITRATION_EMEM) diff --git a/sys/arm/nvidia/tegra_xhci.c b/sys/arm/nvidia/tegra_xhci.c index 2c2c69d177ea..3f0211f3ade4 100644 --- a/sys/arm/nvidia/tegra_xhci.c +++ b/sys/arm/nvidia/tegra_xhci.c @@ -818,7 +818,7 @@ load_fw(struct tegra_xhci_softc *sc) DELAY(100); } if (i <= 0) { - device_printf(sc->dev, "Timedout while wating for DMA, " + device_printf(sc->dev, "Timedout while waiting for DMA, " "state: 0x%08X\n", CSB_RD4(sc, XUSB_CSB_MEMPOOL_L2IMEMOP_RESULT)); return (ETIMEDOUT); @@ -835,7 +835,7 @@ load_fw(struct tegra_xhci_softc *sc) DELAY(100); } if (i <= 0) { - device_printf(sc->dev, "Timedout while wating for FALCON cpu, " + device_printf(sc->dev, "Timedout while waiting for FALCON cpu, " "state: 0x%08X\n", CSB_RD4(sc, XUSB_FALCON_CPUCTL)); return (ETIMEDOUT); } From nobody Wed Nov 19 11:14:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJlb2KHgz6HYDD for ; Wed, 19 Nov 2025 11:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJlb1d8cz3Ss4 for ; Wed, 19 Nov 2025 11:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0yKJPYafwftXPy2bBu2s14hW+T9t04D2OYT4Jmjc5A=; b=m1oHJ6M+ITi6krGQoLXV+OAxRdE4WqxmOSZrzD/6ERVy1yOpygHEtTortHJ0eVE88QtOd8 qeJ4Nuiro3EH2hueMEeQjNhjd9ydbotNJKiF1XynXuWpLa2tDYn/dUr37QMFdPhpvQ+8Eb 7lBZ0fUmxFo1TF8w0z5zTw9E4uKotdkqHPeoJ3GtYKnQX+viBpMS7oUmV0/oGhk0ZqHWot grAkpaP8bXNuueaUiI+arQRFrdk8MjPAf4DFjYQdEG35DsbEjL4Y9jTfP+zB0YQOj3539S 08USqBL1Msdq8U7M6gdCR57KIwdVz7YnZwuHgAcF4LcF8P1VO+3rjQf+9p1p2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0yKJPYafwftXPy2bBu2s14hW+T9t04D2OYT4Jmjc5A=; b=QWyBfCPGkSG8Pss4nBd1xD6Z2QHy7g82SHkcsNXCzoc6fqLyn+8KjskuIb6LJCmov2LF4H VztKp0nZ2dltuQl1AkIPS4Ko3o9fjSN+3HpXjIDIKalbj3JnvhHrIWQfbsOX4bAo0ZQ2jl /v9ICVVR4sARnY2xxjJw7j+Us+KVFQs3nozjBq+u8TgSGP5qScCDW3mcrikfYFWUWO3wbm lMGIS/TlamoMP6OZeyG8EQue7/QBTGg+LIChYBFyIAnqFTjZMR27OQLy859MtpLKYb2kV5 jrcvrnTgLbuwA8I8x59qHbW1DrDAQmWTtIhe8zO37vblUj4PFMoylcgKrMKM7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550859; a=rsa-sha256; cv=none; b=s22rGHaSYG1DbrQsHwaTq79/Hn4XQBaD4jDXk6+pbT5EbAmBQ3CmXQwC8DapydZ5VpcOLJ AHUTxuYdOt+uwjeEXW9l/h/6p1+4lfY5GCdEZ7YLGv1j2OKKuIOowQ6jgCSvQlCpSgIUAA ih0d/kFzrbL9KuEWxWiOKIcldInghpUt0xYkNBVPU8wM99Z4PKsOGWp+vtGq77wlDNX/7x wo7Orbaw9pi1dSBdPhz/sfCluHWDwg/NwZXv6srmQ7fen/kgxM+f3zd3mIOyrz8ir/tbFV QZ/OIcddtioyXYno5zRv31F0xz1ZbbJdMQd502tasnYpqngGFEpq4RUB/p/kQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJlb17BCzf5m for ; Wed, 19 Nov 2025 11:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ac0b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:14:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 28fd874b5628 - stable/14 - hyper-v: Fix a couple of typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 28fd874b5628699590207f16fbb76a7862bced7a Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:14:19 +0000 Message-Id: <691da68b.ac0b.2d3a92ef@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=28fd874b5628699590207f16fbb76a7862bced7a commit 28fd874b5628699590207f16fbb76a7862bced7a Author: Gordon Bergling AuthorDate: 2025-10-28 08:07:28 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:14:09 +0000 hyper-v: Fix a couple of typos in kernel messages - s/tranparent/transparent/ - s/Unknow/Unknown/ - s/qury/query/ (cherry picked from commit 1ef6fef9d5c82a106ba8e42c1e087f9b5d1dfec6) --- sys/dev/hyperv/netvsc/if_hn.c | 6 +++--- sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c | 2 +- sys/dev/hyperv/utilities/hv_kvp.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index db5ebdfd65bc..24b0beac8075 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -3574,7 +3574,7 @@ hn_rxpkt(struct hn_rx_ring *rxr) } /* - * If VF is activated (tranparent/non-transparent mode does not + * If VF is activated (transparent/non-transparent mode does not * matter here). * * - Disable LRO @@ -3591,7 +3591,7 @@ hn_rxpkt(struct hn_rx_ring *rxr) do_lro = 0; /* - * If VF is activated (tranparent/non-transparent mode does not + * If VF is activated (transparent/non-transparent mode does not * matter here), do _not_ mess with unsupported hash types or * functions. */ @@ -7601,7 +7601,7 @@ hn_sysinit(void *arg __unused) */ if (hn_xpnt_vf && hn_use_if_start) { hn_use_if_start = 0; - printf("hn: tranparent VF mode, if_transmit will be used, " + printf("hn: transparent VF mode, if_transmit will be used, " "instead of if_start\n"); } #endif diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c index 70a5f414d986..f668405e3219 100644 --- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -2088,7 +2088,7 @@ create_storvsc_request(union ccb *ccb, struct hv_storvsc_request *reqp) break; } default: - printf("Unknow flags: %d\n", ccb->ccb_h.flags); + printf("Unknown flags: %d\n", ccb->ccb_h.flags); return(EINVAL); } diff --git a/sys/dev/hyperv/utilities/hv_kvp.c b/sys/dev/hyperv/utilities/hv_kvp.c index 92dc8ccb1db3..29f1ca4fcaa0 100644 --- a/sys/dev/hyperv/utilities/hv_kvp.c +++ b/sys/dev/hyperv/utilities/hv_kvp.c @@ -622,7 +622,7 @@ hv_kvp_process_request(void *context, int pending) } else { if (!sc->daemon_busy) { - hv_kvp_log_info("%s: issuing qury to daemon\n", __func__); + hv_kvp_log_info("%s: issuing query to daemon\n", __func__); mtx_lock(&sc->pending_mutex); sc->req_timed_out = false; sc->daemon_busy = true; From nobody Wed Nov 19 11:14:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJm84cJSz6HXmT for ; Wed, 19 Nov 2025 11:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJm83lwkz3T6P for ; Wed, 19 Nov 2025 11:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPeQsf1OFI1D6ImgydGO/UMGfsusn3mcStIGjGVX1bg=; b=bi3/CDYyblOGRRCl3q6/+bu1KZgCLa0YOf/4dwNXOxjyPnQT7pc7HDIHJTMXOyJARLLT5Y a2OSIsAXoi+HfuddpIXttluufog9y/eWpZdCFRbAS6P2FixZ38yc/+ZVXJBxsN43ZzZkF1 dOBAk3OfUcQZqTzYEvaBhGq/U7jrwOLdJp3/zxy01Iboef5aD2YAcRs7S+iNqZvYDHR+PB Jikv1nGGVgROcX2A7FWOncof+B2k0R/mgOm7i9IMM8iPYGNXYtkR8lOMSBVmCYypKLh91+ 6f19pcSQlTis21KpYO/jchMrrnJHANgsE9b/malmUIEq3mHxkhcCGU/nmEemSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPeQsf1OFI1D6ImgydGO/UMGfsusn3mcStIGjGVX1bg=; b=V5fzudO8h5OxqDl8TQsSDZKqvkhY6MqgfYerPIHwioqcY9iNNp696kXxjyRTXccVPDBmN6 Ih64Jp+Ux2GOqXPJdxs5fA2zym2y662VvmAYBj+u09DUzdNrgclJdwjRfzgpM90T+te7G4 9hsm04Nmu6fLrPBEuamJx9/BYnwyPFBWf8MM0o9AJmk/Zv/d+qbkAOQIGm+zDcZ+qVXxuy uNsHHqhLCgc1ADeIJWJCTwuqzRLVV9FXAJRm/lb8YKsEX7ihx4/FMHt9pa1yFZVa/wZC+X Lkqh8KNgjvS63Fc8RvxtglCPo8lHeaH0m7WdjHW+MGBmqHiYUv29VIrD34azjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550888; a=rsa-sha256; cv=none; b=nu8E/BMraHnGDRsKICmgKP+FuRolRB0KthRAmlSs1YZZ8Nd4muOid4PxIfXg98QiKU/9eI FX8cDps5vNURQRC2TjA9RNg67WWFIsqdjNK5xrWWsufzLy30zA6i8WRZ4oa8FaXSyp7PGe XBITEHT3tmdfeZeplSqo7xRmX2v0ZHAEoS5r2yAnxAZIbCr1Aq+cLP4NKvh9iBiqTRkmaB qAdERsuR8RgEUiLoX8Bs69A+Eub0xzxPesdrENVjIS/mbqCQLUOyI20Fg6HuX3B3rgTcHa +Xr0Vbl3ynk1p2bcsGlbA9FkLRtQ1SDL38k/QBM6pxtespjj1O40KRkfbpnRPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJm8378LzfDy for ; Wed, 19 Nov 2025 11:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9c2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:14:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8f381ddfa4fc - stable/14 - ocs_fc(4): Fix a couple of typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f381ddfa4fc9943c1b7c1e75fd2eb0020e9caa6 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:14:48 +0000 Message-Id: <691da6a8.9c2d.5a5c0f4d@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8f381ddfa4fc9943c1b7c1e75fd2eb0020e9caa6 commit 8f381ddfa4fc9943c1b7c1e75fd2eb0020e9caa6 Author: Gordon Bergling AuthorDate: 2025-10-28 08:11:11 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:14:36 +0000 ocs_fc(4): Fix a couple of typos in kernel messages - s/unexpectd/unexpected/ - s/Unexected/Unexpected/ - s/niether/neither/ - s/sucessfully/successfully/ - s/Inavlid/Invalid/ - s/toplogy/topology/ (cherry picked from commit aa0cd9e5b4d21b11097e1c21a3c0eb23525c15c3) --- sys/dev/ocs_fc/ocs_device.c | 2 +- sys/dev/ocs_fc/ocs_els.c | 4 ++-- sys/dev/ocs_fc/ocs_gendump.c | 4 ++-- sys/dev/ocs_fc/ocs_ioctl.c | 2 +- sys/dev/ocs_fc/ocs_scsi.c | 2 +- sys/dev/ocs_fc/ocs_xport.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_device.c b/sys/dev/ocs_fc/ocs_device.c index 7f0c5526b1c3..d9c283541d3c 100644 --- a/sys/dev/ocs_fc/ocs_device.c +++ b/sys/dev/ocs_fc/ocs_device.c @@ -825,7 +825,7 @@ __ocs_d_init(ocs_sm_ctx_t *ctx, ocs_sm_event_t evt, void *arg) ocs_node_transition(node, __ocs_d_wait_topology_notify, NULL); break; default: - node_printf(node, "received PLOGI, with unexpectd topology %d\n", + node_printf(node, "received PLOGI, with unexpected topology %d\n", node->sport->topology); ocs_assert(FALSE, NULL); break; diff --git a/sys/dev/ocs_fc/ocs_els.c b/sys/dev/ocs_fc/ocs_els.c index c62f71d4eb4f..cf4f01477f69 100644 --- a/sys/dev/ocs_fc/ocs_els.c +++ b/sys/dev/ocs_fc/ocs_els.c @@ -314,7 +314,7 @@ _ocs_els_io_free(void *arg) ocs_list_remove(&node->els_io_pend_list, els); els->els_pend = 0; } else { - ocs_log_err(ocs, "assertion failed: niether els->els_pend nor els->active set\n"); + ocs_log_err(ocs, "assertion failed: neither els->els_pend nor els->active set\n"); ocs_unlock(&node->active_ios_lock); return; } @@ -363,7 +363,7 @@ ocs_els_make_active(ocs_io_t *els) } else { /* must be retrying; make sure it's already active */ if (!els->els_active) { - ocs_log_err(node->ocs, "assertion failed: niether els->els_pend nor els->active set\n"); + ocs_log_err(node->ocs, "assertion failed: neither els->els_pend nor els->active set\n"); } } ocs_unlock(&node->active_ios_lock); diff --git a/sys/dev/ocs_fc/ocs_gendump.c b/sys/dev/ocs_fc/ocs_gendump.c index 83155d90c3a3..6a1abfefadfc 100644 --- a/sys/dev/ocs_fc/ocs_gendump.c +++ b/sys/dev/ocs_fc/ocs_gendump.c @@ -153,7 +153,7 @@ ocs_gen_dump(ocs_t *ocs) ocs_log_test(ocs, "Failed to see dump after 30 secs\n"); rc = -1; } else { - ocs_log_debug(ocs, "sucessfully generated dump\n"); + ocs_log_debug(ocs, "successfully generated dump\n"); } /* now reset port */ @@ -219,7 +219,7 @@ ocs_fdb_dump(ocs_t *ocs) return -1; } - ocs_log_debug(ocs, "sucessfully generated dump\n"); + ocs_log_debug(ocs, "successfully generated dump\n"); } else { ocs_log_err(ocs, "dump request to hw failed\n"); diff --git a/sys/dev/ocs_fc/ocs_ioctl.c b/sys/dev/ocs_fc/ocs_ioctl.c index 71ba17d5f72a..d3cea434b2be 100644 --- a/sys/dev/ocs_fc/ocs_ioctl.c +++ b/sys/dev/ocs_fc/ocs_ioctl.c @@ -796,7 +796,7 @@ ocs_sys_fwupgrade(SYSCTL_HANDLER_ARGS) break; default: ocs_log_warn(ocs, - "Unexected value change_status: %d\n", + "Unexpected value change_status: %d\n", fw_change_status); break; } diff --git a/sys/dev/ocs_fc/ocs_scsi.c b/sys/dev/ocs_fc/ocs_scsi.c index af9fc798b01c..1bbf60b9014b 100644 --- a/sys/dev/ocs_fc/ocs_scsi.c +++ b/sys/dev/ocs_fc/ocs_scsi.c @@ -720,7 +720,7 @@ ocs_scsi_build_sgls(ocs_hw_t *hw, ocs_hw_io_t *hio, ocs_hw_dif_info_t *hw_dif, o case OCS_HW_DIF_BK_SIZE_520: blocksize = 520; break; case OCS_HW_DIF_BK_SIZE_4104: blocksize = 4104; break; default: - ocs_log_test(hw->os, "Inavlid hw_dif blocksize %d\n", hw_dif->blk_size); + ocs_log_test(hw->os, "Invalid hw_dif blocksize %d\n", hw_dif->blk_size); return -1; } for (i = 0; i < sgl_count; i++) { diff --git a/sys/dev/ocs_fc/ocs_xport.c b/sys/dev/ocs_fc/ocs_xport.c index d997ea245132..9e69bf0ed98f 100644 --- a/sys/dev/ocs_fc/ocs_xport.c +++ b/sys/dev/ocs_fc/ocs_xport.c @@ -482,12 +482,12 @@ ocs_xport_initialize(ocs_xport_t *xport) /* Setup persistent topology based on topology mod-param value */ rc = ocs_topology_setup(ocs); if (rc) { - ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); + ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc); return -1; } if (ocs_hw_set(&ocs->hw, OCS_HW_TOPOLOGY, ocs->topology) != OCS_HW_RTN_SUCCESS) { - ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); + ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc); return -1; } ocs_hw_set(&ocs->hw, OCS_HW_RQ_DEFAULT_BUFFER_SIZE, OCS_FC_RQ_SIZE_DEFAULT); From nobody Wed Nov 19 11:16:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJns4411z6HY12 for ; Wed, 19 Nov 2025 11:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJns0CJmz3TSL for ; Wed, 19 Nov 2025 11:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/3+0oevW5kAO1/r9wX4p2qFqNDz+IveAnE4Qdv0NrAA=; b=yPw2mXWghZWfbmbZEXn1BS9u+WqG76hIIu1g1086Ip3AXH86H1gDLlcNWkzGmB3voT30Ws fLLNLUn7YZNRT4/d6bZvGN9yx6e5WavfPxPtyZXv5lPrl5rDEJ09unqtbVfOPRBni6PKIH +JzJEFQ39nT5aC658aonYYRcdSVZHXpzgtw0/nkGY2pgIyaCmPg98RJYA+taPppg4nA1E5 I2EA++tQU5ztAlrjcuYzRWdSfENuaPMblzCG5BGRKpZ2PnfFuyxhBYCP/CZPFK8XyafaMr fV3ZMKSeSs4/5P2oGF4z4rO30j3bfa/6FOSszNeP3lZeqDzDwchZHMRwoWo6ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763550977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/3+0oevW5kAO1/r9wX4p2qFqNDz+IveAnE4Qdv0NrAA=; b=Xw7lfKAlcBvCv5vr1A/pgit1GALtEzfrJgGCG3/6HrolMnAtMc9Jx9e2U5tp8t410bSwji oO2vLeoPUMHFmG8dP2IYMiFwF7PLg9NeMIjqyk7r8jzL1GsHOHVZ9Arj0P750N1fVbJFpK 3XXKfqXdeoQhYHItgRcjiXYohIDqtrsLma2bj0VKHktGyGQdilO44vywHDFJV367HbRruu OW2NnniotsMD6FdiVJKl9qWH2IADQhnV/170DyVJVOa4pIZ+apTspwIQdWc7gwXuj9hUyQ i7MEAVI0c/8nManhZFHhfm/lm2G3pvdTELtnGjvMq+qp4OKN8MXl4VPZuZmEvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763550977; a=rsa-sha256; cv=none; b=ufcDh8I7D58B0Ip0gxn7CoJUwTb3pbopAKZi5NyeGmD0wr8SBCj5S3wm+vlFTAReAhjnx/ ctAXyhuhhSvrye2p/E8h+b7YXjOiKV1+68mZMAmKIwU5ANijLUiZrjSCi7GxdEMX3gjzLy MLHUNP9Ep4WE4oBJZM4UUJmXqnP2oSHBSjfluTiXXNZwXS0Z/2CtddVnIM48hL0z6cW2Sg Mmo3Lsnn/G/z7/wBJxi/yuKA5CTxiQdWlI9w+mfDTyIjtxraNGfLmZZ30JltQJyGBx3W+3 gAt3vo0wkGlLkpbNNWIaGDw2vfy5O7wz0XExqFuoqbSx812v5RF7aomeYaNB6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJnr6PxLzdm7 for ; Wed, 19 Nov 2025 11:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9f6b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:16:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f48472795049 - stable/14 - cam: Fix three typos in kernel messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f48472795049ea612dc062d1de04dabd41e3fdfb Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:16:11 +0000 Message-Id: <691da6fb.9f6b.e3d6daf@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f48472795049ea612dc062d1de04dabd41e3fdfb commit f48472795049ea612dc062d1de04dabd41e3fdfb Author: Gordon Bergling AuthorDate: 2025-10-29 08:23:51 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:16:01 +0000 cam: Fix three typos in kernel messages - s/maximun/maximum/ - s/queing/queueing/ - s/exhausing/exhausting/ (cherry picked from commit adfe14dcc2747a20dff961044d6817c507087327) --- sys/cam/ctl/ctl.c | 2 +- sys/cam/scsi/scsi_enc.c | 2 +- sys/cam/scsi/scsi_enc_ses.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 0c2c21ba42fa..b60a63e66032 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -2149,7 +2149,7 @@ ctl_remove_initiator(struct ctl_port *port, int iid) mtx_assert(&softc->ctl_lock, MA_NOTOWNED); if (iid > CTL_MAX_INIT_PER_PORT) { - printf("%s: initiator ID %u > maximun %u!\n", + printf("%s: initiator ID %u > maximum %u!\n", __func__, iid, CTL_MAX_INIT_PER_PORT); return (-1); } diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c index f93fd6e31861..4f779317b24d 100644 --- a/sys/cam/scsi/scsi_enc.c +++ b/sys/cam/scsi/scsi_enc.c @@ -734,7 +734,7 @@ enc_update_request(enc_softc_t *enc, uint32_t action) { if ((enc->pending_actions & (0x1 << action)) == 0) { enc->pending_actions |= (0x1 << action); - ENC_DLOG(enc, "%s: queing requested action %d\n", + ENC_DLOG(enc, "%s: queueing requested action %d\n", __func__, action); if (enc->current_action == ENC_UPDATE_NONE) wakeup(enc->enc_daemon); diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c index 34e79b55ed51..40efb882d652 100644 --- a/sys/cam/scsi/scsi_enc_ses.c +++ b/sys/cam/scsi/scsi_enc_ses.c @@ -1627,7 +1627,7 @@ ses_process_status(enc_softc_t *enc, struct enc_fsm_state *state, } else { if (cur_stat <= last_stat) ENC_VLOG(enc, "Status page, exhausted objects before " - "exhausing page\n"); + "exhausting page\n"); enc_update_request(enc, SES_PUBLISH_CACHE); err = 0; } From nobody Wed Nov 19 11:16:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJpJ2fdVz6HY3M for ; Wed, 19 Nov 2025 11:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJpJ1tksz3TcR for ; Wed, 19 Nov 2025 11:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tm6LMQzOlsHLO2lE2dSujwd5bS9Gd4ThzkK1DiJYiGE=; b=WnjUArGpUk20hBky01ztLy3pdVunc4PTbGh/khlvcHLRl9Mvj9vPleVUBCGtqS3q8zp47o 5OZ1Xm20maJSldbJGXWwdengE8707FPZDXkQfJT5drc46HYGCYLUrWREjBbIwaBKzGuYIm BMSUnfOWQX0Om70db5uP1NOqJEoRuYpKWYdm1BepcppSvADLTfKpdKnMScSGyK2vIK1zF1 zuk/HaGFIk2h6tQ8DvtlIZb0arDPB+dHall6ycL/uFiKXWKQlfcCYpUnCM0XzotIPARQGF LSfUUdDgSkIpdXwVWVoG3rp0OKGSEbJSSeeJG7kONflfDuVvvbp8sKGNNz32Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tm6LMQzOlsHLO2lE2dSujwd5bS9Gd4ThzkK1DiJYiGE=; b=Dc9PDTRsdjLyr5lN45FW8EHVQ0QdM+DAluOOr6I76rWTiYZ8lzeZD2HYArnqM94Y7xHN99 jKE6KAhRw1aV5mMxfUspDMgA+uDYyf+3gtqPlAt1GYKvHjnxhWAzbwjgyFsUkERXL3ZoYW TEtAsM3YUmZ3TujdbP3Wi9eAoRM1ksPF9uwl1zV1TnpZmruDsQ1gzga+sw9q+BRM2vdp/T 71kwRB2dLFffxBS0cHbCamF+6aijGRxPB+SpfvG6jzroh7UhdOhweQ/yTXydSJpgSqnKpu nHqOM2owf/8TULZnlEDx8lt3a/Z0dp6S/PBowcqmPigWaX1F1ch+K94W5OAxyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551000; a=rsa-sha256; cv=none; b=UE/ewBP7cuiq06Hm4ja8vAld4upOtFvU+EL4WXJTVHX/2oX3cvUDfn2em5ufBlMswX50BG ygxdwoxQm+MQoKbs2p7ESXjfUTetE/LhmBMOJbPzhq2hcVmySs0VLMvrJKhEuZEJQATEkm bUDlv2To7dyzkcr3bIJGmTkzyGwSKY14OPFSLE10ULtaTlWPn+/darf9DShDXpEhZapGw0 4gh81kHoxggjc9ppURxWMmB6b6QbOr6ROfNEIqhG3JHHsvz2nS4fUiUdPHnTgIBjhfShH/ u45NZlvi6gaD9krj09LEZYGZUj6SK3K+SG32sei0SS1wRlFIc11a0OPixd23Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJpJ1TM1zdm9 for ; Wed, 19 Nov 2025 11:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b287 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:16:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 17f4fc2bdbef - stable/14 - nfsclient: Fix a typo in a panic message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17f4fc2bdbef631aa9e2812907615f4dd1400872 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:16:40 +0000 Message-Id: <691da718.b287.1a04f70f@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=17f4fc2bdbef631aa9e2812907615f4dd1400872 commit 17f4fc2bdbef631aa9e2812907615f4dd1400872 Author: Gordon Bergling AuthorDate: 2025-10-29 08:26:23 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:16:29 +0000 nfsclient: Fix a typo in a panic message - s/eroneous/erroneous/ (cherry picked from commit 08a6620093dc2786051bf6ae6f40ae048027021b) --- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 387c5465618a..fe36119e08dc 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -9438,7 +9438,7 @@ nfsm_split(struct mbuf *mp, uint64_t xfer) pgno++; } while (pgno < m->m_epg_npgs); if (pgno == m->m_epg_npgs) - panic("nfsm_split: eroneous ext_pgs mbuf"); + panic("nfsm_split: erroneous ext_pgs mbuf"); m2 = mb_alloc_ext_pgs(M_WAITOK, mb_free_mext_pgs); m2->m_epg_flags |= EPG_FLAG_ANON; From nobody Wed Nov 19 11:17:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJpq326Jz6HY3c for ; Wed, 19 Nov 2025 11:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJpq2KfHz3V7K for ; Wed, 19 Nov 2025 11:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gUqbqU+36DLt2uUfCOdXqkB8cFSo8iGaXLkVtGualU=; b=COhz948GLkNcDN6WWCJzZFIezc2nvcNM6OYRrFahL23hoeR3hk0l6EQXZZtaoKyTPwcGbT c/WzCH8Vw9p4I1IJvprhqDfB7Wq5aW52lU4XOX3ipSO8H6VFzZJiook/zeo510jpU+uhfN 61RThkEMInG1n8mhsf59IYdO+oNCTiQFxHCnb+WwUkJNHcwPylufhuJ+F7jv52l3yLugxY VZnOjdfPqVsVC+5SxNYsYwpH2Yzm5xSZwV3/8JE8dMZZ1q2vaBxeb2paXTeXcZh7zS83gp mqawmV6yrjed2ffZkGbwhqr49l1gnNNAAMU2WRcFOIJd4U6JZZkk94GuobcHtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gUqbqU+36DLt2uUfCOdXqkB8cFSo8iGaXLkVtGualU=; b=Qd31QxnH5kudelh+xbv4ZXMXlBG5mOoEQN5AMxlKX3MIA1DnJMPKlwwbFCMKVtj5sqi8qQ 88wIwe1sDNBGaPkwPUTToa7RvQTds0xmv9PtANQ6+sYCRMFcEaUVIT5jM/lKiV8vX7xCm5 wTZk2CZ60UhKG2tlpj/4G40cdo3gu4+F1lKZAzXMoiJY8FrQ4nOyGv8xYkc3A3rwH1EEu1 cqDmMaX7jV+HAdlAnXCYr8v6/x4N3Iql4tYJ6qWWmHM5GQakAhlRxVYLjOuVmrvg89BpYY 8of0hRNWn22Q9sN+e1QkQMwtnzCw7T7YSymTFMnUnoS9td8kHOKHYvISR2vgHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551027; a=rsa-sha256; cv=none; b=GddFkU6ZA8Z4oX8CI9OA3T6zlKC3pujDc3I8JGrlyRYh5LXCJKAOZwj54H88SuRJm7sXXN RGx8t0r32QSa1perh29PDmoPn2/qt3TnViDz5jLd8PvgvtkrO81j9QATmiBlLJTmykMXbx W7STiA0SpXNCgVBm27Pnnk/nK1r4YfvR07rEn+v3JI+PAWD8BxMHphSI8TnXFIPq/elSyA 2lFWV9Ln7EYN6UFAFgZQOYavvQnVXuPzv3nAnZJkzNw3KgOYXkvn17g9oYLPAVpvOC87C7 D+xnDyKog825WC8iSYTMCNud/3Zx7CoZDl1vjcYSnEme2hEc3DtHadgCYWvu+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJpq1q0Czf5p for ; Wed, 19 Nov 2025 11:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b17e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:17:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: dac93faa4265 - stable/14 - aic7xxx: Fix a couple of typos in device messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dac93faa4265b68d9435bb229077463a52357376 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:17:07 +0000 Message-Id: <691da733.b17e.441124a9@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=dac93faa4265b68d9435bb229077463a52357376 commit dac93faa4265b68d9435bb229077463a52357376 Author: Gordon Bergling AuthorDate: 2025-10-29 08:29:08 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:16:54 +0000 aic7xxx: Fix a couple of typos in device messages - s/Reseting/Resetting/ - s/staus/status/ - s/referrenced/referenced/ (cherry picked from commit d1e39f3d6e5fce1a30a5713d522f87d83654c4bd) --- sys/dev/aic7xxx/aic79xx.c | 6 +++--- sys/dev/aic7xxx/aic7xxx.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index 58b795a9d4ce..54b58d387488 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -2022,7 +2022,7 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1) ahd_outb(ahd, CLRINT, CLRSCSIINT); ahd_unpause(ahd); } else { - printf("Reseting Channel for LQI Phase error\n"); + printf("Resetting Channel for LQI Phase error\n"); AHD_CORRECTABLE_ERROR(ahd); ahd_dump_card_state(ahd); ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE); @@ -8195,7 +8195,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb) AHD_UNCORRECTABLE_ERROR(ahd); break; case SIU_PFC_TMF_NOT_SUPPORTED: - printf("TMF not supportd\n"); + printf("TMF not supported\n"); AHD_UNCORRECTABLE_ERROR(ahd); break; case SIU_PFC_TMF_FAILED: @@ -8329,7 +8329,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb) break; } case SCSI_STATUS_OK: - printf("%s: Interrupted for staus of 0???\n", + printf("%s: Interrupted for status of 0???\n", ahd_name(ahd)); /* FALLTHROUGH */ default: diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 4d97d8ee6367..f071c55137bd 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -85,7 +85,7 @@ struct ahc_hard_error_entry { static struct ahc_hard_error_entry ahc_hard_errors[] = { { ILLHADDR, "Illegal Host Access" }, - { ILLSADDR, "Illegal Sequencer Address referrenced" }, + { ILLSADDR, "Illegal Sequencer Address referenced" }, { ILLOPCODE, "Illegal Opcode in sequencer program" }, { SQPARERR, "Sequencer Parity Error" }, { DPARERR, "Data-path Parity Error" }, @@ -483,7 +483,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat) aic_set_scsi_status(scb, hscb->shared_data.status.scsi_status); switch (hscb->shared_data.status.scsi_status) { case SCSI_STATUS_OK: - printf("%s: Interrupted for staus of 0???\n", + printf("%s: Interrupted for status of 0???\n", ahc_name(ahc)); break; case SCSI_STATUS_CMD_TERMINATED: From nobody Wed Nov 19 11:17:43 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJqX02wwz6HYKd for ; Wed, 19 Nov 2025 11:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJqW3zMxz3VNF for ; Wed, 19 Nov 2025 11:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTeTJ/W0b/9Oj0jKjovNIg+7PUWMLdvZwnuNVkJagpM=; b=IRMtZi+RxeijYovm8Cy++2lCygdFoMSUz/JRPJfeNMKBzTi14mz8zu5NNXJCJXO5zOVHsG AXkMGtlvFIRwrP2PXuJgw5ntJ2TrSdIImlhxfQkga2ItZghqr2H7KIbsRetnQFT/hwgfpC Swd8yNzV+fsvLcBaaSofuZhkgEHCvRBPP3O1cXwkcDt5GnGOZTXipPGzb0vziydcramcpe j+0nHAnvV8IIouvdLtDbriOlf4KODC7ygbLRMPRzBSI+t7+HMiHdqxrk05C7PLfNA/TmPB jpPamlyMN0TZvp52XvfVXfDhVmSgLS0DuRL7vKLdXeFtBBfD6wRrw9P5YOL78w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTeTJ/W0b/9Oj0jKjovNIg+7PUWMLdvZwnuNVkJagpM=; b=RvLPtQ/Jmb0CVvKxwgAOXsgEKF1UD6WyR4pGsgoiBmE6MUwDRxLbdYq5oYowP8XPZ6JYrW ugJb+0vhnruzcGhMwlvB+6UW4VP6Fu4yLC74JJ9DChkvPzZ55qy90mUsab2ODeb4ihhvW7 mSCxPdAza2G7lpYElqHlXGhcwKYwsZxhrCvW7VmUelvby0+r4dFrPGOpBiPjrVih6S64Ec muobiCQvpeQ8Y3K+xrWLZhGkf6EmQLpyTtY8mUtYieUZP4w6srCedzU+wGcmoSfkea2LiP fZlYyc+0D3mieUCAOGGaR67jgbpg5wwtv05EONq1vNvJXnjU2tFejulGpySeWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551063; a=rsa-sha256; cv=none; b=ACFQSVe1Mzm8C/zmodd/amv2ztOFOMLQ0DN16Kf5ZMq1ZD2GaT+93V/yLefxoJoHENvmse HWocRov2AU2bPVFvV0bjw/1WA6fK3ux+HDrgfo9DxgOu6iCKbOwXq11xilMNBM5uAKHZZ/ uX2loQsZvKU9clIarruo8pRK7XZuyd1HMdGmFC40SkVYijkdlDBk2/UcgDqL7uA+BQmcT4 pmTjEgn4OGkmLNAfKcUUTACDcYVrEJ5kBGmaTb3h9iss03zM+6GQkaA+HTHPKUxXuavjdx lLc5zO8kXJIwNGmPsk4cjNmrK7F9n6bOnDgxPXpF3JDV/mAZVvcOofQ2RHz8gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJqW34pwzdmB for ; Wed, 19 Nov 2025 11:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b271 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:17:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 1a1eae617d3f - stable/14 - audit(4): Fix a typo in an kernel error message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1a1eae617d3f3bf9e2bb48519d9f5abe204ba727 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:17:43 +0000 Message-Id: <691da757.b271.449a9eec@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1a1eae617d3f3bf9e2bb48519d9f5abe204ba727 commit 1a1eae617d3f3bf9e2bb48519d9f5abe204ba727 Author: Gordon Bergling AuthorDate: 2025-10-29 15:05:43 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:17:32 +0000 audit(4): Fix a typo in an kernel error message - s/Authenticateion/Authentication/ (cherry picked from commit 63af953e09ccd11f2f5b4d83b10cc231f691de46) --- sys/security/audit/bsm_errno.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/security/audit/bsm_errno.c b/sys/security/audit/bsm_errno.c index a26e3f174ce5..4016dbc157b1 100644 --- a/sys/security/audit/bsm_errno.c +++ b/sys/security/audit/bsm_errno.c @@ -515,7 +515,7 @@ static const struct bsm_errno bsm_errnos[] = { #else ERRNO_NO_LOCAL_MAPPING, #endif - ES("Authenticateion error") }, + ES("Authentication error") }, { BSM_ERRNO_ENEEDAUTH, #ifdef ENEEDAUTH ENEEDAUTH, From nobody Wed Nov 19 11:18:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJr418pcz6HYHG for ; Wed, 19 Nov 2025 11:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJr40MyKz3Vnq for ; Wed, 19 Nov 2025 11:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D8fMDZQ0Cdh47ixnrJEgDuBj2AYpuGyK76Cgj2Sc1x4=; b=JuI75G7roNR7l8Es5p6inO8A1uURE1qFqUtWFZYi1YEwg8ZLQyFgvAKaaAVBg4Nw5ZqgCu 1NiryfxaUDD0qq2OBp8tSGRzN2uz5cQbeMfEB3FFhf9hw7ZN/u4p8fULuKcT0PPhUyPBo2 LU24bCmjCi5aqODu+h43EOc2cx9DNalBWKqLYSwJ7hlTehWBAOBcgEPmFaoS4p35f62suN fX3ZkH6CK+MJcHaoo3x6IrPoCr0C58VijnDudFcZ0HeKcmxp1F5unVnD/mvjXz8kpFDQ9h h8ETfQLm4IrFudgjM6f4Rk2oo9H1pcbXiXZaxUEQB7/q84RwkO14fjgVCSKNJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D8fMDZQ0Cdh47ixnrJEgDuBj2AYpuGyK76Cgj2Sc1x4=; b=gUy9+Hw4rNB1HqNQfkYP33puXR/0Mc++YkdCyg6OBnygUDlL+ibqg4iHkKKH5FG92Stlvo 0H3pAjcKLTk7ZRudBXUNKi6AGQtS+Q2GcLhtpRwm3nAWpja2M44CyUQIFnHpG6vfJOI23r LKttHWBu9OGR7p+LUsgjwsvtx52BVYfNScDdHNGyXCvi3mW7xu2Yilw8AYKgJoGOwEy0/Z u4DDYhd9FLWzvMwTJZnmnqeq9mA36t8prafbJd4mwqApj8rgGlHlJIo/xbkSxZPIPLZGYe 9xh6qLgd1FblPNGNRaWq7zE8LK9okUEjYR48nAFWwgJJN7gmuYXEvQBkovU5wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551092; a=rsa-sha256; cv=none; b=uYk3pG5urPJ6fnT11tx+J6zfrffWULtG/w/e7VJxYGEKhmexeJXj2b2OHfo9sk2w2LcT+f 5nPsMUcMm52UziNiqrmolGnUYz8dFksO9twkxyAv25Rxv+Af4OFR4iWdigD0J+Nz0L2pPp 5uiP4mHGM2daXoGOtmRUVSaG3W8hR3cy8N2SJSdKohCH0XjdOKIU6xQc7KsbBTfXnyqkxm ZqLYV5um2+YURZSKUzNA4COR6KhQY9FkR7XaMdV10Tf3AIIJt/c7dWSX9w+U4Ge9m7d8Cy xUwTT3n83CtnwOSsB0k9nIDbAnwIfhw+TOVjk9hLl/MFNg/u1IsYu10LQvxx3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJr36p3JzdmC for ; Wed, 19 Nov 2025 11:18:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id aae9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:18:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 6561d5296fb9 - stable/14 - usb(4): Fix typos in upgt(4) and zyd(4) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6561d5296fb96f921ca61f504e2e295fe963a146 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:18:11 +0000 Message-Id: <691da773.aae9.4aa52624@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6561d5296fb96f921ca61f504e2e295fe963a146 commit 6561d5296fb96f921ca61f504e2e295fe963a146 Author: Gordon Bergling AuthorDate: 2025-10-29 15:08:31 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:18:00 +0000 usb(4): Fix typos in upgt(4) and zyd(4) - s/frequence/frequency/ - s/finsihed/finished/ (cherry picked from commit 679976d8162004f879a1a0d5ca0c5d2ade5fa1bd) --- sys/dev/usb/wlan/if_upgt.c | 6 +++--- sys/dev/usb/wlan/if_zyd.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c index 55d231e2c655..4fee47ddbfe3 100644 --- a/sys/dev/usb/wlan/if_upgt.c +++ b/sys/dev/usb/wlan/if_upgt.c @@ -1172,7 +1172,7 @@ upgt_eeprom_parse_freq3(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq3[channel] = freq3[i]; - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(sc->sc_eeprom_freq3[channel].freq), channel); } } @@ -1214,7 +1214,7 @@ upgt_eeprom_parse_freq4(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq4[channel][j].pad = 0; } - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(freq4_1[i].freq), channel); } } @@ -1242,7 +1242,7 @@ upgt_eeprom_parse_freq6(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq6[channel] = freq6[i]; - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(sc->sc_eeprom_freq6[channel].freq), channel); } } diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index 2d75b5a5542c..54881a219879 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -825,7 +825,7 @@ zyd_cmd(struct zyd_softc *sc, uint16_t code, const void *idata, int ilen, if (error) device_printf(sc->sc_dev, "command timeout\n"); STAILQ_REMOVE(&sc->sc_rqh, &rq, zyd_rq, rq); - DPRINTF(sc, ZYD_DEBUG_CMD, "finsihed cmd %p, error = %d \n", + DPRINTF(sc, ZYD_DEBUG_CMD, "finished cmd %p, error = %d \n", &rq, error); return (error); From nobody Wed Nov 19 11:18:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJrp19vgz6HYJ0 for ; Wed, 19 Nov 2025 11:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJrp0ChJz3W8R for ; Wed, 19 Nov 2025 11:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rz+SNczVM6PXsxv3WyBDf/GP6rKmckjURZwykxG+RSc=; b=bjG10WiCQqJcFxz+mmBvdrClwfpTCstHxIvU103oOU0F/7IsMgeskNhuv+4NcW+dl61jBJ s0hgAwCPsXul629ZTKJO1S4LY+9RaZms8vSyF5Jh/S6PaFIJChbyhYdFw4e9hfkEEKMRpG Ze1vJJFTDgDwp0xcnOT0XaE1d/sYilhDK9jvMmFiVr05p/Hro1WWaXa41l83IYUDsJmQ4D lWz8bc82/LAsbpIfXYMe27hJpiZjH4EhwhxLmtkHxmFvpsZOAB0J0LcjwZ1AgIUS7MDnwV zdIN9IYx/jVmGgwq8C4K6PPcsMpPkqS6boPVluyxChdX3tF2UcXTzyhTz/8DYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rz+SNczVM6PXsxv3WyBDf/GP6rKmckjURZwykxG+RSc=; b=gAk78xHolvG+A5sK5iiTiKDrlX3aMx1E/pii2dPZ4S9QLqnn7zKX4G54P9IqOjbH0oElrG SVFW6iTYxj4fvfo5ZbwVBXX6SzBMg54lpGsu4k6cYeBJlpGWv2sMA31BW2EFiKue0nimUU oKwPrP1lWTLdrR3XDLl9RpZRwZ8LCAOCUJGCeHTlZ9oKIpn/RdHTEYY+BblK2BANu6CIfR reevIbnPyISPJdQJx9R4CCrXOGcFIUOjoV0NizP9qCINexQTm5XuWnUoCufD24gflAF2eF kQCal4+ZKjodpG57Ypefvnuk1XFZdcy9KW1BruDmryRntTsFzFDg+IZPiUiy1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551130; a=rsa-sha256; cv=none; b=U7mADfS1U3T5jADlXJE4NSTFUEKfFhYtj24uB9SNPICKCGWpaHgRVTAt2+TdXr6O9jXylS H6ajSV9sQ3g1QX+MOj0cmYjDtDGxyzTi/vF5rnQ5pSKNYB49eRHVj+c/uIISPFSD9sF9H2 avE3yR7qpe4ieMLEsE9lwEZWzwrNPMYFgPDtBehjTA1iaEKhW9bXjiJqq7LH7D4envUM54 PhoVj74r/4jqf7AZy6gRErobzSZ1LRt5iMswktJ73Da7AoLrxhIFKaCEfjxM06xbdxDTq0 4ZxjR9dAtl2NmyCB8QQi4KFhVppBysT0gyEZX9GLGsF8/krpleK/Hs+jLdEquw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJrn6hGDzdh4 for ; Wed, 19 Nov 2025 11:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a8f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:18:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 99ee702464b7 - stable/14 - geom(4): Fix typo in a kernel message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99ee702464b7a579600e784d2d3ae272fe3e3934 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:18:49 +0000 Message-Id: <691da799.a8f5.11a5b60f@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=99ee702464b7a579600e784d2d3ae272fe3e3934 commit 99ee702464b7a579600e784d2d3ae272fe3e3934 Author: Gordon Bergling AuthorDate: 2025-10-29 15:10:09 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:18:39 +0000 geom(4): Fix typo in a kernel message - s/supressing/suppressing/ (cherry picked from commit 57b78a557b3ce07b1589c9c21debe97d45599391) --- sys/geom/geom_vfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c index 6caa570de250..d3f3782d5d96 100644 --- a/sys/geom/geom_vfs.c +++ b/sys/geom/geom_vfs.c @@ -154,7 +154,7 @@ g_vfs_done(struct bio *bip) g_print_bio("g_vfs_done():", bip, "error = %d%s", bip->bio_error, bip->bio_error != ENXIO ? "" : - " supressing further ENXIO"); + " suppressing further ENXIO"); } } bp->b_error = bip->bio_error; From nobody Wed Nov 19 11:19:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJsT50Ddz6HYLg for ; Wed, 19 Nov 2025 11:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJsT4MS1z3WGj for ; Wed, 19 Nov 2025 11:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sD3e+N761dYzYmzR8KY1DH+rfl5p6b/FYQDexyvfkV0=; b=Nkpyqgy5ItrAPmt0PdjUwmfjIS3hcmKKlwPviehgKIHkXw/3tDPY1IApuXdXwNP831fVyV 9xkU970wVvnLJpL4JsUrm5XDwq47fwzL69tW+Xz1mnEr/3yNI+3Enainprdbkv8cevT+N9 3xg+XdJNxpSLt2sRwQr1vmFtm0oeFlwjuajF5oadf5QrwWsZmqN30kR/lRPuV0Dlz1K2CS aFcXYF4cRS/VCPlBqGsbJCl+yRgZ8o2zhjJ68NDIj3P5Vfu1/bS8OHZB0FQBALGMGm0rd8 Q5XogZSbG1FhydhbNLwI/EaNMrijQif2knD5I9cqhT4c0sf+LZ/1S7Fl4WX3dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sD3e+N761dYzYmzR8KY1DH+rfl5p6b/FYQDexyvfkV0=; b=qbqppW4qGHYRWIiMF78XsHuWwUNcfK2Hjpt90R+Sa3sLuQkrTXmMvDWMLWt0nkpQ/6GlZe qBOpuPYDnWJJ5dKvy36iNoMBL1Mw2k+bdimF7Xqw9HCN3c2O9X6Ws37J3CTPxYvNfxhdbU xyLilH8eBBhXFT0IiGRQuzVbuDKBTiWr2hwcsSFE64H9EKHMJs1/7H5tmdLdX6lXBpnfP9 xrZ/X4BoyhOxDVzFrIqnjsxhizcjqws2vSzVx7yjqdL4JYHP4vrvTU1kNkUv2IUbMp4dsz R1DG1FjvXfMjWFu3kNLkvd8QZXnkBxZ3FQlld9mKRJa9FNIKtpCD1KjWo6MelQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551165; a=rsa-sha256; cv=none; b=rJvWu/KcTPN7J5QRBmNLM0B4y4idZFR3KOlqB53T15UOFVrMDRmpu4Jsbf1SDZMUviS5fR YHU0odh3dIAVB24UwXF9ckR00tqLcF5YAVFCKja1pRbBIajgmF1qzwH0Zm1tcXZumkXZn7 sLOMo2kQGCpleDpJw0hbRwJISVUvJNDRJA7Gy1DZIfqS0qsFl002xr3c5XIWanoBip0nAK PegOrn5BKsQX63jcEuj3Q1lTJO6v5TExDoT0OpSMqDKKjBvQXntW8QL2eqySwIKfqEFzx9 QV5vPXKz+ghKpl+UvghzMvgOZOxIBksD/YWonhD7MngGY63xBatULT/HpQuBfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJsT3z4NzfF3 for ; Wed, 19 Nov 2025 11:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 99cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:19:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b41551753a2b - stable/14 - quot: Add tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b41551753a2baff6646e2958acb4a7fcd205b69c Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:19:25 +0000 Message-Id: <691da7bd.99cf.4af747a@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b41551753a2baff6646e2958acb4a7fcd205b69c commit b41551753a2baff6646e2958acb4a7fcd205b69c Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:55:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 11:19:07 +0000 quot: Add tests To facilitate the task, we change the comparison function so that users with equal filesystem usage are sorted by UID, and add an undocumented option that prevents quot from replacing numerical UIDs with names. We also switch from getfsfile(3) to getmntpoint(3) so the first line is identical regardless of whether we pass quot a mountpoint or a device. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53133 (cherry picked from commit aa870a1935bccb66e02c4c31630706768a3e7d74) (cherry picked from commit b5f3f1a661ab69986c3379fa4c9c2b38785933db) --- etc/mtree/BSD.tests.dist | 2 + usr.sbin/quot/Makefile | 5 +- usr.sbin/quot/quot.c | 11 ++++- usr.sbin/quot/tests/Makefile | 4 ++ usr.sbin/quot/tests/quot_test.sh | 101 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 3 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 6833d35bae76..214d6f6162cb 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1217,6 +1217,8 @@ .. pw .. + quot + .. rpcbind .. sa diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile index b18c37126448..1f87278f1bfa 100644 --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -1,7 +1,10 @@ +.include PROG= quot MAN= quot.8 -LIBADD= ufs +LIBADD= ufs util +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests WARNS?= 2 diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 7a7362dea996..5005622987dc 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -55,6 +55,7 @@ /* some flags of what to do: */ static char estimate; static char count; +static char noname; static char unused; static void (*func)(int, struct fs *, char *); static long blocksize; @@ -281,7 +282,7 @@ user(uid_t uid) usr--) { if (!usr->name) { usr->uid = uid; - if (!(pwd = getpwuid(uid))) { + if (noname || !(pwd = getpwuid(uid))) { asprintf(&usr->name, "#%u", uid); } else { usr->name = strdup(pwd->pw_name); @@ -308,7 +309,10 @@ cmpusers(const void *v1, const void *v2) u1 = (const struct user *)v1; u2 = (const struct user *)v2; - return u2->space - u1->space; + return (u2->space > u1->space ? 1 : + u2->space < u1->space ? -1 : + u1->uid > u2->uid ? 1 : + u1->uid < u2->uid ? -1 : 0); } #define sortusers(users) (qsort((users),nusers,sizeof(struct user), \ @@ -576,6 +580,9 @@ main(int argc, char *argv[]) while (--argc > 0 && **++argv == '-') { while (*++*argv) { switch (**argv) { + case 'N': + noname = 1; + break; case 'n': func = donames; break; diff --git a/usr.sbin/quot/tests/Makefile b/usr.sbin/quot/tests/Makefile new file mode 100644 index 000000000000..d4e64691f905 --- /dev/null +++ b/usr.sbin/quot/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= quot_test + +.include diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh new file mode 100644 index 000000000000..7da9d23ca11f --- /dev/null +++ b/usr.sbin/quot/tests/quot_test.sh @@ -0,0 +1,101 @@ +# +# Copyright (c) 2025 Dag-Erling Smørgrav +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Create and mount a UFS filesystem on a small memory disk +quot_setup() +{ + atf_check -o save:dev mdconfig -t malloc -s 16M + local dev=$(cat dev) + atf_check -o ignore newfs "$@" /dev/$dev + atf_check mkdir mnt + local mnt=$(realpath mnt) + atf_check mount /dev/$dev "$mnt" + echo "/dev/$dev:" >expect + printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect +} + +# Create a directory owned by a given UID +quot_adduid() +{ + local uid=$1 + atf_check install -d -o $uid -g 0 mnt/$uid + printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect +} + +# Perform the tests +quot_test() +{ + local dev=$(cat dev) + # Create inodes owned by a large number of users to exercise + # hash collisions and rehashing. The code uses an open hash + # table that starts out with only 8 entries and doubles every + # time it fills up. + local uid + for uid in $(seq 1 32); do + quot_adduid $uid + done + # Also create inodes owned by users with long UIDs, up to the + # highest possible value (2^32 - 2, because chown(2) and + # friends interpret 2^32 - 1 as “leave unchanged”). + local shift + for shift in $(seq 6 32); do + quot_adduid $(((1 << shift) - 2)) + done + # Since quot operates directly on the underlying device, not + # on the mounted filesystem, we remount read-only to ensure + # that everything gets flushed to the memory disk. + atf_check mount -ur /dev/$dev + atf_check -o file:expect quot -fkN /dev/$dev +} + +# Unmount and release the memory disk +quot_cleanup() +{ + if [ -d mnt ]; then + umount mnt || true + fi + if [ -f dev ]; then + mdconfig -d -u $(cat dev) || true + fi +} + +atf_test_case ufs1 cleanup +ufs1_head() +{ + atf_set descr "Test quot on UFS1" + atf_set require.user root +} +ufs1_body() +{ + quot_setup -O1 + quot_test +} +ufs1_cleanup() +{ + quot_cleanup +} + +atf_test_case ufs2 cleanup +ufs2_head() +{ + atf_set descr "Test quot on UFS2" + atf_set require.user root +} +ufs2_body() +{ + quot_setup -O2 + quot_test +} +ufs2_cleanup() +{ + quot_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case ufs1 + atf_add_test_case ufs2 +} From nobody Wed Nov 19 11:19:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJsW01ypz6HYLh for ; Wed, 19 Nov 2025 11:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJsV4wtLz3WGk for ; Wed, 19 Nov 2025 11:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dG7S1gfwSUU2XDEmGbSaKd60+6xrg3dN3EIiWrcm9MM=; b=xW9SFV8+9i7bI24U+pnKB/fjYCAaO1P1u5e8aeU9F9I5MLUvHyMN+UCaSdWFmPE3VhzgkQ AuKOSGPnrZaFBEveDocljoqEO4iVS+zG9RwuaSYEIErBrImaAesl/0niYYqOiJeLFPBRPi vu7mU4dTMvZDBJfgTidmAHRcg+lS9Jh1X4tlsWSdsCo8VE8L5jNqCSxDqEqwyMqHbZthuD We4atUcq/ixR/t+ETtEkiKVGEqxPcl17AtLB900T31pcH9nc4of/IioOohsk1p5Fhbi2oR LL8KU6yONMd/qY/+zTZbFovEg1YeC3ZYUfJqf5fx330nHD8j5RXru4KBgDnLmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dG7S1gfwSUU2XDEmGbSaKd60+6xrg3dN3EIiWrcm9MM=; b=w9iu/EPuaw4VYNZdrJjtT2n8HfwszxJyeUbtVtDzz1KOdPP/3IJn4QELS1cErJxhHQNfpu Qfuu2o+BPS2gaZAHQd9NymCGIzIqVqACLiWpmzJ5jrkg1dnDLcdq+2ljvqTe7I0RAuQlWo fdiCjpAXbPR2Nzj43TCvkIAF494raTTb+Vqax1uEFtVBsv70rNFwDd07Q46FnTe/uvx7Ey yKh7d7uHIkYWTNtaM6HPrFQ7dcYdggnWhMMKiH+R7GVoPSFA3CtxQsLea9W+YH0tSuDh/x AMFlkcYE7akA+9pMCPVGFoV8BcapazPOVQRYRgQ1jE3MFHTU7/Sjy5eWaK5AtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551166; a=rsa-sha256; cv=none; b=kRtGNj+4WmJvedqqXfyUaTj6TlSEFiKvtGwVpG6UVMgxLjXzG60zZq67+XFYsK196d9MfB G7YGAo26y1T81H072zsO1rQA9SEoBzheQ1oIU4Pr4sBzZuyr33pFnnXybHJUfNuUfIuKy6 4uwXouumgsFWbqKo3xdbWRWovkmEqfaaefbM1kaQeRHi7ryfwycJhOZwUcCzqiR71h9Bl6 mpq776n/7f9s/HCWEZLd4sZ9LvJZQoKt9DB8U7ArKWDO52/icxLPhcHMDDEMkYTEI1rYZi Hc6FPU4G87PZCYSgzxWU1IQVtQAlM3yYaCbj+OJPK9dBe4KaqdxcMHUti0ZmIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJsV4Pv3zf41 for ; Wed, 19 Nov 2025 11:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ab0c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:19:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 179fa1d81c73 - stable/14 - quot: Rewrite -n mode input parser List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 179fa1d81c73ab7ef231e17da73f230e4f8ee5a2 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:19:26 +0000 Message-Id: <691da7be.ab0c.7c3d009a@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=179fa1d81c73ab7ef231e17da73f230e4f8ee5a2 commit 179fa1d81c73ab7ef231e17da73f230e4f8ee5a2 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-14 14:28:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 11:19:07 +0000 quot: Rewrite -n mode input parser The existing parser was needlessly complicated and wildly inconsistent in how it handled invalid input. Rewrite using getline() and treat invalid input consistently: silently ignore lines that don't begin with a number, and print a warning if the inode number is out of range. PR: 290992 MFC after: 1 week Reviewed by: obrien Differential Revision: https://reviews.freebsd.org/D53726 (cherry picked from commit fa272a5276865a97b01823fe6546940eaaf1b164) --- usr.sbin/quot/quot.8 | 3 ++- usr.sbin/quot/quot.c | 47 ++++++++++++++++++++++------------------ usr.sbin/quot/tests/quot_test.sh | 19 ++++++++++++++++ 3 files changed, 47 insertions(+), 22 deletions(-) diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 0338457f6aeb..b777aef7288e 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -27,7 +27,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 8, 1994 +.Dd November 13, 2025 .Dt QUOT 8 .Os .Sh NAME @@ -65,6 +65,7 @@ By default, all sizes are reported in 512-byte block counts. Given a list of inodes (plus some optional data on each line) in the standard input, for each file print out the owner (plus the remainder of the input line). +Lines that do not begin with a number are ignored. This is traditionally used in the pipe: .Bd -literal -offset indent diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 5005622987dc..877fccd35f16 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -40,9 +40,10 @@ #include #include +#include #include #include -#include +#include #include #include #include @@ -480,43 +481,47 @@ douser(int fd, struct fs *super, char *name) static void donames(int fd, struct fs *super, char *name) { - int c; - ino_t maxino; - uintmax_t inode; union dinode *dp; + char *end, *line; + size_t cap; + ssize_t len; + intmax_t inode, maxino; maxino = super->fs_ncg * super->fs_ipg - 1; - /* first skip the name of the filesystem */ - while ((c = getchar()) != EOF && (c < '0' || c > '9')) - while ((c = getchar()) != EOF && c != '\n'); - ungetc(c,stdin); - while (scanf("%ju", &inode) == 1) { - if (inode > maxino) { - warnx("illegal inode %ju", inode); - return; + line = NULL; + cap = 0; + while ((len = getline(&line, &cap, stdin)) > 0) { + if (len > 0 && line[len - 1] == '\n') + line[--len] = '\0'; + inode = strtoimax(line, &end, 10); + /* + * Silently ignore lines that do not begin with a number. + * For backward compatibility reasons, we do not require + * the optional comment to be preceded by whitespace. + */ + if (end == line) + continue; + if (inode <= 0 || inode > maxino) { + warnx("invalid inode %jd", inode); + continue; } errno = 0; if ((dp = get_inode(fd,super,inode)) && !isfree(super, dp)) { printf("%s\t",user(DIP(super, dp, di_uid))->name); /* now skip whitespace */ - while ((c = getchar()) == ' ' || c == '\t'); + while (*end == ' ' || *end == '\t') + end++; /* and print out the remainder of the input line */ - while (c != EOF && c != '\n') { - putchar(c); - c = getchar(); - } - putchar('\n'); + printf("%s\n", end); } else { if (errno) { err(1, "%s", name); } /* skip this line */ - while ((c = getchar()) != EOF && c != '\n'); } - if (c == EOF) - break; } + free(line); } static void diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh index 7da9d23ca11f..fd3d6df7b021 100644 --- a/usr.sbin/quot/tests/quot_test.sh +++ b/usr.sbin/quot/tests/quot_test.sh @@ -15,6 +15,8 @@ quot_setup() atf_check mount /dev/$dev "$mnt" echo "/dev/$dev:" >expect printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect + printf "%s\n" "/dev/$dev" >ninput + echo "/dev/$dev:" >nexpect } # Create a directory owned by a given UID @@ -23,12 +25,25 @@ quot_adduid() local uid=$1 atf_check install -d -o $uid -g 0 mnt/$uid printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect + ls -di mnt/$uid >>ninput + printf "%s\t%s\n" "#$uid" mnt/$uid >>nexpect } # Perform the tests quot_test() { local dev=$(cat dev) + # Deliberately add invalid lines to our -n input before the + # valid ones to verify that quot does not abort on first + # error. Note that quot deliberately ignores initial lines + # that don't start with a number, and that after encountering + # at least one line that does start with a number, quot would + # previously terminate on encountering one that doesn't (now + # it simply ignores them). This also tests that we don't + # require whitespace between the inode number and the comment. + echo "0zero" >>ninput + echo "invalid" >>ninput + echo "-1minusone" >>ninput # Create inodes owned by a large number of users to exercise # hash collisions and rehashing. The code uses an open hash # table that starts out with only 8 entries and doubles every @@ -49,6 +64,10 @@ quot_test() # that everything gets flushed to the memory disk. atf_check mount -ur /dev/$dev atf_check -o file:expect quot -fkN /dev/$dev + # Test -n option + atf_check -o file:nexpect \ + -e inline:"quot: invalid inode 0\nquot: invalid inode -1\n" \ + quot -Nn /dev/$dev ; Wed, 19 Nov 2025 11:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJvh4TpQz3X80 for ; Wed, 19 Nov 2025 11:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qh1vAZVxGa4nnmLETrV7z0v81Cybx95JhEE7lTyd57k=; b=MGzrxd6v+g8+b7MfrP9Cze+rypm9T5oe0PfoPKQ9MdQjZDGti0/mg/WO5CYO5cGg+5on2y LMARZ5LFgEcSWFBMarSyD9Vl2VXtvOfc6pzfUfXB8uEfsaFzSXiG4bL6ig87z9j3Ax52wZ wT5nZ+mg3xQH1bdTq1nwOHxMhWqut+eft9NhGuJQEkFEbYs5T43WuDuK6VSP1y+FJqNm9T jL8FTtf8HoNNkbSu9k9/ouu6d/kO+bMpldm8VHt5T6LYRfTFVZt5cDfkIAx25h0gTi3GJh CINjCcFwarOaIcBsyL3OjoqtCd4JDGajl+TvFP70L3KFrzRBDKI6QB09JBcfQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qh1vAZVxGa4nnmLETrV7z0v81Cybx95JhEE7lTyd57k=; b=N59H8342bGi7KMXYArFjicdem2PaolqgbDJOcPKDCIoH6GgEp2oJU2R4w3oUhbD/aFwvLy 99fV8MVUUDK7FXXxTNEpe/vAnpxM+Pa8YGmTwRvaa9HxMoMwJPtCDZAKIvZEO71IqT6tGg afb41ThdvgNunaKuBmitsFOVOaPG82u0Crfh1OSViMQHPLVyj4T1U7j/u3yhQQnUdneIHG +NmLJEYAbqBp7wYEJIN7B1LPmvJ0k9Z69HzXiz9gLQX6MQBGNHg7Dgi8NaPotGSGIt642B j9aGib7X4cFHr0wd4xD6KRR9Mqpm9pGYfv/f/RDQP9bWQc8zz0XzkMZhW9fxEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551280; a=rsa-sha256; cv=none; b=V4BI2g7HvY54VudylpR7Bqn1uGoTJoObkWCkpXW2Yfen8zUbGnGTZaIizjKH1tzGL85XNR OqrHwszcYfvwez0BprhWaWH4gfsRzhhPklCNll75BlB92BcMzZp0NEmCC/LUsWw9Lo0c1A SFtda/UZOjEMSLkgIQ9+W7HTzfcj7JjK0BsP6l35jsCQscoGpmLJoSWI8ubmdY2x8Bxzlt GJu5pPoHf9VosgWW3HMsN/X6rFKUudkTsyfEfaCAa9XfHIaDZAGRaRsYZlElG6Ni+U7oY2 bF+Rr4613WeM7WGuDrEMcXB1YvHOO/oCxCCLK9BtcFGlz4LcxbqEZZ7UrXaggw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJvh3zTDzfFK for ; Wed, 19 Nov 2025 11:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b7c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:21:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 29343c4b8f94 - stable/13 - quot: Add tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 29343c4b8f94f3e7a6f0d26fec8fda625773a4c3 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:21:20 +0000 Message-Id: <691da830.b7c9.95f0608@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=29343c4b8f94f3e7a6f0d26fec8fda625773a4c3 commit 29343c4b8f94f3e7a6f0d26fec8fda625773a4c3 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:55:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 11:20:30 +0000 quot: Add tests To facilitate the task, we change the comparison function so that users with equal filesystem usage are sorted by UID, and add an undocumented option that prevents quot from replacing numerical UIDs with names. We also switch from getfsfile(3) to getmntpoint(3) so the first line is identical regardless of whether we pass quot a mountpoint or a device. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53133 (cherry picked from commit aa870a1935bccb66e02c4c31630706768a3e7d74) (cherry picked from commit b5f3f1a661ab69986c3379fa4c9c2b38785933db) (cherry picked from commit b41551753a2baff6646e2958acb4a7fcd205b69c) --- etc/mtree/BSD.tests.dist | 2 + usr.sbin/quot/Makefile | 5 +- usr.sbin/quot/quot.c | 11 ++++- usr.sbin/quot/tests/Makefile | 4 ++ usr.sbin/quot/tests/quot_test.sh | 101 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 3 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index bbd0862c226b..5ae161ed5cd2 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1177,6 +1177,8 @@ .. pw .. + quot + .. rpcbind .. sa diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile index b18c37126448..1f87278f1bfa 100644 --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -1,7 +1,10 @@ +.include PROG= quot MAN= quot.8 -LIBADD= ufs +LIBADD= ufs util +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests WARNS?= 2 diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 7042acf07bc4..28a7173e7340 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -55,6 +55,7 @@ /* some flags of what to do: */ static char estimate; static char count; +static char noname; static char unused; static void (*func)(int, struct fs *, char *); static long blocksize; @@ -281,7 +282,7 @@ user(uid_t uid) usr--) { if (!usr->name) { usr->uid = uid; - if (!(pwd = getpwuid(uid))) { + if (noname || !(pwd = getpwuid(uid))) { asprintf(&usr->name, "#%u", uid); } else { usr->name = strdup(pwd->pw_name); @@ -308,7 +309,10 @@ cmpusers(const void *v1, const void *v2) u1 = (const struct user *)v1; u2 = (const struct user *)v2; - return u2->space - u1->space; + return (u2->space > u1->space ? 1 : + u2->space < u1->space ? -1 : + u1->uid > u2->uid ? 1 : + u1->uid < u2->uid ? -1 : 0); } #define sortusers(users) (qsort((users),nusers,sizeof(struct user), \ @@ -578,6 +582,9 @@ main(int argc, char *argv[]) while (--argc > 0 && **++argv == '-') { while (*++*argv) { switch (**argv) { + case 'N': + noname = 1; + break; case 'n': func = donames; break; diff --git a/usr.sbin/quot/tests/Makefile b/usr.sbin/quot/tests/Makefile new file mode 100644 index 000000000000..d4e64691f905 --- /dev/null +++ b/usr.sbin/quot/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= quot_test + +.include diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh new file mode 100644 index 000000000000..7da9d23ca11f --- /dev/null +++ b/usr.sbin/quot/tests/quot_test.sh @@ -0,0 +1,101 @@ +# +# Copyright (c) 2025 Dag-Erling Smørgrav +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Create and mount a UFS filesystem on a small memory disk +quot_setup() +{ + atf_check -o save:dev mdconfig -t malloc -s 16M + local dev=$(cat dev) + atf_check -o ignore newfs "$@" /dev/$dev + atf_check mkdir mnt + local mnt=$(realpath mnt) + atf_check mount /dev/$dev "$mnt" + echo "/dev/$dev:" >expect + printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect +} + +# Create a directory owned by a given UID +quot_adduid() +{ + local uid=$1 + atf_check install -d -o $uid -g 0 mnt/$uid + printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect +} + +# Perform the tests +quot_test() +{ + local dev=$(cat dev) + # Create inodes owned by a large number of users to exercise + # hash collisions and rehashing. The code uses an open hash + # table that starts out with only 8 entries and doubles every + # time it fills up. + local uid + for uid in $(seq 1 32); do + quot_adduid $uid + done + # Also create inodes owned by users with long UIDs, up to the + # highest possible value (2^32 - 2, because chown(2) and + # friends interpret 2^32 - 1 as “leave unchanged”). + local shift + for shift in $(seq 6 32); do + quot_adduid $(((1 << shift) - 2)) + done + # Since quot operates directly on the underlying device, not + # on the mounted filesystem, we remount read-only to ensure + # that everything gets flushed to the memory disk. + atf_check mount -ur /dev/$dev + atf_check -o file:expect quot -fkN /dev/$dev +} + +# Unmount and release the memory disk +quot_cleanup() +{ + if [ -d mnt ]; then + umount mnt || true + fi + if [ -f dev ]; then + mdconfig -d -u $(cat dev) || true + fi +} + +atf_test_case ufs1 cleanup +ufs1_head() +{ + atf_set descr "Test quot on UFS1" + atf_set require.user root +} +ufs1_body() +{ + quot_setup -O1 + quot_test +} +ufs1_cleanup() +{ + quot_cleanup +} + +atf_test_case ufs2 cleanup +ufs2_head() +{ + atf_set descr "Test quot on UFS2" + atf_set require.user root +} +ufs2_body() +{ + quot_setup -O2 + quot_test +} +ufs2_cleanup() +{ + quot_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case ufs1 + atf_add_test_case ufs2 +} From nobody Wed Nov 19 11:21:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJvk1xt5z6HYLx for ; Wed, 19 Nov 2025 11:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJvj5Qtzz3X14 for ; Wed, 19 Nov 2025 11:21:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xug/iisEJbhz/h7Gx/Gpt74qw0N6wEFGTXvpk6soXT0=; b=RtxUViDE0BV8d+28/IHYEwb4pPuQLxQ0A5NCgT0lg/17iuRa4JofHuOEcZ6V5ioFzt2NKi SOwBEedWh7xNllAbCbs83V/8MWZOWLCr321uvpyijEGl60mH1t6p3SUYnZkCfmAGSYvkTz OkSGCHWgpC+kN/GqonSN97bJUb/BrcEzaAJGiYQwF5dkc+gD2n1OeUeHIl/I9/hU1PUnU7 fJOhf8mZkguDKo9J8Av/g8veikvy7ZFdz2VXv+VGb8I2VVC5MLg+h3qfaWwBustTZ2pQ1O aJpyL/grxvEhAVBz36cdW254ePnf6gS4c0e4CNNU83cEFkECQD6l6b5MdPeT9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xug/iisEJbhz/h7Gx/Gpt74qw0N6wEFGTXvpk6soXT0=; b=iQ21wofggnBJsCAhnFTsUrITsq66o5Bs3wVj+ueuq2z238YbgdpNl9qe36hParjVvUa+2s s91TYrLvIBDFsdAamG+ILzHveyXLJdEhjgHGk61kT9TcfCgw1vjO1+xUziKNsSgoKO18Pf UTXGIZeTwrmoie5J8VyciDUjf/GpKJqchRNl7QbxnDHiXMkgnL/GuA2c4OMEtLsVwnx2Cb UPIqcGpSSzUrnUJocc2tAHkFZCej6hxnVsXLqGvk7yX211hHsv8YoapSAerE+zeIr7oxgt lTeHo3zuWeka7pIuAwyUbuCSZ0VGXKMxBy1pAVWaKM11ppV6XLfMzi8AoyUOWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551281; a=rsa-sha256; cv=none; b=Wur7tSULvRL3mzT8wLzEUIYz9vGFiKCmQKEb41jPHUMVet8Ugk52BGrpygrPuAqQua9H4Z DL4g4uB9MmU4RqNCBrjNgfMHE9ynms4K9uIrimoQOGov7xc2rFoIVSfwBLBNp4McxVfWvI 6BuYluiqagaxqfXkNRV6jQbKY05MTHNBxqCl1oTT50Uyo7axon0F6AsBnaNV5yj0i+QRd1 NqHSRRfe0XU/9gLA1z0S5RTmUjuanmAG/Bg7n3BJ7/DRGmzdw10dlWxdiDEK/hHyFxisUR bXuxf73XDp3FTFl3sOlXJG/AMI4MKuHK3Aziko+HOOHIogDbBMkAhwnAqYVWnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJvj4nC6zdmg for ; Wed, 19 Nov 2025 11:21:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bdb2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:21:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a2630fec78b6 - stable/13 - quot: Rewrite -n mode input parser List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a2630fec78b60844e68cae8b9e1f65b7322a5f05 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:21:21 +0000 Message-Id: <691da831.bdb2.4cb4b478@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a2630fec78b60844e68cae8b9e1f65b7322a5f05 commit a2630fec78b60844e68cae8b9e1f65b7322a5f05 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-14 14:28:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 11:20:30 +0000 quot: Rewrite -n mode input parser The existing parser was needlessly complicated and wildly inconsistent in how it handled invalid input. Rewrite using getline() and treat invalid input consistently: silently ignore lines that don't begin with a number, and print a warning if the inode number is out of range. PR: 290992 MFC after: 1 week Reviewed by: obrien Differential Revision: https://reviews.freebsd.org/D53726 (cherry picked from commit fa272a5276865a97b01823fe6546940eaaf1b164) (cherry picked from commit 179fa1d81c73ab7ef231e17da73f230e4f8ee5a2) --- usr.sbin/quot/quot.8 | 3 ++- usr.sbin/quot/quot.c | 47 ++++++++++++++++++++++------------------ usr.sbin/quot/tests/quot_test.sh | 19 ++++++++++++++++ 3 files changed, 47 insertions(+), 22 deletions(-) diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 0338457f6aeb..b777aef7288e 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -27,7 +27,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 8, 1994 +.Dd November 13, 2025 .Dt QUOT 8 .Os .Sh NAME @@ -65,6 +65,7 @@ By default, all sizes are reported in 512-byte block counts. Given a list of inodes (plus some optional data on each line) in the standard input, for each file print out the owner (plus the remainder of the input line). +Lines that do not begin with a number are ignored. This is traditionally used in the pipe: .Bd -literal -offset indent diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 28a7173e7340..acde6e411091 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -40,9 +40,10 @@ #include #include +#include #include #include -#include +#include #include #include #include @@ -480,43 +481,47 @@ douser(int fd, struct fs *super, char *name) static void donames(int fd, struct fs *super, char *name) { - int c; - ino_t maxino; - uintmax_t inode; union dinode *dp; + char *end, *line; + size_t cap; + ssize_t len; + intmax_t inode, maxino; maxino = super->fs_ncg * super->fs_ipg - 1; - /* first skip the name of the filesystem */ - while ((c = getchar()) != EOF && (c < '0' || c > '9')) - while ((c = getchar()) != EOF && c != '\n'); - ungetc(c,stdin); - while (scanf("%ju", &inode) == 1) { - if (inode > maxino) { - warnx("illegal inode %ju", inode); - return; + line = NULL; + cap = 0; + while ((len = getline(&line, &cap, stdin)) > 0) { + if (len > 0 && line[len - 1] == '\n') + line[--len] = '\0'; + inode = strtoimax(line, &end, 10); + /* + * Silently ignore lines that do not begin with a number. + * For backward compatibility reasons, we do not require + * the optional comment to be preceded by whitespace. + */ + if (end == line) + continue; + if (inode <= 0 || inode > maxino) { + warnx("invalid inode %jd", inode); + continue; } errno = 0; if ((dp = get_inode(fd,super,inode)) && !isfree(super, dp)) { printf("%s\t",user(DIP(super, dp, di_uid))->name); /* now skip whitespace */ - while ((c = getchar()) == ' ' || c == '\t'); + while (*end == ' ' || *end == '\t') + end++; /* and print out the remainder of the input line */ - while (c != EOF && c != '\n') { - putchar(c); - c = getchar(); - } - putchar('\n'); + printf("%s\n", end); } else { if (errno) { err(1, "%s", name); } /* skip this line */ - while ((c = getchar()) != EOF && c != '\n'); } - if (c == EOF) - break; } + free(line); } static void diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh index 7da9d23ca11f..fd3d6df7b021 100644 --- a/usr.sbin/quot/tests/quot_test.sh +++ b/usr.sbin/quot/tests/quot_test.sh @@ -15,6 +15,8 @@ quot_setup() atf_check mount /dev/$dev "$mnt" echo "/dev/$dev:" >expect printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect + printf "%s\n" "/dev/$dev" >ninput + echo "/dev/$dev:" >nexpect } # Create a directory owned by a given UID @@ -23,12 +25,25 @@ quot_adduid() local uid=$1 atf_check install -d -o $uid -g 0 mnt/$uid printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect + ls -di mnt/$uid >>ninput + printf "%s\t%s\n" "#$uid" mnt/$uid >>nexpect } # Perform the tests quot_test() { local dev=$(cat dev) + # Deliberately add invalid lines to our -n input before the + # valid ones to verify that quot does not abort on first + # error. Note that quot deliberately ignores initial lines + # that don't start with a number, and that after encountering + # at least one line that does start with a number, quot would + # previously terminate on encountering one that doesn't (now + # it simply ignores them). This also tests that we don't + # require whitespace between the inode number and the comment. + echo "0zero" >>ninput + echo "invalid" >>ninput + echo "-1minusone" >>ninput # Create inodes owned by a large number of users to exercise # hash collisions and rehashing. The code uses an open hash # table that starts out with only 8 entries and doubles every @@ -49,6 +64,10 @@ quot_test() # that everything gets flushed to the memory disk. atf_check mount -ur /dev/$dev atf_check -o file:expect quot -fkN /dev/$dev + # Test -n option + atf_check -o file:nexpect \ + -e inline:"quot: invalid inode 0\nquot: invalid inode -1\n" \ + quot -Nn /dev/$dev ; Wed, 19 Nov 2025 11:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJxR4thbz3Xqv for ; Wed, 19 Nov 2025 11:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1oIOitd64za4DWfEd8oWTlcMkVx284KS8F5GtA9VZA=; b=WwEu3a+Frh1CKJ2CLjx9dhmiJQ2q171ruqZoPgiMBjLRNrREAaKZ4+ip1MxWvNCwS1PZhz KeJEkejWlWCPBf2XyZEuC9mFLytEtF0NvEI2JbaxH4AIJ7kzyeHsioZlTwYeIlXu94wdsV Mt/84ipGJD+xOP2L/fED8jwQT8iyBvPDOjSsT/+jX1qqMPNHdRGiuGPMxafXxR5OVkEZg3 THfCAArXz5A/Sn9zC3FjlpjMX7NionjeXUfZ4E0VT/QXXlqd5q6niGDq1L/lcJiA2t11oW GzKvWdxDSw1c2MgnJQH3kiwBg8P5zsFyDMvMqPtU7S8ZCZYIKuCkbB5DEG9d4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1oIOitd64za4DWfEd8oWTlcMkVx284KS8F5GtA9VZA=; b=qzX3RsEndz4wxUt0A9lfmC/F5fSKx4+VsSu2G+v9M7foX6JsmBf0O6P41xPdVi64WNRrLL 7To9FXAWtPCadQZTHPIPDYxuhHD1Bvux4vMmVmM5Vd9xwLwMT5Y+rumgk9Q7W6MITKQxj7 HJYot00r9MKOLdL4IavQc32Fze9VJJjkt5G+l/QRtOFK0eH+LzwQf0lBON0evMhWCEwLBN o35HwFEHdLqRFYBhs5uhdMtScNz9JIHyMSiSWvIYQXZS90dy51QXykGXzZIooK9uf9vs3G x7I7Ywpv1ilFwTJ6Y6faFThoPHnj4oGVfjQ+nHZSe7SoDRVRnwJYc2PZc6QWwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551371; a=rsa-sha256; cv=none; b=x50vmeXrDUy0hnLl4mCZd6OzflTnHRCyYBtvVSSqnruWliAWlU/iuuSsv0bIhX1KyAQtQD jGmCzidwDTtINDGTAGZBuPxXyNSJ4opoeMgAcTLHRqJvCQ2aUSdAco1nm7/P6qizvWwCp+ BZrhlB2sGKT0FNtIenrTmrCRqPzjaAvzPIr4yW6ZL0djO58RLX+Vm5p86kqSbIwUjNqCPm 9/I6kTNSUg0Z9dsKYY03tNGm47tR9M4QaCcFdIxrJKod2MRmUua4shssDnXdja4vriJgvV W3i5JJmq38m7AYXEfPCMso9/WvfNCd4HViePrUSAnIK3jzteISGlMVNsolpWhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJxR4NrwzfFn for ; Wed, 19 Nov 2025 11:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b7cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:22:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a7ce2f34b43e - stable/14 - arm/mv: Fix typo in a kernel error message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a7ce2f34b43e102595b7eb31248726b5d8da63e0 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:22:51 +0000 Message-Id: <691da88b.b7cd.1c5ce917@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a7ce2f34b43e102595b7eb31248726b5d8da63e0 commit a7ce2f34b43e102595b7eb31248726b5d8da63e0 Author: Gordon Bergling AuthorDate: 2025-10-29 15:12:52 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:22:43 +0000 arm/mv: Fix typo in a kernel error message - s/Unkown/Unknown/ (cherry picked from commit b074d146969d3097c1e144623360b36083d74927) --- sys/arm/mv/mv_cp110_icu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/mv/mv_cp110_icu.c b/sys/arm/mv/mv_cp110_icu.c index c29a22538622..deab2e2c4626 100644 --- a/sys/arm/mv/mv_cp110_icu.c +++ b/sys/arm/mv/mv_cp110_icu.c @@ -258,7 +258,7 @@ mv_cp110_icu_init(struct mv_cp110_icu_softc *sc, uint64_t addr) WR4(sc, ICU_SETSPI_SEI_AH, (addr >> 32) & UINT32_MAX); break; default: - panic("Unkown ICU type."); + panic("Unknown ICU type."); } sc->initialized = true; From nobody Wed Nov 19 11:22:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJxT07M4z6HYTX for ; Wed, 19 Nov 2025 11:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJxS5ng5z3Y4Z for ; Wed, 19 Nov 2025 11:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6vkQHlsMD5TfDVaYTDd5eyAfbTdJSE01x78TRkpt714=; b=tkzVAVwPdr+FTdV3sFigFfmA7y0dIhN153cIhQfxdmo6EaYBOXzJC06cF8EU49lgKMvN+l TKWLhcQCBOIGabAp9rFi1K1VXTzhqzZwty98YMBo1iAQpBohXx0AEEqrvyFGMqpN+eaAaP 5FKazAjJcPatdKW1KAw8Iv6W5ORkkdY/KcRE7CT+nvP7OhAxBNvE63OqVlXJzYeCWg6kC1 UyIoPhBmRRK0TrKvW1B1JLBBpcADZPbgIAAkhybJ7NzYe8vLcO1Oexok/QigIp5M3Z1+x5 VbIOJfLaW+dbiaibuP69IVSCMf2nob2TGHavpsap47nW451XnQu4sY9z4ghxcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6vkQHlsMD5TfDVaYTDd5eyAfbTdJSE01x78TRkpt714=; b=GSKjm2NkhfxLrR1zbHy3m8aES6JEG+XcIqx9L2ELqPvK4LAKTQIGw/TUZpmHl3zB9CH+Jn GqWjAhVWfOrMzf9VexRPiPH4xDlbSBLXeMX00/JDA2wz4GgDpNddqGRu+Bhsqy6DkCFhiV VX7YyBSf6Nd9AjxCbsogKuoYAODcLf2WdOcwlNVhNXazmU4Zr4BE09Ww6SeZt6yYT7XFBA orIAIzVv0Gzmkj7q6e/zd0XF2wKPktAD8Xy/+N+pREIKOyL1eSPH4/uylHUmqn993Ug0jl W/n3ohdv4MlJIgpJuiyOl8T8K65z1P8de/T0v+veGdVd1siygdZoGFdU9SVJ4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551372; a=rsa-sha256; cv=none; b=Pqpz66AHCTR8qUfX5oTK8rzIZNA83Dcy30AeUIvAvruYPgo9Z7wK9CwCA9IMoMmCZOEyOw yRQiKE8hjs85TN5WV9filzFjnuPEXqUk2xddKZemhv74VVHeeuvLemY9qifVOGSeVze8dL uzLWmiaMv9iXIGOj+I+aScFYMrHPxUtA/RuRCMo66/vedXdHKpYqT8oigwNv10xoNEs8Bv HblvCXGE6ruGsZTtRe3s7ODbJAuFRK2k9AcnYd1RcSuGG7zWMlmG1BR/IX+/qO/K0NTcrv hxXkGEhmW0hJBVbvXA4a4x9cf4Uv853uwaRkwBDydBARJs5FHn/9TbztB0VEFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJxS582ZzfFp for ; Wed, 19 Nov 2025 11:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b99b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:22:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 88b980ad9474 - stable/14 - arm/ti: Fix typo in a KASSERT message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 88b980ad94746c58a43dbf0f92e3e8c56f578d1a Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:22:52 +0000 Message-Id: <691da88c.b99b.b3d80fc@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=88b980ad94746c58a43dbf0f92e3e8c56f578d1a commit 88b980ad94746c58a43dbf0f92e3e8c56f578d1a Author: Gordon Bergling AuthorDate: 2025-10-29 15:14:23 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:22:44 +0000 arm/ti: Fix typo in a KASSERT message - s/patcket/packet/ (cherry picked from commit 862024c00f3126220ac425f9ec1f3d4286064688) --- sys/arm/ti/cpsw/if_cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index 8cb748cfc119..f56dfc651260 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -1650,7 +1650,7 @@ cpsw_rx_dequeue(struct cpsw_softc *sc) port = (bd.flags & CPDMA_BD_PORT_MASK) - 1; KASSERT(port >= 0 && port <= 1, - ("patcket received with invalid port: %d", port)); + ("packet received with invalid port: %d", port)); psc = device_get_softc(sc->port[port].dev); /* Set up mbuf */ From nobody Wed Nov 19 11:22:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJxV0Bxnz6HYlw for ; Wed, 19 Nov 2025 11:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJxT5zDpz3Xm3 for ; Wed, 19 Nov 2025 11:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UfvrZZyXj+tUnyahH1L/UNBzvS8f74zuM6ZdcIh1DRw=; b=vlp4WXgmUPgyM1/PO5FoE3JuIoCBTyfJE2EbdQaCNb9tm3viW/XaW4nUp1O+2//5HyfdQp BYCXK/o1EKAHsfQoMdq5Gjs54jhzXkFStuPx3TIsRg1Y4bs+xV8cgveuMrBb9Vjaq0jojj j6NUeAQKr0HpSq/9PdPSO53yZZPQPQd7TzfaiSuqOnZ+SL5dgacAyb4vWtGCLRrcjO+fC3 TnvfuqdVj1DkQxKghPucPiZTel9xC8xLPq64IKTVNFBKq6gA9sGHpOxkH+t5cFVGiH7IDo OnTgaijTnp27cNrwUXMGRDAc/gyG6Mn6iJYvsmskSGZY3XdJIfp47pnhwArq/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UfvrZZyXj+tUnyahH1L/UNBzvS8f74zuM6ZdcIh1DRw=; b=eVSE5HazvnO2YvAUV2Sk0GAO38E4fmyToIvL6D5bpyHcYpoTAZcC8kkx8WrGqmvUyNYeUl 5Gwle99Ogu8R2RPKoM/b5wpXcnDne5eERjSCv3WZD0B0Bu46UggWzKDQlbyDxIs+L0x1UX ObZTxyxlvRHmuh4AHJ4xCHwtQN+RxntAHXWQOaaRNOzBk22ojeMqC91iQ9E1oV5wQZ7vp5 X5nYWAVSeEz4/oMqNWGzLxV/Ykrw/MXtuWbZl/lRGtuTEVoVM4z6pDBVo7OC8D/JH8MU1Z OGUrX3xUFZLAW1sFLBs0bhVilZN0Q7471qmNl3fCTSwlSoSuufH3VACiO39j8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551373; a=rsa-sha256; cv=none; b=L4JmwH6KElqJYH0vdNkGH9OkmQAW291i2Zr2Uo2IEIzR3msQsa2Je4+mPKGKscZsSUgWmp DVz/+wXyzGvCt0HwK1JiBXCxe5CvkX9KHjJ1o4LXNSwPcu/NDd+D4MJNAXvwuXlotiyKF2 TavRmhYJmkNGikuYrPOnM/0lSW21gSGi4ISHVp2JkuaUW+vaqvqMRagaSFg+1rzXfUzQm7 RnM1eVOW3tn6VkRhEY7u0ox2ssEctDtRanLCUM3lbuUXR7GfkdzGZcWyRDyXUT/qL2yBbl 2BxMV7dV8n1YBNZGJmcQ2x5XZllP9BYeVEbNex3nQeJZ/PVnmznng7l/msLKrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJxT5Vx2zdn1 for ; Wed, 19 Nov 2025 11:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id abba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:22:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 18e3b0c3cd4f - stable/14 - tegra210: Fix typo in a kernel message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 18e3b0c3cd4ffc5e2a0b20de4d327ca37d51c568 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:22:53 +0000 Message-Id: <691da88d.abba.1f3c9d2a@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=18e3b0c3cd4ffc5e2a0b20de4d327ca37d51c568 commit 18e3b0c3cd4ffc5e2a0b20de4d327ca37d51c568 Author: Gordon Bergling AuthorDate: 2025-10-29 15:16:41 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:22:44 +0000 tegra210: Fix typo in a kernel message - s/volatge/voltage/ (cherry picked from commit 6a02851a0e346cbff074dab87807c9ee9d1e8d94) --- sys/arm64/nvidia/tegra210/max77620_regulators.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/nvidia/tegra210/max77620_regulators.c b/sys/arm64/nvidia/tegra210/max77620_regulators.c index 7743779a3fbf..f6cd97709ac9 100644 --- a/sys/arm64/nvidia/tegra210/max77620_regulators.c +++ b/sys/arm64/nvidia/tegra210/max77620_regulators.c @@ -365,7 +365,7 @@ max77620_get_sel(struct max77620_reg_sc *sc, uint8_t *sel) rv = RD1(sc->base_sc, sc->def->volt_reg, sel); if (rv != 0) { - printf("%s: cannot read volatge selector: %d\n", + printf("%s: cannot read voltage selector: %d\n", regnode_get_name(sc->regnode), rv); return (rv); } @@ -385,7 +385,7 @@ max77620_set_sel(struct max77620_reg_sc *sc, uint8_t sel) rv = RM1(sc->base_sc, sc->def->volt_reg, sc->def->volt_vsel_mask, sel); if (rv != 0) { - printf("%s: cannot set volatge selector: %d\n", + printf("%s: cannot set voltage selector: %d\n", regnode_get_name(sc->regnode), rv); return (rv); } From nobody Wed Nov 19 11:23:31 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJyD0JS3z6HYJw for ; Wed, 19 Nov 2025 11:23:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJyC5SRkz3YvM for ; Wed, 19 Nov 2025 11:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cl6ZacvPsUmBRZC7t5Bo5f9PGyJ2MsicjYOfu0c2wxA=; b=FWM8poZAhqDlptW7O6vnxTknzg4kVsOUxLPHlzO5WbZkwj9LNPWmKUk/Gyk9I11OYZXMpT 0qcR3xZ1h8RsM9HnAdgINhEPTpL1iVcv+p35eeVqZGqRUMRXZ/eoLdfNvuKD+mH/ITZjdH WhC97OhAiyvCJ8wKdTlEEp9QDnCcB3iTWvHLliAUBAIUh5HZyWnZE9A1YXddW9XzE6TIaC RL3a0l2yBa7bYb0UOPE061p8VuH58IQ8m6YAvqTe538ULzaBlgYEnLbgG/RxB35ewnWmWE xdTcdJ75jTqUvBgcNIcuGLnBFfMfxQiUUsZDB1n9x3po485VZ6YOYY0NgGLHcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cl6ZacvPsUmBRZC7t5Bo5f9PGyJ2MsicjYOfu0c2wxA=; b=p7rry4+wkhCZMDqCr/V0Y8EQsOCVJaOnDnbrFcpRHDWV7I6gDsqpMnpN8WrShZPxj5rscY AJaihDtnssS7dsGmr+gp3EguVah6oO6ebl8hIDjoJrpzwgbSpEneT2509QotTQUSTop/EM QZt2YKNZ89Rt0hAA7rQsJPJSIhs+S43APBY9juFkkwEV2WubsseiVEi1VDDFRhqZDJZoKa F7XLALQxXbAK7kV2oyiUswONafAic4l+gFnQVuUFBCY81Bq3fQja40mgXDYHFn83Uf1D5J JWtLv9ZMj/1RJkd1MqxZV+rk6Xdw0qPLy884O3pNq7p5Jh1LDCgSJA9nfNHMNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551411; a=rsa-sha256; cv=none; b=u2pX7WdwMitWOPTm7P6hb/Ej8F0Efkaf4A1zUDP6YATFr/ByBVTGz7mS6+iRyw/5WZNWgB 3Lp0Aaom/YR12897k6fJ+MgN2kncd5dLpQS4Y1k/I56ydRGD42nEYrs0F1iXY5JnQh+2Ts 55PG8Zd/aPWGm0ZnKYFYG/ciLoZezmLunuerRDRzPvH+t1jLGNXc7PW73y+K87djSA5kxz LADlm4b0op449A4LP986jRNVjQ2JhKdv4j1nbx6FaIC7ZcGAj2MlnYOAAxu5t+ywdKx1WV qqpcu0mrGAYvCFyWFe5ceh8E9P613PPcruCLPVV5xlT5ah9VhPQ613x14OdaNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJyC544Mzf6j for ; Wed, 19 Nov 2025 11:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id baa1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:23:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 5d82245e983e - stable/14 - acpi(4): Fix typo in a panic message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5d82245e983e5d610d6060e70735b7a620ce6c00 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:23:31 +0000 Message-Id: <691da8b3.baa1.9f72ca8@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5d82245e983e5d610d6060e70735b7a620ce6c00 commit 5d82245e983e5d610d6060e70735b7a620ce6c00 Author: Gordon Bergling AuthorDate: 2025-10-29 15:17:32 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:23:15 +0000 acpi(4): Fix typo in a panic message - s/depenedent/dependent/ (cherry picked from commit f51fb91d616d49e91f3c2c706263a38b98176911) --- sys/dev/acpica/acpi_pcib_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index f2b05a98a0d1..b5a106ee017d 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -199,7 +199,7 @@ acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context) switch (res->Type) { case ACPI_RESOURCE_TYPE_START_DEPENDENT: case ACPI_RESOURCE_TYPE_END_DEPENDENT: - panic("host bridge has depenedent resources"); + panic("host bridge has dependent resources"); case ACPI_RESOURCE_TYPE_ADDRESS16: case ACPI_RESOURCE_TYPE_ADDRESS32: case ACPI_RESOURCE_TYPE_ADDRESS64: From nobody Wed Nov 19 11:24:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJz00r4zz6HYqC for ; Wed, 19 Nov 2025 11:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJyz6yvTz3Z5c for ; Wed, 19 Nov 2025 11:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eF++AAjdVAnY6ixfRzl7AiRG/7ZAqbot+iaXczs/aN8=; b=mQYna49PNIRPbHGwpAKU6Fg/hJMmL/ud2YofrQAvf/pyc/gZipc1/6VsRoWRUfWcLc18d1 QJ0M0pbk/OiaviLUDYca/V+9olkmisx3cylISxIIdeay4FO5UvjeHE44cpxONZKm9IzeKV 6HRzfm8E9uUaVWHjRd81e9bXELWA44cFy12cM3uRobn0I7YdluSAasJvoOmaYhJF7TrwRw O2QdzLoSFpBaC68V94yOXoG7R/EWgSo9++f+sZ0+eUK0VDDyoaekdTY6Z5LomEb3bm/EZm tn018DK2ifOd6Yo5vI9mP16wOShIk3RcCARlipBFioRkQPSQwxO/Mj7mUCWLyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eF++AAjdVAnY6ixfRzl7AiRG/7ZAqbot+iaXczs/aN8=; b=hhOe+8pih6vnytvZLh/XXL9dnHajkuFfVPPZxeKuTH8qS6BjolGMKWjbtLMPF2oxZe1/Fv AImLgie79CkzOi+Ih+0MVHvQAcGllqQsT2IsnlYDCMSizCRtgojEHz49VY0CLV40YiiEWJ F68CxGwqk1strlWASzWrSsLSoYsYw64xq7ILUNz8rT6nTCY3CpkglnQfGnNJR5f+Hqqld3 dyCcGql6QK9E5R8eMXrVXYa+qbI68Ov4yfA+T+ls6Mcr6p4gYYqdSDmXXAocBl6XOh82zR 2zbAb9aeQBKtD0HrH/C2+X3MIQYwK0sFxQPoDgkawSRPRW0eKTW/BplLBer0nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551452; a=rsa-sha256; cv=none; b=K9Uh3PMvS7cRTYnIfzI8W8g1O/TzZAdVC4PWb6Cfecfd6GjvVooUGQhLvO/NoEYYxco2ZP D9BNFS0oQedVuyJ5xCe4roL/UH/TFEkvsLt376Kd0gTZ4auQqd/WYTh/0XVnjjVY2U9Q2u It4kqKn3puwHiCnF5s4PO4cLPBslYd7vlnI/A93IHzIZYJG5QC/hF7zP9gsERhi77rAkAq X8EMUjbOcHMXRk8T7J3srv97dGld0EL7eq4Qr4Yc/H1meFjypzacb7xT2c609okbzYO3uJ g+OufRyA7ZtGNzCPHSx+Wa5DpoaH8M0Yy8Qy0Ofs9S6SkefTBIYQ3QVgmkXSFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJyz6Yzxzf6l for ; Wed, 19 Nov 2025 11:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b91a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:24:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e8785943e769 - stable/14 - ale(4): Fix typo in a kernel message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e8785943e769708c15009ea2e04a2f9b0ea4c7ec Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:24:11 +0000 Message-Id: <691da8db.b91a.653b5f12@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e8785943e769708c15009ea2e04a2f9b0ea4c7ec commit e8785943e769708c15009ea2e04a2f9b0ea4c7ec Author: Gordon Bergling AuthorDate: 2025-10-29 15:18:31 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:24:02 +0000 ale(4): Fix typo in a kernel message - s/sequnce/sequence/ (cherry picked from commit a675f3bb63774a63f668749c6c3c8dfbb6be1cd6) --- sys/dev/ale/if_ale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c index e0b936994ada..70a0ace28929 100644 --- a/sys/dev/ale/if_ale.c +++ b/sys/dev/ale/if_ale.c @@ -818,7 +818,7 @@ ale_sysctl_node(struct ale_softc *sc) /* Misc statistics. */ ALE_SYSCTL_STAT_ADD32(ctx, child, "reset_brk_seq", &stats->reset_brk_seq, - "Controller resets due to broken Rx sequnce number"); + "Controller resets due to broken Rx sequence number"); tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "stats", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "ATE statistics"); From nobody Wed Nov 19 11:24:39 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBJzW3fg1z6HZ1g for ; Wed, 19 Nov 2025 11:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBJzW2wcnz3ZVl for ; Wed, 19 Nov 2025 11:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M7I2pZ+cxWoxv0GpHEv5gY6nSH9oZWN9xMEyz4lMHwU=; b=C8tBTKNhGSnpvRRJhSLEHtYulA/rnlVXLTwBYqOUrtOWrgdYwhIOwBuUXPClsKp+DsCDka LR2qyl2ghxUcxf7j37s21DfU6byrnKbJro838D4hdSq9mEoIxeW22iy2dYLtViXSEb+ijj 928ZNhCAbyi+TIvJlxCj34OjNBF0siFbXateQV8ZaK6eTL1MV48O+7XEsRTRmmSGRuNHrf Q00A2W4baEmCIEgQ5x77ZHLLGfDv13GBUU5IiXJjKkjpmcxns7++RMUEwpRIunjz0TeSpH zCr+PF5U20YENUTIr2qVVDPgY8deM9s+f7D1s7yhqlE19GHIw9VqzZAdl4az4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M7I2pZ+cxWoxv0GpHEv5gY6nSH9oZWN9xMEyz4lMHwU=; b=SVh7dE4Wa6kZStG1moq1Ma5jinvutitWmd7DHHNLEKfZGd9DpAzIhzuRQ2aO3NA2pBd5VZ ma7MPd6s4vUiZ4a+SnYh40SOqdTPX2w69hYL+trG5ErAXIao9934butAF4mq9pQzfxag/y MQirsT+whBFyUhWhOh0yq+pj5EK9dqhXcIAGldaC6SYyG9IFa82XivZedW2bEhpYJntzVj iX/UQqD2vQV+xhpROW5q0FxN/ZpCh1EtpitRzlqr7npG4Udlz2jS5N/BYWa55BNtbifHZz l0qVUvgJUYUzTJWEyavlN2D1bBQvxOnSFZ7HKfSk+LaJLxh6F9D8s7en0cWaXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551479; a=rsa-sha256; cv=none; b=Gc10E2bp7dtR4Qxu5H3dEGMKXlLaa6xJWVOtjwluvsHAc3mpBrvUfBNg4TK19qMlilnUhy 7VxIIyoj645gZesFN1C1F4Smxw734Sui73i7kbrWg7sB4ltR/YvRX3Ix9F8mQ1RfE3ojyd vE7nGA5lTOqyBrDsSjcWChSBIgHx9kAi4QUvs+HSMzmPlC1U1QCsjTYTDY0UkHKVeeAY41 NanMvsLsKBoR9Zjr2dVQMecMEOyEZnPfATGdUHiU27wfC0+k9fMa6wo+q0ALozCAlVA00u E8fdmQ9vHQpnwhpQCy0ddwQ0bnawAx8C1E40IzWhNv70W1R3M7yWR4xhksHMhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBJzW2Rfkzf4m for ; Wed, 19 Nov 2025 11:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bb9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:24:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 07792c725bb4 - stable/14 - amdtemp(4): Fix typo in a sysctl description List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 07792c725bb4c974222c61bb79ba80dbe70e018b Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:24:39 +0000 Message-Id: <691da8f7.bb9b.64e87ee7@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=07792c725bb4c974222c61bb79ba80dbe70e018b commit 07792c725bb4c974222c61bb79ba80dbe70e018b Author: Gordon Bergling AuthorDate: 2025-10-29 15:21:25 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:24:28 +0000 amdtemp(4): Fix typo in a sysctl description - s/temparature/temperature/ (cherry picked from commit 85d6c86f4b53e6ac2a9b163c553b48466638f394) --- sys/dev/amdtemp/amdtemp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index 1305337112b6..12a451b05207 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -643,7 +643,7 @@ amdtemp_intrhook(void *arg) OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, sensor, amdtemp_sysctl, "IK", - "Current temparature"); + "Current temperature"); } } if (sc->sc_ich.ich_arg != NULL) From nobody Wed Nov 19 11:25:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK096csVz6HZ46 for ; Wed, 19 Nov 2025 11:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK095SgKz3b09 for ; Wed, 19 Nov 2025 11:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aiXFXiwIBBTlYhZHlnacjhRm5PoBLKIsFowHazGBZVk=; b=YjdVlOaDI/ax93cJ535UZ1rmSacJgN6DvqXxnrI61GbQT8j9LZr21G34D9cVeFd+PHyJxG +EK4o0qNQTbP/0HT2clR6NEstcp+RUzQRZ1ImbCzaxyai/WZwdYxO0ubY8KjVQJyiD5dQP GjWAqByZhd6fL2NKpAmVCif5e8KglrWNcYN6sMGOv03xMYlJx+pxzviObud06gRLH29WZR d95jEbXmsjIi6OLX7WTIMYimyXnfbtBET0zA/bBHkC89A7R040bRpvOz3VqiJ4y3oGjtrV R1sRhRwMTav+7VI43iGDnPkCiJfxe+T71WLECvUYFsiBmQF+AU07wneAO3TgxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aiXFXiwIBBTlYhZHlnacjhRm5PoBLKIsFowHazGBZVk=; b=OONcosIrysQRHw4zNpPYPh2RixRa8iGyjWwg7UJiM+y9xbtmtTsaj5ADqVK2PhcZ0aUFSe wneU3I1C99RBOq4s+omtHm4pzusLm0///0m2APn1Z9VSVVFZ8A3A2CK42b2fRbKOtLjawt PkKyXC/OTtOGDZZX4vRooCX+uQU4UkeKemhs5TOaGOL2WdAd7ELFOUqs5mwMLOC4+Q090J H1Ifmds9toDSygLcd9d0nZV7R1hol9LDh6CBXYGIuttRgFY/3JF5XlnhMWarUbeYzG0t5R uLcSGDDw6B55ZeGsd5lc07PkeLkqDBniVsnvgx7j54+aUguVKvTYDYA6azIRog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551513; a=rsa-sha256; cv=none; b=Oy191n/HVu7/myAVi/ffbnoFq2kE7Jm1BZkMzuIm300Jns9p1ZMz9rHxyH+cqfyBkaEvDq EKEW3/YNeDhmGMJuWwJhoYrpG7VPlDgCIYmAw/ZbIyIC0uJYS83KdXFfncOO1sx55m1Joe /lTkH1btqBLe2oiAWrvEYjO0KHDepR/aZbwVPdWHc1TNr0oWCW2BO4b2kfQma3N5nhKwuJ XrSh8VDqa3pkNqDKxva8iEyrWH8yQVrMa9GwTqxNtBtnTJkZbFzIoDrQqjVVW8Rn6BEaDu 4GIXW0crg/Y8QMMKNsyWD6mUL1OHhBexuGYyy+voiUa6GKIhw42p9yQhyF9new== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK0951lbzfFq for ; Wed, 19 Nov 2025 11:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id abbe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:25:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: c1500bede861 - stable/14 - oce(4): Fix a couple of typos in a sysctl descriptions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c1500bede861e36ab48132bf54821c3657523f30 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:25:13 +0000 Message-Id: <691da919.abbe.3f048ef8@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c1500bede861e36ab48132bf54821c3657523f30 commit c1500bede861e36ab48132bf54821c3657523f30 Author: Gordon Bergling AuthorDate: 2025-10-29 15:24:00 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:25:02 +0000 oce(4): Fix a couple of typos in a sysctl descriptions - s/Fragements/Fragments/ - s/Recived/Received/ - s/Alignmnet/Alignment/ (cherry picked from commit 542f5985a8c2e7cccc9beb9801ec166082bb7e68) --- sys/dev/oce/oce_sysctl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/oce/oce_sysctl.c b/sys/dev/oce/oce_sysctl.c index 1b903d8d027a..544bec9438c4 100644 --- a/sys/dev/oce/oce_sysctl.c +++ b/sys/dev/oce/oce_sysctl.c @@ -716,7 +716,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "Total Received Bytes"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_frags", CTLFLAG_RD, &stats->rx.t_rx_frags, 0, - "Total Received Fragements"); + "Total Received Fragments"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_mcast_pkts", CTLFLAG_RD, &stats->rx.t_rx_mcast_pkts, 0, "Total Received Multicast Packets"); @@ -748,7 +748,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "Receive Packets"); SYSCTL_ADD_QUAD(ctx, queue_stats_list, OID_AUTO, "rx_bytes", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_bytes, - "Recived Bytes"); + "Received Bytes"); SYSCTL_ADD_UINT(ctx, queue_stats_list, OID_AUTO, "rx_frags", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_frags, 0, "Received Fragments"); @@ -786,7 +786,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "ERX Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "alignment_errors", CTLFLAG_RD, &stats->u0.be.rx_drops_too_many_frags, 0, - "RX Alignmnet Errors"); + "RX Alignment Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "in_range_errors", CTLFLAG_RD, &stats->u0.be.rx_in_range_errors, 0, "In Range Errors"); @@ -932,7 +932,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "Total Received Bytes"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_frags", CTLFLAG_RD, &stats->rx.t_rx_frags, 0, - "Total Received Fragements"); + "Total Received Fragments"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_mcast_pkts", CTLFLAG_RD, &stats->rx.t_rx_mcast_pkts, 0, "Total Received Multicast Packets"); @@ -961,7 +961,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "Receive Packets"); SYSCTL_ADD_QUAD(ctx, queue_stats_list, OID_AUTO, "rx_bytes", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_bytes, - "Recived Bytes"); + "Received Bytes"); SYSCTL_ADD_UINT(ctx, queue_stats_list, OID_AUTO, "rx_frags", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_frags, 0, "Received Fragments"); @@ -989,7 +989,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "CRC Errors"); SYSCTL_ADD_UQUAD(ctx, rx_stat_list, OID_AUTO, "alignment_errors", CTLFLAG_RD, &stats->u0.xe201.rx_alignment_errors, - "RX Alignmnet Errors"); + "RX Alignment Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "in_range_errors", CTLFLAG_RD, &stats->u0.xe201.rx_in_range_errors, 0, "In Range Errors"); From nobody Wed Nov 19 11:25:39 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK0n43f0z6HZ1x for ; Wed, 19 Nov 2025 11:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK0m6xvrz3b8y for ; Wed, 19 Nov 2025 11:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dOrZJgUQ6unb7izFsW9ZalRX2T5BBbhNGrtM6b7PXzM=; b=ICGyprQK7zjgfmgizhpThB0T3rNY5OoyKvnK24BNZneelSIpzxWvcyxcsTKPD6qENYv72y epBuMAuRp3rdufKvsgAjVGpQQB0Vxcjbrheira2/+OSBwp8PcRInMsNRxzRv35few0bILf 3S1gMytbb/zTD3JcHBKOlrT5UG5qnXV1KUecq5BzkvDjmG4CqvNs7/ZdERz1NDTabIGkK5 JvEzts0sBGHnt/QjlERO25jye3rzd9BSCZxAe0j0V+rWLF9FYkIkIsnrkhc36RNR79Xon6 /jcUNJXXBf9e5/ZVsp8zNGS1lWNzQdmkmEFJCRC2pFdN6Chjj4zdfyN1vSJlTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dOrZJgUQ6unb7izFsW9ZalRX2T5BBbhNGrtM6b7PXzM=; b=vyvy4oUsKqPujGNvwLtTIgU9pidQBXud/v5L9qb+g4QuKXmlPEPUfGxI2lI06t96X56GVq PIIhfA64GWTjQUtIFv7TKyXfPmM/Z/j7Y4f/3wXRXOAL8Zs4MZ7J0JxbRTeYRjiAYoKm/Q mcLGRRfKm1vvGJIAUwcGClQHgBwCf1Jw85Apv44frnP6LLs/hOmKdqNkUWR+rqfaiXhBX8 xnkFPA0jNG0fEGfqREMnzEC/OXRigwQvWkWyRqDDg1rk1/2EHxerldleesFmN4Qsuu91kn 5UcsRGWX6FFBuQol6Bjk8jjMOVCFN8EzDB8ZZw1x2pftCBBp3enhjk3qW/4ZXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551545; a=rsa-sha256; cv=none; b=Zk+Embz43gk0oi8Ia1IG5nv5peh6JtvuKA0NpoSDQgZZY0so7sAmGntzOq9mMC9Iigw+hF J6STjE5XnHeKJjO3zf5UgE082aWIubV0XjBuT3NaRTX5IVdyhKLdgn5piVRysOQR/i2hFX JLpVtMrhG1VvHEPrqz/ump/7CWvp74I+j0CNvmLNOdSVJJiPY4wOwrcFKthkS1hsThU9Gy NKeDHFcFL4q+MVomdpLz95c2yqCxAardR7fBqw7e2LNuOa0miNzg5lR1f96ZwwfWbMdGjI sF8ohYfemBVn4Gh98H7m63N9BWjwxgX23P8rK/aGEOTr8B7pJxu69JlXiMFV9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK0g6RnKzdyK for ; Wed, 19 Nov 2025 11:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bb1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:25:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a24f891d999c - stable/14 - vnic: Fix a typo in a device messsage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a24f891d999cd6f2a91bd80af139cd329cd02115 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:25:39 +0000 Message-Id: <691da933.bb1b.7198fc89@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a24f891d999cd6f2a91bd80af139cd329cd02115 commit a24f891d999cd6f2a91bd80af139cd329cd02115 Author: Gordon Bergling AuthorDate: 2025-10-29 15:25:33 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:25:30 +0000 vnic: Fix a typo in a device messsage - s/interrups/interrupts/ (cherry picked from commit 74a44a0bc8ab965d28d1ce804d3f0aead035faf0) --- sys/dev/vnic/nicvf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vnic/nicvf_main.c b/sys/dev/vnic/nicvf_main.c index dd44e420c78f..59f7abeacdd5 100644 --- a/sys/dev/vnic/nicvf_main.c +++ b/sys/dev/vnic/nicvf_main.c @@ -1402,7 +1402,7 @@ nicvf_allocate_net_interrupts(struct nicvf *nic) /* MSI-X must be configured by now */ if (!nic->msix_enabled) { - device_printf(nic->dev, "Cannot alloacte queue interrups. " + device_printf(nic->dev, "Cannot alloacte queue interrupts. " "MSI-X interrupts disabled.\n"); return (ENXIO); } From nobody Wed Nov 19 11:26:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK1B3f3Hz6HZ1y for ; Wed, 19 Nov 2025 11:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK1B2jVmz3bPK for ; Wed, 19 Nov 2025 11:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2F942xFPnHMb7akXSVH4sdeL41VQQSyo9+fO83qows=; b=WYokD4Tjplk2nHX3HisgQ/wutf4AK636OiYGG+nLyQfu0ShHrOywihXsVv81M3t7sXxddv VmTOZCrv2WRZRs2x6aNfyxEiOYAtDptMd6CdN/sjNWNUKOT0GpNtDRjrN4W/pHAy+Xf9sD bzoNTHfRbK1M6P25NUMUKmRAeyxGEO+z69bOwWHVT4FeKyULQYz6NQGIUdrl/h0mGiIntF VSPrAGj57Zw7aMtEiYk70rRWa/Xa4aRdpcbfBCJ7rt/5E6OLykuJwFcPYJyooVbeLFL9oG mhecT+jx/eEbmNN3nrVx4rrLMtpHsU9jaMXZAj9WT+jWfIrzxF88F8TNyX9XvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2F942xFPnHMb7akXSVH4sdeL41VQQSyo9+fO83qows=; b=RKhnho4tWgLyL+++m8dkWpwoFfnG3MeaRIcP17ii6oHjB5Ch4qwrAdKCLLDpYhqtUyIcuT WzXXSeAXOqOHkF68OspV5f3CoOy4h31vI9KI5aU7hUxNfsOa2+kayRnKVUiiezuI75z3ST tZ+s+rI1Q6b0my8EEHF+/IHziXzzly24aedhR1JZIojOmPanBFlO7Pw8dNAX13eiy88LkJ X+3iMPV62Gd3lO7VIpV+ivNeNwzZSnTx40nkuLgSeNs6MaJwiaUl4XNHXJdf6wjYA29goL 1jo4XEegI35RXgu36JxJFWkUa6EGCv0JIE0pMq26jHfVjGB8o1yfUSFS8PJ3ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551566; a=rsa-sha256; cv=none; b=Ouz8SJRpxDnnBtCYL+qL4OdiDIosKNjUa6yC8KgFUY6AWUQvlJnPsP8Won9jIrgPP6FQXS S3Q1QMXUq2HbzJvP4PnCNmA2EYrGIXOoYourihlyusHbMmTMSrzyCTK+7lR/HUm4PsBFEi YHZbXO0HSy7CCQ/6e6fRE1Jo6YDrJNqWXEpUWLFHs6bjoVxJRY2uDBuE/sR9LvFJxHUiHt 9RWi+iP2SjRcMhJUu/8RVjnKvEJiN3H7vtJCPbRCY7Xi6O/yFFJMUreYOb7nw72/vkcGQO kA7rBlZ4uBwha2KpDJzUh3V4L4ORwXxTraE666vQtr4HWGAhyFnM0wpjZbIoSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK1B2HtHzf1K for ; Wed, 19 Nov 2025 11:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bd2e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:26:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 5054789b93fa - stable/14 - ath(4): Fix a typo in a device messsage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5054789b93fac7625a46d51ce58e1a104dcd2d28 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:26:06 +0000 Message-Id: <691da94e.bd2e.67a1eec2@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5054789b93fac7625a46d51ce58e1a104dcd2d28 commit 5054789b93fac7625a46d51ce58e1a104dcd2d28 Author: Gordon Bergling AuthorDate: 2025-10-29 15:26:59 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:25:56 +0000 ath(4): Fix a typo in a device messsage - s/Orignal/Original/ (cherry picked from commit 3eaa2a852b475c7f063bbf677fa536e76514d309) --- sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c index a0c27828bbc1..50d7cc0aa7a8 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c @@ -76,7 +76,7 @@ ar5416IQCalibration(struct ath_hal *ah, uint8_t numChains) HALDEBUG(ah, HAL_DEBUG_PERCAL, "Start IQ Cal and Correction for Chain %d\n", i); HALDEBUG(ah, HAL_DEBUG_PERCAL, - "Orignal: iq_corr_meas = 0x%08x\n", iqCorrMeas); + "Original: iq_corr_meas = 0x%08x\n", iqCorrMeas); iqCorrNeg = 0; /* iqCorrMeas is always negative. */ From nobody Wed Nov 19 11:26:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK1h4Nz3z6HYtg for ; Wed, 19 Nov 2025 11:26:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK1h3nx3z3bZ4 for ; Wed, 19 Nov 2025 11:26:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pec13gA7IbXvnFP1igyzpkI5PDxvZP81+j1C6a1kxyo=; b=CASCVW3W1oUZAdksqYxntmOEDNXtHWUQlnOYoURBGTI4geF9vOPgL5Cp2FxaRfng1Dt+Zy 2F5sF4dcMOzOj/DOCMenvfThRHg1aRWBt4R819RJiXcomqta/GBan+CYNKc4BFmdykeast fkv6jyBpQ/WqL1ey+IX9+URcmmHJxikGLgYN5wjEWTtXwDEfY+vLi9TiE9rMKlLCbMXMhU 86PsUgyLvBfp7x4rAMtzPAOiXyZwLkuKEQ4OckJ1aODfL6t3AMsZr5pqyxdFAevjB8gWv3 OBImswQOEgOdq/6WhyvsVZbrWaH49X25IZ9sA4qLf9bj9NDn/JfCACUrgINz6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pec13gA7IbXvnFP1igyzpkI5PDxvZP81+j1C6a1kxyo=; b=BjhKFNtbouSPtw9nKlPsHscGcib5pkTCxbUwAnqrH684pwq+uTp2hPJ7Pcplx8SCDSNDMM rkKwbAwT6S8Jn7mJdOkpAfgWOCjSUmIRuWocfnxALmFmKd6IoTORUaljoccP5I3ED5Cly+ tELdJTjCLSPyM7g6u1/aT60yJEIPhyECouCYhP1II3b0xe7zNgeT04KoosRI0Vrwb1Fi5d dbF/I7vBDtdoukWDA8JAkNoGvTmgGEE+kZWxsekTKVITAAczC53Q+Jxl5qvZ6+dQatR6um OK1eqGwYsiFYu5Sqzie4G+KX2hlaXNrZ++f6RoKIwoK97AcZ91i382hHwZ+eLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551592; a=rsa-sha256; cv=none; b=KKP4IGHd2qoy/9dxlnSwYOpAUovOzdxCoDxqz7CzO1nqlxcN0JBWtDBvLYhGPSyJ/RJr+S ykon+NoO0qxeeLApQkdWbRAp+UJ435I5MUqUEiXpig1bBsyNhXMGDa4TnmPO/vEUULCk6Q 2MZ/Nv8r83dL22jYpM4lepfhhfa8xD0bYD0/5eysId3hNJDFSTbUrpxY9u3oEQKLjH2i7a Fzfnbhh71C5UTCFszDFnB80M/btD8Jei3JGMNvLu0KYcjtW37V6it+tTke/mslGOCSICXF 2jVwsGc0MeSM90X72vDti5fwRxmhq1g3UQn20PzZEbFRWaohWG5R2aA7/ZCZ4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK1h3PWlzfRs for ; Wed, 19 Nov 2025 11:26:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b91e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:26:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 08e65097a1f3 - stable/14 - bwi(4): Fix a typo in a panic messsage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 08e65097a1f3fb155e98a0ae9b9a7098cea8ffd4 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:26:32 +0000 Message-Id: <691da968.b91e.87efd78@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=08e65097a1f3fb155e98a0ae9b9a7098cea8ffd4 commit 08e65097a1f3fb155e98a0ae9b9a7098cea8ffd4 Author: Gordon Bergling AuthorDate: 2025-10-29 15:28:06 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:26:22 +0000 bwi(4): Fix a typo in a panic messsage - s/unsupport/unsupported/ (cherry picked from commit 404af374b10ca56c6f82510a5bb23232a9f25c34) --- sys/dev/bwi/if_bwi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bwi/if_bwi.c b/sys/dev/bwi/if_bwi.c index f9a6b2357cc0..44b16dba5f8a 100644 --- a/sys/dev/bwi/if_bwi.c +++ b/sys/dev/bwi/if_bwi.c @@ -2896,7 +2896,7 @@ bwi_plcp_header(const struct ieee80211_rate_table *rt, else if (modtype == IEEE80211_T_DS) bwi_ds_plcp_header(plcp, pkt_len, rate); else - panic("unsupport modulation type %u\n", modtype); + panic("unsupported modulation type %u\n", modtype); } static int From nobody Wed Nov 19 11:26:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK2D3Skkz6HZ6t for ; Wed, 19 Nov 2025 11:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK2D0Dmkz3c5r for ; Wed, 19 Nov 2025 11:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2mhM39Qr1CJSuKfmuAbn1M/QbLPzfEQmB6ZQDwWazE=; b=Hy+NSSIlO7rMSCyxiLFuVk3qrD0a/ap5Ib4Bsi3XxrrQOoeSO3X9yg9V1FEE7HkYPFWPC3 10cSxa+lMuvb6lK0uKxmELL2yKtYl69VCtW0ySwDgeVwl5SFpWXXxGdo46TJgAntpvimA+ QWIt3RilRcD+CCbKHbxpQAmCni2vheBzLCVF3Jx8bsya2Syc7WuUtc2pDskTl/WmlaH5UM H8akPuhmd4uhR4TjYZeNS85G4jzx/xGoaKixEA6Buk/YZrCum5NSvOsZSLqzRvP7lz9Bzk 5/+hRc6iuhtB+o+5/BiZzJ1uZbdwRVWyz7EOAXcXKGKe1ReMwcVypl4JL19ZVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2mhM39Qr1CJSuKfmuAbn1M/QbLPzfEQmB6ZQDwWazE=; b=UCjZt5S3y57IxskrsB66L+AlQhByn474TVusJ0bQP6gQ2vGpfOD6dsyM9qktDZrVH2UO6j Pvlv+Zhix568Id9VdtTCSVr1JCHy1/ZvWht3wrEP35mDqMzDgiYb7E2stAvGLEMOvzFuAn FryQp3RDdySYGscnUqY83qb/bvypcG9/qXIKalgafOFecCe3DNHliRyhA7YjKhGq0F/reA W1+lRhJhjiK53RO4uD8S4N8S+M5rwKMGbneV4yYt6e1PlwptzesO+91Z42HAIs65D5YNp2 TLMszkHzkZ+TcFRfaopzZgJC8qYc/q+YJ4KRIEHZOTSvVcrN/F7GeAP7846m7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551620; a=rsa-sha256; cv=none; b=U1FLcaqSOIjNUbcG7Cp1h9tFNyM3Q3UgEe0IKNDU4ar7+hF6HX3v3ZqVggljf89hHbuYa2 D2BeKX040nfzurst+dNlB+jZ9fm6UeC1SczbIwRTg6x2kjF5KK6E5L4mz9ET031zqLg5K7 NXyqDuhzxPi507CB9LwM9HfxEOHDIz3D1syZ83IZ0/tnAZ40xjbvC+hBv4UJ+MT4HxCGe4 jv/GcOHDHdp86DPoThrNVLmy/M2HQ+1TpLvoMC+ZDGeJjJG+OMO1o74/0L9Gd8lq0gqzP9 t8qtmXfO71xEG4bVnHgsbuAdVZwhnNMO/3nukYoeLKYB9xDxKCUItSpZyr/DXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK2C6spvzf1L for ; Wed, 19 Nov 2025 11:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bcfe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:26:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 27ef84d447aa - stable/14 - cesa: Fix a typo in a device messsage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 27ef84d447aa304ac5119630151e9c0bcdb118c0 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:26:59 +0000 Message-Id: <691da983.bcfe.7ad937c4@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=27ef84d447aa304ac5119630151e9c0bcdb118c0 commit 27ef84d447aa304ac5119630151e9c0bcdb118c0 Author: Gordon Bergling AuthorDate: 2025-10-29 15:35:35 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:26:49 +0000 cesa: Fix a typo in a device messsage - s/exhaused/exhausted/ (cherry picked from commit 081aa26778f3facdd836c28b2e3fed5de2f8b7b4) --- sys/dev/cesa/cesa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c index 516aaec45387..d7f7bf5ee48a 100644 --- a/sys/dev/cesa/cesa.c +++ b/sys/dev/cesa/cesa.c @@ -287,7 +287,7 @@ cesa_alloc_tdesc(struct cesa_softc *sc) CESA_GENERIC_ALLOC_LOCKED(sc, ctd, tdesc); if (!ctd) - device_printf(sc->sc_dev, "TDMA descriptors pool exhaused. " + device_printf(sc->sc_dev, "TDMA descriptors pool exhausted. " "Consider increasing CESA_TDMA_DESCRIPTORS.\n"); return (ctd); @@ -300,7 +300,7 @@ cesa_alloc_sdesc(struct cesa_softc *sc, struct cesa_request *cr) CESA_GENERIC_ALLOC_LOCKED(sc, csd, sdesc); if (!csd) { - device_printf(sc->sc_dev, "SA descriptors pool exhaused. " + device_printf(sc->sc_dev, "SA descriptors pool exhausted. " "Consider increasing CESA_SA_DESCRIPTORS.\n"); return (NULL); } From nobody Wed Nov 19 11:28:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK3T1bGtz6HYyp for ; Wed, 19 Nov 2025 11:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK3T0xWVz3cTP for ; Wed, 19 Nov 2025 11:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wW0eJkNhp1J+cd6+NF0gGf4urqV6VYc1+vcqmE3qKB4=; b=T3+jlwdTHhbjo6B3eaM06FYHIlBmIhsl/4AL1h0Z4n7qqekHo/ZkVegjMpzYfo+Vnxkzs3 bsijUTgCiUPGjqlqbCu159RSXRy3lzMg9Zn2x3IWSed4YDyxoXkpwfcXnulzoIhwEXVMbX k3ayQhi1M6C4EG/6Ire+JfBmv3P398S9d3+xh6dIQCly2sTbdzJgmOjl2k3PNqZKxVJkeB ge8h2B0abeJ9zIZ58i0gQ87mManb7cePNoRMzv0WgyQXbTY0HpJEEaAqfdPjMl7sefsB+F P1GPKSuwysRB4axBeIROrg4Mpue0HZUa/zRQvcCiV1+RgIEBYUIj8VG9u3gnrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wW0eJkNhp1J+cd6+NF0gGf4urqV6VYc1+vcqmE3qKB4=; b=ZSHNR2hul0f75s0o7qAUagWCfPqTBG2PCgKjMymgmuICnKuA/XCmmAWoIpI6LQpePu7i7W 8G1TmjmbP22zf4r35V5acq0tdgilcbI2Ak8DzxYZC5nS+jwwy5XBiXy/ynCaZWKdBIuNxC 4q9OsO4mBISSKUNVZYbzLP+p7xb44RtXjLYepDbG0/ORYRYUiWV1GT0iVPlBQZFD1wJSV1 5CqNFuP2pDbSdakjC1H7Bd26XxJTY8j6JvDWS1SfhJpe8ktWIUBgSuNCZRZK+ku7/e17Ss WTJCwbii+JrC3Js3POiuSF68y53CAF1yiqCq0E5U+ozN4cwtlb37qoytCJOGbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551685; a=rsa-sha256; cv=none; b=awDE0ebuv4WpeKa8HvUidrpAYHHESFyuayNbPBL7PMW6iAmRGK3Kl3Sa2ujuZu3WVvNqfx X+UkFsxBKMblx6Z6FH0bQO1o/qYvguNNQXE5XGvj5vyYUCnC7DKKG47kDqSIYSNFJSLFh5 a1iC0AhG8AL655Z43CNK7jlABUC3ltloxhbn0MlRdjqb5V7NLFk2ABLv9i3N50keZdgoC9 c/+Hy3ebCbvnn94StdHcBiIq4cL/dEwpaTDvLw3O+GYN0CX2tucWdZkLhFaAMlBrUPvXNz NeGwzD0N329fhso0kQ9qnbZ602hFj0MjSK0ws56wpGbOdWUdiwtdmQnAlGXhEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK3T0RhmzfV0 for ; Wed, 19 Nov 2025 11:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c11c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:28:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: aba5152d983e - stable/14 - ciss(4): Fix a typo in a debug messsage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aba5152d983e42d5d755c35cb32a0c4fbc78b7fa Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:28:05 +0000 Message-Id: <691da9c5.c11c.17def6ad@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=aba5152d983e42d5d755c35cb32a0c4fbc78b7fa commit aba5152d983e42d5d755c35cb32a0c4fbc78b7fa Author: Gordon Bergling AuthorDate: 2025-10-29 15:36:50 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:27:55 +0000 ciss(4): Fix a typo in a debug messsage - s/unspported/unsupported/ (cherry picked from commit 84d75bb018e1800d610760191ff64c3eebcb46d7) --- sys/dev/ciss/ciss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 6723d05e0cfe..36030dd86eef 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -3078,7 +3078,7 @@ ciss_cam_action(struct cam_sim *sim, union ccb *ccb) } default: /* we can't do this */ - debug(1, "unspported func_code = 0x%x", ccb->ccb_h.func_code); + debug(1, "unsupported func_code = 0x%x", ccb->ccb_h.func_code); ccb->ccb_h.status = CAM_REQ_INVALID; break; } From nobody Wed Nov 19 11:28:34 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK425JBYz6HZ2c for ; Wed, 19 Nov 2025 11:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK424jXyz3cpr for ; Wed, 19 Nov 2025 11:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXbQNtY5E7eWVy+LR5+Zs5zl0K0CB4WyhUVB0jOd7bs=; b=N7TVr+UxBwNTDUh40vFPpDe29Fib02gahmSUEXo60FyuRnHtEtnJl9RlRKcaS6QuiWqp1l OpRcHWMFm3GKca1NIkLGbeWCKt5tPWLB8yIDptSa2+krRWhWLhIvmnF873zqjAkvU3qxSg 3IKa1pYuThHqqEGH3etsFUgAfMoR4SHxsL0zNU/kQM7Q2Y/0hzYZbIlYS24hIsBUBwEe5C WvkkzXzmmnTUDhsRJz9MBBsSqdrrpqL/2H5gv4sZT6jCcXKiC/7yBa723iJILFUN8x0bzY r66xVf4UkwqSITd4x5E0BkryQ9ZtDXXvcWCqw5ViPKpKvaSLIYWAlNLC9NKvXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXbQNtY5E7eWVy+LR5+Zs5zl0K0CB4WyhUVB0jOd7bs=; b=i8rywgVR4LcSnvJDzUSN3zUneqQAiWhkeUrJ4zB1S/T/gBWST+leyc/HNZBVATLgWLLxHk c/oM8PCqWbIAvUxcBrgWN4/D1MqJFfUvTWas4IQ+QvdzJb2zo++qtQrMLXuY1KNQiKWh6N yUnxHf/Rw/lCQJ/wUcVZoxI5ZcqsjD+hNP++JvEyVzpLiiltMLOB/lhxojE4Z8nqB5XYQx yBdHWoP1UvfmMaEUyy6FA0jItgg496d9heZLAcyldI4WO2DtG9G0Ddy92u3AHjIGYsiIHA +Ul4qN2F0gS6XNzxdVsElguenBxi8EqVT7FUZ+D0LNXSdeNGt/W+sp5HwPrAhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551714; a=rsa-sha256; cv=none; b=ws/5ntYZzbhTqi6BEsRC+zAJZYuNIfjWLs3GtZ6PWFefvTreWnGarx3x1BtuSUvMBOSH4+ HsTecuCXmwbXfDOPPAfKdm4eow4GywB+wUGuUmI2pvKkLT4K6hpUKDiTHW5XQLYS8MAvox oGhK/2zNuGLfcCUkQINMmHY09IYzNv+O59oPD7LXeurmFV0FtjfuicmZCYqgz8kztHNNOj sGuuEHbK5Qbdvi8Ln3lfIB2STKh1zzMj7yrNHyzhQTH3GvPyf6WL4R/A8TsHp+d7yexpG6 IrSouKXhvUcuRl2OQO0xDfbtTfB9F5AVK9vP0DIFw61XE4fv80SvEo+vVwrm0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK424JGqzfV1 for ; Wed, 19 Nov 2025 11:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bdb9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:28:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2c7e44d93139 - stable/14 - igc(4): Fix a typo in a sysctl description List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c7e44d93139d2331e3d86b60e4d736a5056b3bc Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:28:34 +0000 Message-Id: <691da9e2.bdb9.39460e94@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2c7e44d93139d2331e3d86b60e4d736a5056b3bc commit 2c7e44d93139d2331e3d86b60e4d736a5056b3bc Author: Gordon Bergling AuthorDate: 2025-10-29 15:38:03 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:28:23 +0000 igc(4): Fix a typo in a sysctl description - s/Recevied/Received/ (cherry picked from commit defe77554d134964d7c197a2f3ca552778e8b41a) --- sys/dev/igc/if_igc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index a1ae35c7aa43..8c9ec0566a38 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2816,7 +2816,7 @@ igc_add_hw_stats(struct igc_softc *sc) "Oversized Packets Received"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_jabber", CTLFLAG_RD, &sc->stats.rjc, - "Recevied Jabber"); + "Received Jabber"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_errs", CTLFLAG_RD, &sc->stats.rxerrc, "Receive Errors"); From nobody Wed Nov 19 11:29:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK4p3jnTz6HZJT for ; Wed, 19 Nov 2025 11:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK4p2tNlz3d8m for ; Wed, 19 Nov 2025 11:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3lSO+DlV2bPRxZgHRRPlXojQHf8WaXfiwzQPd952j2k=; b=R7OEOUtnBPUTteW5aujzB+6M0d3UuHMRJtqUky3dRZry8roUNWmmBi6jtWec0raM9+ptM8 shBIvnmZjhDzo0Hwv1bYJrdEFzV1eTMDewKjZsWo/oco430iwTUVcCAEqs31F0YNW/V03l p3iYvndm9rhPWSDVHlAiEYbTUCMm7gI8vwt5eOYRauvBC6mgOk9nAeDAFqaqmyTbr7RAQ4 a4Z6ELq32HoXNJADtXq0W12VbeGlwmqxsmPTLwnlYToV+3Y2rxGveYSBzmobZAXCVoT+fM va32KnQx0IQehl7HwkAvlPYhfV6jp4VEpjdNmwM1wcQaO++/nGKmaLEIf6i3lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3lSO+DlV2bPRxZgHRRPlXojQHf8WaXfiwzQPd952j2k=; b=U0Cbi7qiuVav9DQGqB2+WnWgN9+Pm/F81wpOdd27cJ9daZA+ob+9s8sa0m46jgXMoAhG9X 36CqaxkemZk6GNFiA/W80k1BwQX+MnhQp/EVMDUISb+TTcuifTSv+6QIbj9sKKIf8E/z9Y O3tQJS+Sou+PjyXWWVEn95VfYPvCJlsCCIthmNQicI0+bx74YZOo78cZ/ce94BWWwrYjDc SFdiZQdxUbHhrH1rCC9h1Grh3tOI6MxCouMwYh1YcBfGX9Vne2cjcQY8Mdn4IKYG0/UR1O Z0QOMpVUYnvtYBG3ZHxJ1H3wd8qWWKz+WTtc+TYoa3yA7CGIJ0TeIo2/COOa0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551754; a=rsa-sha256; cv=none; b=gacNBQtVpHapM/cVlub4PxEbHGCLf4qUYYOf8kYmUWsJUht5dVBI5cpbsU14mjoyM70/Hu WrVWGCVoD7f3H6d0Z2b371kuLDmtpD30XwcKk8BAGpGz4LgO7RgYQ89Z+DR/Erz5G+tCsn HpGxTIzwuQ6D/a/rKjygn0EVre3yJTuCeWGR1dU2hgXFopVkpeWfJ0wS1un/xQBnKS7Nyw Vy2aL5HZmqeikNtGKn23ep8o2ghw2fdDKdNMPq+nm2KkqNPCYVeNHyZx5iJuiNL6U/ifct eyUee+Qkz/zF1KlN1gPH+Q6swQs2NqaHA6qgCqRbw+nFgpjpoUJML4g+iWKEEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK4p2TT7zdyM for ; Wed, 19 Nov 2025 11:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b7d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:29:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: df8a1f9863fc - stable/14 - mfi(4): Fix a typo in a KASSERT message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: df8a1f9863fcafd05dbab0075d08c3ddbda120ff Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:29:14 +0000 Message-Id: <691daa0a.b7d1.332ac09b@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=df8a1f9863fcafd05dbab0075d08c3ddbda120ff commit df8a1f9863fcafd05dbab0075d08c3ddbda120ff Author: Gordon Bergling AuthorDate: 2025-10-29 15:38:59 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:29:04 +0000 mfi(4): Fix a typo in a KASSERT message - s/dissappeared/disappeared/ (cherry picked from commit a25172844edaaa7e18c1dcecb6df8b8832456334) --- sys/dev/mfi/mfi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index f95ba0341a70..cd84e0a1970b 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -2827,7 +2827,7 @@ mfi_check_command_post(struct mfi_softc *sc, struct mfi_command *cm) if (ld->ld_id == cm->cm_frame->dcmd.mbox[0]) break; } - KASSERT(ld != NULL, ("volume dissappeared")); + KASSERT(ld != NULL, ("volume disappeared")); if (cm->cm_frame->header.cmd_status == MFI_STAT_OK) { mtx_unlock(&sc->mfi_io_lock); bus_topo_lock(); From nobody Wed Nov 19 11:29:43 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK5M4tv2z6HZM4 for ; Wed, 19 Nov 2025 11:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK5M4BZWz3dBW for ; Wed, 19 Nov 2025 11:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztAInQ5qlDhDclEPccQ6Z+fqhFAaa1OPcXELRmeunNc=; b=psTEvSGMcwKIUbasMQRK790GDJdTkBKssN9ljGpOYnvICFgR+72QyixyZzQfRtg9bjJCOj UR+KRBp6nEAVz2ViHJARDfBaEjHvehigopTCuee75AxBGklrzUtOUqdwFNwacLCld9qhJH ena4MH04RIYVUFe6ypaUroNrZiRfvnMqJ+oFcWEofA4ELZrMwUvIaaAmLsxjOYSNvW3Vrn 9+0HOmsvyz2hLkVo4t16zGM4OvFLYRwsBD089nCSmJBDuV0v4U3MQNSyExC0dkcIwon/Lm ksQY+dERz8h9tvHEEWQgrBsNYLh+JUfWBilUQodMx57RfRVRP83qMKg+RLizsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztAInQ5qlDhDclEPccQ6Z+fqhFAaa1OPcXELRmeunNc=; b=DYLO7KHd9IoektKAoC31hK0TibWghlIqgUt9Z/ylI47lyMtGWoScdCk65YSTc7jmu0CbTo M7CAQQoDtwJ7KkFMV8PTvLqUwUYz0avzhyACfLDOVdPJfTlPA/PFF58Lzc0tuyfb5zco7e 7q3JV+t5uCWUOSJOQoUjGOpGThua1Vq0iBXASqAKO3ZlqSHNHk0HHDo+8w6KRsDP7dyf7a 07abHMlc+limqozpv4HLjf8xhMQgXrmTBYeADkKECBcYG/BUXlvgEU4itN3Eh3qwvzPcnm YJp719RlojerKVhN+el/iaCAQjCjb6Khr95V1jRQ8SA1n8aHBd9WcfKeQoRbWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551783; a=rsa-sha256; cv=none; b=JZvdcoDaCv3A+T15CyLH+paMurFoWkDUluI8T6DOA3ZEdd4/ZjYywF42wdLteKIw/9rpPo H/DwXoWOzrHYiP0bpx6swPq1JQmZKvpJtVdjBXR1wwNMLK7LGE2o4eWWhrPH6z8cW324gp fyQGlli+ukEY7ZwEwm+hRpV0Jh8nCQP/A+5PvNJbZVCuFUgTefQujx/ziRCAxn9aQf60tI lNl0ttd98fnpBUuyeM4KghGgfcEAQf9xV1TUF59aCKxcpljiVliMT0+LCqHPrfnIhF1GtY t++6fdEO6FMju1HYMVzsDvwdmilmDTfJ4G7hcqAraM3g4wwUOGpbG4ZZ9mQ63w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK5M3kvvzfV2 for ; Wed, 19 Nov 2025 11:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ba2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:29:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a35f62fcd4d0 - stable/14 - isci(4): Fix two typos in a log messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a35f62fcd4d0384971046a1713998e42f2cb399f Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:29:43 +0000 Message-Id: <691daa27.ba2f.14206ebd@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a35f62fcd4d0384971046a1713998e42f2cb399f commit a35f62fcd4d0384971046a1713998e42f2cb399f Author: Gordon Bergling AuthorDate: 2025-10-29 15:41:06 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:29:33 +0000 isci(4): Fix two typos in a log messages - s/suspeneded/suspended/ (cherry picked from commit 7b11940d4a66589069c21534dd0b969f79ae79df) --- sys/dev/isci/scil/scic_sds_remote_node_context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/isci/scil/scic_sds_remote_node_context.c b/sys/dev/isci/scil/scic_sds_remote_node_context.c index aa1e8d840282..42dd81aa1874 100644 --- a/sys/dev/isci/scil/scic_sds_remote_node_context.c +++ b/sys/dev/isci/scil/scic_sds_remote_node_context.c @@ -663,7 +663,7 @@ SCI_STATUS scic_sds_remote_node_context_invalidating_state_event_handler( SCIC_LOG_OBJECT_SSP_REMOTE_TARGET | SCIC_LOG_OBJECT_SMP_REMOTE_TARGET | SCIC_LOG_OBJECT_STP_REMOTE_TARGET, - "SCIC Remote Node Context 0x%x was suspeneded by hardware while being invalidated.\n", + "SCIC Remote Node Context 0x%x was suspended by hardware while being invalidated.\n", this_rnc )); status = SCI_SUCCESS; @@ -718,7 +718,7 @@ SCI_STATUS scic_sds_remote_node_context_resuming_state_event_handler( SCIC_LOG_OBJECT_SSP_REMOTE_TARGET | SCIC_LOG_OBJECT_SMP_REMOTE_TARGET | SCIC_LOG_OBJECT_STP_REMOTE_TARGET, - "SCIC Remote Node Context 0x%x was suspeneded by hardware while being resumed.\n", + "SCIC Remote Node Context 0x%x was suspended by hardware while being resumed.\n", this_rnc )); status = SCI_SUCCESS; From nobody Wed Nov 19 11:31:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK7C3wNbz6HZZk for ; Wed, 19 Nov 2025 11:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK7C2QSGz3dtK for ; Wed, 19 Nov 2025 11:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3H68nfU08LZUpn6agsxRqXSiIZVek++n/GyXGvtV+6E=; b=e7upPL92x7K2Nj/bVv/H2le2KK8FxzZf0nLyUhpzpukXXlXDDC4TiaPzP1eN2FO9MROApa NeLYC7Bgf+bC5eF7b4gv1q6xu3OBO8BmirgnJ8yiQIjNspNM1chqM1lmSxVSABUHqNi1s1 F27rSBGLe8lOEucFiRThsBG1zikOCREIUAWl5zCkBgS60Jugnj1wDYTi4LpKWeO6WK778v oQhgV3LVzZHnHaoO1RAdm1EzvHfiLq4Y5c3mqIhwlgOxr+S/bgVo1/ttIpI2CN+CpYZjXK L7q3gXVTlFsRmvAlxQtoD82PTwDE35kcKZ5MLg/jkt3e4reGPYXfnxICHK83Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3H68nfU08LZUpn6agsxRqXSiIZVek++n/GyXGvtV+6E=; b=s+TGpuBRalSxXiQ+C+bswn1l9klxuSKWLarImFIgOqawFToQtw+mFzJsGQTZW2doHIFa51 utMoVMSSw/tMgiL62A3qKpx5gRn33vLggyEZdCjyTmGDd7TuxKAFe8Ye1V1fKum1L/egxC PBlk5+GFdzuWw6TgNeewnfmyjJbuaBeH1ICqILtbOPoQGRlId7jcH16LBfFsKMGZYJdC2u GAGiRwsVGUtEKnskVXnOiDGzaTe5Rh2FvoJJTeMeu8PIYmGHhAu4Ck8JdEQ8n+iCB5IKCs t+OivAsQsuQKUquIA7Jt5COcqWh3M1xNVz7qYRPFA5d/B8h0X0PCfQam3/zPpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551879; a=rsa-sha256; cv=none; b=iv4+u1oyZ/5B7eZk0oNYj9DN2S4fJmUHuAe0xwDId9LF4v+/I+nyE/uceh+Pg2yvMQZeRq hIq0qeAFLq3AddcBTfO+Br3bF/nSXqOYlA6tvh/LDW8FJ4DOjz65c3ZgsoyZMK7lEIngEF sWlCfSXKFYcEdVDXOP6lCh0EDZ0d+DmLc79w/YzFh95MaPVgxen4JQSYP6oR1HXpn/hPEY XAsjfcee42J7VynIYV6LZ0A9XX7CAn6nsyvHajxxzUxAwAd56sWbFOjEx6iUrsiJKLDVvP BwrT6c7czUnC9xBlpG8zpgh54LalaQcobSDOebIst+jt1xwEyMLSzus5cJk3rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK7C1v5HzfVM for ; Wed, 19 Nov 2025 11:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id abe2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:31:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 35dc35e3b289 - stable/14 - copy.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35dc35e3b28907617f855ad52e49794e1e674ed8 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:31:19 +0000 Message-Id: <691daa87.abe2.4107e4d5@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=35dc35e3b28907617f855ad52e49794e1e674ed8 commit 35dc35e3b28907617f855ad52e49794e1e674ed8 Author: Gordon Bergling AuthorDate: 2025-10-26 15:39:32 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:31:10 +0000 copy.9: Fix a typo in the manual page - s/heterogenous/heterogeneous/ (cherry picked from commit ad7bbe691b453039980df729f32fffaf02ffd21c) --- share/man/man9/copy.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/copy.9 b/share/man/man9/copy.9 index 8b2d0dc67727..3a3105ddf644 100644 --- a/share/man/man9/copy.9 +++ b/share/man/man9/copy.9 @@ -43,7 +43,7 @@ .Nm copyout_nofault , .Nm copystr , .Nm copyinstr -.Nd heterogenous address space copy functions +.Nd heterogeneous address space copy functions .Sh SYNOPSIS .In sys/types.h .In sys/systm.h From nobody Wed Nov 19 11:31:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBK7p1WyRz6HZB5 for ; Wed, 19 Nov 2025 11:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBK7p0kzyz3f4F for ; Wed, 19 Nov 2025 11:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AClAOjyCco3FsXGzL/BOO3ubDRv5PfBEMXxvsEVISqY=; b=m+InvQ6l6NyrfNKWVL45qFzzTZjhUWFu2D2IUJ0PLqiFhcOsqTxFnMwwrgYJO3MusLc2DM 6VUcF8QZUPQa16+q0Nzc5ltkprbciYBldGwR9QzUad/4a7G7JuozCICISrCvM8iMkIrGxU p82cJsSsnVEujhHzwotsrgYbwDwdpDbd7VJPclVpj/SER2J4H1zZ4wPhVbK08GMeHsOsgz gJAwH1YHeK3JBZyf+njmV37BmNDNABJKALJuHthxOjTa/lguQa6zPqfCqakxOCDzPkfrmS RI17+u+uRpgfSx+BU8n5j/nibMGfgSCqRMpBlpbHoXB+2usItnO7Q3MNfpNrLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AClAOjyCco3FsXGzL/BOO3ubDRv5PfBEMXxvsEVISqY=; b=XKkSTlwCumKlmPQgswz6MWG6N8VykXYf55dpXYv9dk96uTcq87/u285SCoONYh8EcYMVr0 6XD8YnhmV/c8wQe8xvp8nU1za3pIldBq/NCPS/kERTgFfyPukfb1a5yYWYzJsR5o1+oghb qNC6beFqs4MYBiL32FepW8SRuLKtxL4maTpjvH6WCHjOhGCwdGJyrIeS6c3m5ZB1TgkS52 WdqyRHYIUcaId572lOIUaEvwwK0GhXRHICQkVIeZvvsB69EiCNN4kOMf/xvW59xAMLzQ8t +8QLeq/n00wK+ugSXzxq6oTKTbGDrUGuFsi1AQQNR7nxjrpxDxYlStIe4Pu4VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551910; a=rsa-sha256; cv=none; b=vholRavWnyjOHpyUfkWE7nOuBoWgfFr3FnlmuRxTiilTv/3hn17Fs5C1AgeKu2qP3Z8OoU TzATj0Ul8W8WYu8jIl+7odLdYWXE/xG45DpewqNRXYlzJ5+IiupXsHpPP9mzL+d7V/8bNQ P3tyNxQGonivg31yEJcuBYtQusFUDkjvj1JI1assh54Vnnbhmp/+PdfC+GncOn0HaAL7ke KCeaYiMZY7P/cSxgQp3l3JXeYlCkPq0m4M5+eWdsjNaJpKsLY47PjuPgXE4kIEebFIdwgj l3gfxId+CUr1quMSwlpTtqtvq1tL2q7OsSyXT2byvzN5AvmqbXG76QABs3sQZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBK7p0HH8zfSC for ; Wed, 19 Nov 2025 11:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bde4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:31:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fa1337393b84 - stable/14 - efirt.9: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa1337393b84203bbf9431057e2a5671d6198aaa Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:31:50 +0000 Message-Id: <691daaa6.bde4.1b8dbd18@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fa1337393b84203bbf9431057e2a5671d6198aaa commit fa1337393b84203bbf9431057e2a5671d6198aaa Author: Gordon Bergling AuthorDate: 2025-10-26 15:42:42 +0000 Commit: Gordon Bergling CommitDate: 2025-11-19 11:31:39 +0000 efirt.9: Fix a typo in the manual page - s/retireved/retrieved/ (cherry picked from commit 1a28455cb5f59de98cd6085fce500b457eb80847) --- share/man/man9/efirt.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/efirt.9 b/share/man/man9/efirt.9 index c31f52bf2245..e085916801d5 100644 --- a/share/man/man9/efirt.9 +++ b/share/man/man9/efirt.9 @@ -183,7 +183,7 @@ is NULL. .It Dv EIO The variable could not be retrieved due to a hardware error. .It Dv EDOOFUS -The variable could not be retireved due to an authentication failure. +The variable could not be retrieved due to an authentication failure. .El .Pp The From nobody Wed Nov 19 16:17:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBRT974Tpz6HwGq for ; Wed, 19 Nov 2025 16:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBRT94Z6pz4Nqg for ; Wed, 19 Nov 2025 16:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763569037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=11YBw5g6XtRE6XaQ+fNr5jpLGSoFlCcKEBOfmSiYIoo=; b=BEHowLPp0d8qsifgKMozOW6DFHmIQfMj2SA1v905tj52HijnUhYsIEHlSQAAlghJBO9Jam 85cs0EL9dHDpzOyvWQrTDXAV5PH2R98PFgmYZ0xGjgWcfHo9YhzLiouN4jeAa9X8bFttRV cs9t3/pOSTZB+s4ninGGiuyaAppwV77k7KlAel47qkhO/hnzs3V9J+BzbGfnGtYCbI+VRz KtoJ042BtjvPycsSujnGZQjr4p8EpY648+7HQM4eOvUccZXgKeD5pJP388z6WQGn2WLj/k eqCouOCIfDgq34l1nuVHHAUR4QFbmsGld2yn3gVzDZwj+uhT3cXY9FhcsxTfbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763569037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=11YBw5g6XtRE6XaQ+fNr5jpLGSoFlCcKEBOfmSiYIoo=; b=u6DIbKkF+pESsbcLJJu8S00EjDJdpAGogeDbiWffNWKzmuFtbafvBG7Eq1OqsAda16/8zO 87eGAGG9SKZjNd5g4AOyQhwex0J77NagHeQqfGIwI671LqsyiWhgDowaYmSRtoAY5vuEqO EBqN/5wS0Io5UvXt02/2QuQbURcQu1pKRlfp8/OlmWTeRLVjbC/6hodDAgyOgs6e9hxmn1 HdPnhxy6EL8HBsHzOLCj5kXP54L0x0iBtoQIGqPeW62RqdTGyyl6UuDPFzp77inqkwtpXt 5PxsSbnuYYsUNUT9k2PLu4ithgveME2Wj/SluhYDgCVr4gLBWDmkED2glsI8cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763569037; a=rsa-sha256; cv=none; b=ihzY156SqLUGpbfzledrCrOP65CXS8JxTIrjZlRIZMoUmRcnOUeRJFIJyhd+BWuTAg2jhU fB1EZdXMOa8PpcU+NEsZg+5ndmp2usigIyAKUgHK5c/42v4h3iE4T6FsDQwfToUN9SBTYZ 1wx2Lak9l688w0mde70zy9v2TFfFlzRnyG/7itbARb+KBENsuEkvpxiEXwC/o+diElmix5 6eWz95tI4PpNGgpD8Mz0kPKp5ZOs/1PjugNoYZZskf7MbAvYOlu5dBIg9X5i/N3JHvSAEk DZoV0fn0GNm2YT69skMYUAjhCtnt9z4hiUpSBKAp7/qfhTjB0wpNgkprVKpMYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBRT93vy1zntC for ; Wed, 19 Nov 2025 16:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 398b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 16:17:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1f6e3abf4171 - stable/15 - inotify: Work around the vput() bug directly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1f6e3abf41718e8e4a309be122f0a6048e9c5772 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 16:17:17 +0000 Message-Id: <691ded8d.398b1.5f100ac8@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f6e3abf41718e8e4a309be122f0a6048e9c5772 commit 1f6e3abf41718e8e4a309be122f0a6048e9c5772 Author: Mark Johnston AuthorDate: 2025-11-15 18:00:44 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 16:17:08 +0000 inotify: Work around the vput() bug directly For 15.0, apply a minimal fix which at least ensures that inotify can't trigger the latent race described in commit 99cb3dca4773 ("vnode: Rework vput() to avoid holding the vnode lock after decrementing"). Reviewed by: olce, kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53774 (cherry picked from commit ebc17879f0885ca87644980f6275b9759b311eb3) --- sys/kern/vfs_inotify.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index e60d8426ee42..fd1ef39b13f7 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -381,7 +381,14 @@ inotify_unlink_watch_locked(struct inotify_softc *sc, struct inotify_watch *watc static void inotify_free_watch(struct inotify_watch *watch) { - vrele(watch->vp); + /* + * Formally, we don't need to lock the vnode here. However, if we + * don't, and vrele() releases the last reference, it's possible the + * vnode will be recycled while a different thread holds the vnode lock. + * Work around this bug by acquiring the lock here. + */ + (void)vn_lock(watch->vp, LK_EXCLUSIVE | LK_RETRY); + vput(watch->vp); free(watch, M_INOTIFY); } From nobody Wed Nov 19 18:20:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBVCF6m2Mz6J4bB for ; Wed, 19 Nov 2025 18:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBVCF6DXpz3Xrj for ; Wed, 19 Nov 2025 18:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763576425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTlR/Zu9cGarsHf20PPZYshutdStx1gjJ5Ik0CsVrDg=; b=S781TiANa1H9E8JS385sqnDCLDM03IHdUw+9VfQV+2RkB7rkl89YuJmFKX+KzaX6yBMOrd WloJ0k8XDPdn4Eh86gmjdfLgcDL9hbS+Jk653yE2an8snQHr62ZOB/My4FRvJA1UnKsSnr dA9VViTx/wsSGe2IWAgekl//HSlxgDo5Jykg3MCI8geW5ltHb0jRBUBUIU4TJHAE9fqpAJ b/P1bGmTptAbyReB3EA8A4f4QgSfrkmvHjH4Jcb0nT4GYBKNbOt1fd5tbdHivUhqkRKTDY ktkvWkqpSqgnzBG6c7NgFFNPJYF05b3SlyI1XTbGEqo/7sH2iJRZfXGvLlHyIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763576425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTlR/Zu9cGarsHf20PPZYshutdStx1gjJ5Ik0CsVrDg=; b=d9SfJ/jZxZTqoMIJ5kKFQLuHp+HS4XKx1Srz5BCYkkzzQU0b/wW6WBmUfsJeVGa7+eUME1 X5sA6x5f4JbPfoXzuieUN13HDfst7eMpEv7RBZFZTJDGa5u7tKMraqJClA+CNIhdHUWYnm sNMPfoKp6C9Xs3kWGy15RIMmcS9m3zherMjJM4Xz9mmLvchSFTTDyxR0XV64tf6cUDcUF4 U34W7TLCDcqivEhAOskE3FoizXv5Cy5TCesulLSzcmTF2/jspfFWnDBRrkJApcuW6bxIkH dwRwmVaMQMls8UAcHTrA3hrI1Blpup/v9Km9SMKiQRPLtMdf4t7WHil7UpC1yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763576425; a=rsa-sha256; cv=none; b=pGkt3SkSEM+AwubUclj6XPZko4a6JcwJ/9g+PlVuzhcp2eDknUjY2yASgKUMooagZXi91d ZFJ2rP4ggQ7D0CfDLHtucJtPI9TQyG05arN2bHb+zfde2CtuEA1lBcxSBK7kDVsFfrjXQN tnwgG05PVT5bu04jc474vt9awy7cALdhVk4UJ9Nb7N8vJpuIcUuSNVj+Qsxr/rHJghIS2Q 48Iyjr7despxRnU93FllNxGxqDRkcd1W84UZusVpbbKJ6cTfQLvbX/aAePyZFIP2lTjgUA isF3rFEmZS0vwVkVWNh9+HY2UkH9p6KdYy60hB4ptRIZKkSP+5LBvHTv8ZWS1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBVCF5dykzrkW for ; Wed, 19 Nov 2025 18:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d3cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 18:20:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Poul-Henning Kamp From: Ed Maste Subject: git: d61be9d99470 - stable/15 - iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d61be9d994702ffb8443c686f3ae2a5c702df3c7 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 18:20:25 +0000 Message-Id: <691e0a69.d3cc.7d8aab3c@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d61be9d994702ffb8443c686f3ae2a5c702df3c7 commit d61be9d994702ffb8443c686f3ae2a5c702df3c7 Author: Poul-Henning Kamp AuthorDate: 2025-11-18 19:22:01 +0000 Commit: Ed Maste CommitDate: 2025-11-19 18:20:09 +0000 iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. Our recent changes to iichid.c has caused us to attempt to read a full REPORT instead, and at least one keyboard hangs solid when we do that. This patch changes us to be spec-compliant. Differential Revision: https://reviews.freebsd.org/D53803 MFC after: 1 day Approved by: re(ccperciva) (cherry picked from commit 5d53462af1d0e892da77b52b701b337119b2f5d7) --- sys/dev/iicbus/iichid.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 5ca3f1b84e48..430066bd8f52 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -271,6 +271,8 @@ static int iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, iichid_size_t *actual_len) { + int error; + /* * 6.1.3 - Retrieval of Input Reports * DEVICE returns the length (2 Bytes) and the entire Input Report. @@ -280,7 +282,10 @@ iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, struct iic_msg msgs[] = { { sc->addr, IIC_M_RD, maxlen, buf }, }; - int error; + + if (!sc->reset_acked) { + msgs[0].len = 2; + } error = iicbus_transfer(sc->dev, msgs, nitems(msgs)); if (error != 0) From nobody Wed Nov 19 18:39:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBVdT734cz6J5nk for ; Wed, 19 Nov 2025 18:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBVdN5Jcsz3bLh for ; Wed, 19 Nov 2025 18:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763577576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=91koYLz2QitvhQQrW9YVIYvFCbP6Nfl3y5SoLsYVQFc=; b=OmSURetIUAb8bMQ9LEwNDykYebAILwm4rnMWPLz5nTPzr62Hd8wO1zLCHyHmgm4mTCoDZ6 TZpPouiiSKp+sxzUllMBUbuOC39CeqwhguunVkC3if2Yuh6RoF+VAJg5mMYDxRwWBQ08jr /FTWTGk8GLognnAwxx3gWgRQfydBUu0XChWINBYynOE5MEkcPMw3/nyu1nz9r5U/+7cSfZ cCw9gNWZbdukaXqg8tn8zHk0M4XSZS768SerIsFRaGvRuNooJ1QFVZD6UveLxUw+B9u0bc +LxcIzMzxtoyd6zEtWSPSX5aLHs8VASeKG+5v+LGs7DMrtkOng4XXq2+cz+5bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763577576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=91koYLz2QitvhQQrW9YVIYvFCbP6Nfl3y5SoLsYVQFc=; b=IdW0pRKcyvmj1AO84K1FYfFsSy27S4Vi2Mjal09C3GeLmSKTXTS+LSK76PZKZM7B5vT36M vBFiU0qvtD3IyZP9N3QFUAGa6NqtC2an3lx29RPYfgNfk6yp4rO81NKEJy1pTniZ+7GS4+ N0VThtk5oNDFiPPXDNr1tvX9XBUMvBFaiHKDb5zLSitRNLCfmavdENGgUMMA/QdlM/BUCg EHONBhgdD+MXx/W2a0ylNdRE3fRltEMQTJQ9SR0/0QIdGWwitd/+khMLktCMfGaNuaIzGn kuqRQgXIM+B8i5MKySFgAA6ELoD+K8bdwmS8m7i6aDePlvk1t4I3BNU+CW3Kmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763577576; a=rsa-sha256; cv=none; b=Pp0sX096T2JnNwokYWSiMm5mm4XaN/Pc8PMo5qOZKy0P+K7qeg5BrCF+tGX34rvwwubGNs BsiriAIR9Dt6A7JHIBz0j/fZtmViJ3kBZDaUhdLXY3fGLZIgc4uPk+RMqyhiLi8HIoz9Zb d6ChNM917bkc5o1GcrIAk6BbN4Jq09ZQM1jMZFIzVyHaQUNNckA2RNlvKnjJoLhZyT0rWJ IvLFlq38RGve2/AWIsabrz8TdlptwKwAER/OwtR3zLnLybi970MgYzcMJof/+zR2C8X+A1 HR6g2DeoBNirGi2KDtMmZF8xukDaIKfSp7R6Jd2zASmANA2hzkCd2C7P1bRbzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBVdN4LqfzrlZ for ; Wed, 19 Nov 2025 18:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f30c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 18:39:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: fa546e9d18f4 - stable/15 - UPDATING: Document FreeBSD-base pkg .conf shuffle List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fa546e9d18f4dbbf5fa1fe152c78d97615d51bda Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 18:39:36 +0000 Message-Id: <691e0ee8.f30c.66e93304@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fa546e9d18f4dbbf5fa1fe152c78d97615d51bda commit fa546e9d18f4dbbf5fa1fe152c78d97615d51bda Author: Colin Percival AuthorDate: 2025-11-16 16:56:12 +0000 Commit: Colin Percival CommitDate: 2025-11-19 18:39:23 +0000 UPDATING: Document FreeBSD-base pkg .conf shuffle Reminded by: yasu MFC after: 3 days (cherry picked from commit 6ccdd2fc2328dd81b9c645fba025d01052a3c1a1) --- UPDATING | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/UPDATING b/UPDATING index faba80dc9a0e..2287ff9d8d22 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,16 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20251115: + The FreeBSD-base repository is now defined in /etc/pkg/FreeBSD.conf, + disabled by default. In -CURRENT and -STABLE this points at nightly + builds on pkg.freebsd.org; for BETA/RC/RELEASE builds it points at + release engineering builds on pkgbase.freebsd.org. + + Users of pkgbase will need to replace any existing definition of the + FreeBSD-base repository in /usr/local/etc/pkg/repos/ with a single + line "FreeBSD-base: { enabled: yes }". + 20251105: pf(4) now supports nat64 via the af-to keyword. From nobody Wed Nov 19 21:25:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZK61j60z6JHnm for ; Wed, 19 Nov 2025 21:25:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZK56lxkz46xp for ; Wed, 19 Nov 2025 21:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763587545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1gQ6p13uTSe4Nbtf6ok4KKiL1uSrhwm/Qu+Tc9gWFlE=; b=OqjROSfSPwE/bmuu5j5/GkcA6uDw1WLWyudGrl1e1ZvQuO1Wy2QLMsFj+ZVY4+/8obFgcd 6peDDvXGBriNiU3agiA27+/tH6plmPAyfI7lheSAMWzC+NFKOcl6PEEcXWspqVDTVzotPH 8P6N4bzMCdw9mZ6/SGoEZfZ5x55jE5dB+lz6uMu7+yj88dukx+U5sd+CouY17l0wj8Vbbs Ryypg1wGtty54EFFReAKehl9HTGR+F+CJ/g3BtPei+9eN5cosjkbWvaWeKz4iO0lXBHyF7 /GuWd6fLYc2dP/U7ER+VFNl6t01rggy7GVwAmHpdZixh5YRbwG94ebN77IkBBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763587545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1gQ6p13uTSe4Nbtf6ok4KKiL1uSrhwm/Qu+Tc9gWFlE=; b=EbWBzmJieBhZQGqYjYhiNZwCZgpOju48tz5Qt68ZvIqfskvyrGZwFQ06xN39/c+ADu5vYB PZDfRpb/Sn7XY9TJCpTwFLXCljT7MrzxDAPJxAfmzQeSbt5DiEBCa/vR3rmC5UE81Uu0ft Ih679dg8XykluKfsxVPRYyLkQkfGvvFbyPY2DxZIqSpFUF7TE6/qrbY7rbxb+UeWvMU2kU MY6+Kztn4qwi/YokNSnl7SdXlHJ8u1pcfiWYHxX0ofydMZL/vnhSHUI2MrD44UgVEp0LvZ DI8tPIKkTd1+Lj08eVzPqvaqGLxUGyDis2QcCR1Wd4ra0QE9cQFm6JEWerCQcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763587545; a=rsa-sha256; cv=none; b=heg2KOPWdwjXoHp9CgwuvRjyWseTrZ2dSlA2SVHFhvCERXtZJjtxqV7Dp4ESWGnEnllE4w nAdHI6sWn1L57EIgO9bQ5DIidOiGCjCrJVt1zEgOfFZFtiyVYEtes7A/oVgqXXaQt74hcN 1aU0eCI69sap3BrxQ2t+o9HHESTJL1NyZ2y+BjjCLZuNJnwXe9YwED5G9/OMIGpeweUfiy TueR3/6T0XWAf92C1PVBAQyNegr0I8EF4vsEQwTHZXEfxfuSblNumIFUF/d2zXVFZ6pt39 O1S1idMPMutQBc9L9XBkmTIWguExRpz1KWVyzL/lT8hIqb7G6QPnDTObsWUn4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZK55nYhzxSl for ; Wed, 19 Nov 2025 21:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f960 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:25:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 142df248ac06 - stable/15 - release: Remove KDE from dvd1.iso List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 142df248ac06bd255f5aa63a5544626bb502c656 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:25:45 +0000 Message-Id: <691e35d9.2f960.4471ebb8@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=142df248ac06bd255f5aa63a5544626bb502c656 commit 142df248ac06bd255f5aa63a5544626bb502c656 Author: Colin Percival AuthorDate: 2025-11-18 05:41:47 +0000 Commit: Colin Percival CommitDate: 2025-11-19 20:07:02 +0000 release: Remove KDE from dvd1.iso Prior to this commit, we were shipping 2155 MB of packages (from the ports tree, not counting pkgbase) on dvd1.iso. Due to the amount of space required by shipping pkgbase packages *and* distribution sets on the DVD images, we only have 1696 MB available if we want to fit into the 4.7 GB limit for DVDs. Many users have indicated that this is indeed important. It is practically impossible to hit this target without removing KDE; while KDE and its dependencies narrowly fit (1550 MB), we exceed the limit as soon as we include either of freebsd-doc-all or gnome. While we would pick KDE over GNOME (surveys regularly indicate that KDE is the more widely used of the two), we believe that documentation is the most important thing to include. Since removing KDE leaves a bit of extra space, add editors/emacs and editors/vim. This takes the 15.0 amd64 dvd1.iso up to 4.689 GB. [1] Requested by: adamw [1] MFC after: immediately (for 15.0-RC3) Differential Revision: https://reviews.freebsd.org/D53800 (cherry picked from commit 6cc6beb4c889a049170d0aeaa9c88b9093776d6e) --- release/scripts/pkg-stage.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 6d460a83e1da..083b1baa3358 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -15,6 +15,8 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES=" devel/git@lite +editors/emacs +editors/vim misc/freebsd-doc-all net/mpd5 net/rsync @@ -29,7 +31,6 @@ sysutils/tmux www/firefox www/links x11/gnome -x11/kde x11/sddm x11/xorg x11-wm/sway From nobody Wed Nov 19 21:44:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkh3kvYz6JKBS for ; Wed, 19 Nov 2025 21:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkh2wjLz3C8g for ; Wed, 19 Nov 2025 21:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5BaBWGVKhS9LmMI6qVU8Hp3kaM4rC3N3otOjk1AeQDM=; b=bqwk6s4K3IRTH2zB1v8bMUVchiOFoZzU+z9wZK9X5f4yRn5ksmF/7eyTzKeQKCyj+PRokB WuAy0TID92Gtu2kGq5JgOntCnbyToXR/8WUDlIYS5mfm4dYENMrBxmwq5BGR2AgxlbOz0T MHpu+zOAPhZodxmKIUsirbbIgpQesclcbiz9txRARQVeVbhTQF1SwOVlSjGlZyCdm6xhZb f4LHZXEivlRkp04Xyb787SC5nGu0sHrAvnkrnzNr62VtE1MPGdAVEz9vXrhn3k5kFewlq7 t5pNJ+TkQFr8xyzYQ0FSZtf+5yyD8XQp0idZhYLJiseS6ETqFzfa13yVoa7jew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5BaBWGVKhS9LmMI6qVU8Hp3kaM4rC3N3otOjk1AeQDM=; b=WqAzgO9eocU4Zf3W8VyvbTuN6foyU5aMLRkOu7BOfjQULclXfWipi7Yf+1XradS0HPfFrr KAb+5eAoXIfbtuPhQSoTObzSR/K4M6Ejgl9PQO6ElNXutr220FKT5pNh+/VqAs+K6uxSRP 79EjHMP2liOY2EwL1oxvuWSIeE3ENr+Og6ZB/Fhu3yps66x6/WoRCEOlKebr8Ig7QOdvRL b9yhFJ+ZFVlXR3Cau8RRfjdr4iauHPWLwHtn3jst7753WudgBMdnXusiLYkt6z3BJq6Z2G g/C+SS01lM0GQITbWOFiMYqezL15v+q0tC8n7SA1NgD0D5gtz7xEHsHyfl9HCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588668; a=rsa-sha256; cv=none; b=kPom/E+3UpWnn58GmycMz9EbjPJIsy+aEMh9P6CFFQQ0XKlZ/Dj3p1b3jsLizLy1ZPcgdR ryvJqA5JpYOj3OPu+AejOeb7qko71Lh2vwD6TBEO6vSNJh1YaQvNFBe52pj7BeVgV0Eg25 A2CeNGTKZqmGJQqFa8RnHf8qcnwZceCaecRfAtXjJ4LznZd8ygpz/4eyvOmsI5owGEYGzr 5nuyt3OdBsunsOUj5DOaYP40tV8H+Var7dzCILUwYy2xzlmTsJiu5wUc9B4BwG52kBifBC kX9goSYmokUOPWk1mw7MSiaTAxVqAmK999taW/8Etc+AdMnNpulFGdjf1NeDwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkh2X9fzxNX for ; Wed, 19 Nov 2025 21:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33e58 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 476aca498559 - releng/15.0 - UPDATING: Document FreeBSD-base pkg .conf shuffle List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 476aca498559d0a9d0be91f83bbf23e0d9f83ec9 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:28 +0000 Message-Id: <691e3a3c.33e58.7140c131@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=476aca498559d0a9d0be91f83bbf23e0d9f83ec9 commit 476aca498559d0a9d0be91f83bbf23e0d9f83ec9 Author: Colin Percival AuthorDate: 2025-11-16 16:56:12 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:36:44 +0000 UPDATING: Document FreeBSD-base pkg .conf shuffle Approved by: re (cperciva) Reminded by: yasu MFC after: 3 days (cherry picked from commit 6ccdd2fc2328dd81b9c645fba025d01052a3c1a1) (cherry picked from commit fa546e9d18f4dbbf5fa1fe152c78d97615d51bda) --- UPDATING | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/UPDATING b/UPDATING index 0d6ccdf8ea56..e15cb2e1a17c 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,16 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20251115: + The FreeBSD-base repository is now defined in /etc/pkg/FreeBSD.conf, + disabled by default. In -CURRENT and -STABLE this points at nightly + builds on pkg.freebsd.org; for BETA/RC/RELEASE builds it points at + release engineering builds on pkgbase.freebsd.org. + + Users of pkgbase will need to replace any existing definition of the + FreeBSD-base repository in /usr/local/etc/pkg/repos/ with a single + line "FreeBSD-base: { enabled: yes }". + 20251030: flua(1) has moved to the new FreeBSD-flua package. If you use flua, you may want to install this package if it's not otherwise installed From nobody Wed Nov 19 21:44:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkj5h7Bz6JKBW for ; Wed, 19 Nov 2025 21:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkj40JWz3CJS for ; Wed, 19 Nov 2025 21:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FlYRvSNpI2vPYX+XwM8ndlhNPgoOm0GynvQBWWkIoSk=; b=tZXMeQI9FU4HhTUv4wuyNkvsG9ZGbLcc4yree/TNfFdGkW6k3+zKdNHfZVw+WrigtDc/F/ gMNeJgt/7rYNpCOCBuiVPJpAqQc0HJ0PeG5q3+oWcM2TgvYa2JGQhzrEv4+S0EjuACSliV 9u5XYIp4Gat+TuOT+c3wlxwqOKx8Mc3VaYSo5JFBR22b6oD7MfGp7T+3MVhlFgw+jKAhnU 8DFpQO4I6ewYW9hbIW9KCrontQPlO66cBfRlOnDrYCbNYTz7q5yDM9K7MKOlcUCnoAgDf7 vcymsoKyRMmhbszsmPVwAXAt4Y8Mnb/Ak+nduwryIlr/1PV8VtdI16CYBXIpWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FlYRvSNpI2vPYX+XwM8ndlhNPgoOm0GynvQBWWkIoSk=; b=EE2vC6zt7TZoQOXq0RbS6bc/h5lHL8uhBvIb2YaOAz9fRatzeA5OUVg0hLN21hUzeFqMXC Ae2l1F+QUrGojjK84N+CGlTvPIVO3whxJ4gI1A2l4DEcHLfHn9fKSsZXKE9aWSA9cSGeFk Q3PeAALwtiqPFrh1AiVfku5cGgcankQSh0l6GGhkZnw2k2wiLzjK+ZM3eOGgT2MqQ6M/aW H/M7nzKC2nV4SF4BTWNy3+fVTfXRVf+v1TegxabVUSqBO8qmv29yGK8cRnN23bvM+lgmL/ nvaxbQjrM8aYe7MopsBLhhyigo7it5dNvh6SDsm3qEseX1ZCAKDmn5HA9NdC6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588669; a=rsa-sha256; cv=none; b=YOesEk0oWOrDauaPYVogm2OQPLOkmcqd2AvIa4Ei2onWCjRqiorSsNqc8wdZ4lAp5QYhHd k83PN7HExeSqEGx89M5lh6p4ovcYsgpZNUgadnacBZumzitzzuNc9okcxjzpB/Y1ZIR1qp h5tyga/4AJYqdlMvlsUJpX+dRMAjMpAdnnUcmlHPKoP9vUsrlVBLdt6A8H5sJbGL0WvOTS sKIIo//0m/xx1FXeNIkGDESmvV30ZcGGcfaBg7vIj58I2CbDxR4K3WZjGBnCFt1nlfwS6y Sy+WkhYNdoh/J/QjeKYsdnlCRDJI369wcHGU80Qj/tFuOcCC3fhsw6l5flu/eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkj3Llwzy3N for ; Wed, 19 Nov 2025 21:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33775 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Poul-Henning Kamp From: Colin Percival Subject: git: d02a08f89932 - releng/15.0 - iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: d02a08f899322dd9ed34cbf77e917068ba59b3ff Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:29 +0000 Message-Id: <691e3a3d.33775.6905fe84@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d02a08f899322dd9ed34cbf77e917068ba59b3ff commit d02a08f899322dd9ed34cbf77e917068ba59b3ff Author: Poul-Henning Kamp AuthorDate: 2025-11-18 19:22:01 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:36:49 +0000 iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. Our recent changes to iichid.c has caused us to attempt to read a full REPORT instead, and at least one keyboard hangs solid when we do that. This patch changes us to be spec-compliant. Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D53803 MFC after: 1 day Approved by: re(ccperciva) (cherry picked from commit 5d53462af1d0e892da77b52b701b337119b2f5d7) (cherry picked from commit d61be9d994702ffb8443c686f3ae2a5c702df3c7) --- sys/dev/iicbus/iichid.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 5ca3f1b84e48..430066bd8f52 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -271,6 +271,8 @@ static int iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, iichid_size_t *actual_len) { + int error; + /* * 6.1.3 - Retrieval of Input Reports * DEVICE returns the length (2 Bytes) and the entire Input Report. @@ -280,7 +282,10 @@ iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, struct iic_msg msgs[] = { { sc->addr, IIC_M_RD, maxlen, buf }, }; - int error; + + if (!sc->reset_acked) { + msgs[0].len = 2; + } error = iicbus_transfer(sc->dev, msgs, nitems(msgs)); if (error != 0) From nobody Wed Nov 19 21:44:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkl1bR5z6JKBX for ; Wed, 19 Nov 2025 21:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkk62B8z3CLt for ; Wed, 19 Nov 2025 21:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=22ihXnQn0olhY5SV26sdfMLqFJjBgiyHw3obxmBzHsc=; b=uxGlB+unQUMl+udP1NbIKyVlalDoXgzcLd3OQeT2oayEpMtwswvGH5LMBYj3xm5COws3pf V9Cd5+NuxPycMbJdyWVKEkbAdbY7DXjGgtAE1EYZ47UWjae5BjdvzPogIRALEbZUOOu9FA t0YUsNLZqPSfDa+tyNCQFr0zNxOVcoX4yhP7uxRTV5zQVjEfdOnaio0A36Mx6/1YZ9kinJ U1a4Hs7vakPft+q33YR3Y5yQwt+1VK4xxzRxZGQQLJ0RkSp48XqHiChi2epD9opypcZ5wi JDDYgOQ6BkLygQDbGoPqkUfPCVdW+E6FU2V76JORrr/rPOHLOxWeZgyHKKY+sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=22ihXnQn0olhY5SV26sdfMLqFJjBgiyHw3obxmBzHsc=; b=DR431cf/Y/AjqRhs8l+DxlhYTvbNlbsahmL8ppjcDdmNvxpVjq4Sr3zjDWVS5xtoC7FukE UmS4UvFl42FnO5DGjoNzpzKd+J/wO20VQ4jIfqnMfePHflenv7Wl0VaK9Urj606XGCNWeB CL2trHvFa0UIOYEBo21ItcbFDuAAI1LJziRpP/sdOrjVo7R4AX1orC0qz9g47Vj7LrxQJs tlgy+YdBuA37LVUhAc8IA8RdQNnrhEJKNAkgpJboRpL5lPIiJUw67svqMQoRjbJ+VSt3Hq V+jieSW9YZU1aHBiqdndAFeCZIDS1vys966XcqmDTKn0PK0HFQ1UbVF1kNtiwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588670; a=rsa-sha256; cv=none; b=l2tPivuw/KCZ/QFD8JzX1RAc0uKGfnFWJlYWwhHn29uFSpeOGMGH653sxtpZB78Fo0oKx5 zxk75WVvnJbJnA+nuJkeRuw3HUNFRTcl5MZz6zHAm2fvBO1rRvedIs5wN2Mn0NaQXpEpXt WxViUh8idMbOQev4kSIktqaZvLzKWvS/DPYwYibXZ8v6TtNodMazJjFUw3scqjhWVoLCS/ wCZfuS3x4WnrJGXoTkx3kt4KmgSERma8XiSLTBDMX6YvcGKWBrS1aPGTpD7CYNngE2b+9+ ssXKU1fmNMmMvT038ow8DdTbfo6b7wGrzCeFAuU73wwf541nWEO94wOfq/GFZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkk58n3zyFD for ; Wed, 19 Nov 2025 21:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31858 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Martin Matuska From: Colin Percival Subject: git: 7b5b0f43eb06 - releng/15.0 - zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 7b5b0f43eb061f3af5c862ce8dc38d1be44fc287 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:30 +0000 Message-Id: <691e3a3e.31858.4543ef86@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7b5b0f43eb061f3af5c862ce8dc38d1be44fc287 commit 7b5b0f43eb061f3af5c862ce8dc38d1be44fc287 Author: Martin Matuska AuthorDate: 2025-11-18 11:44:03 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:36:55 +0000 zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15 OpenZFS 2.4.0 rc4 Notable upstream pull request merges: #17477 1e8c96d7d Add knob to disable slow io notifications #17792 5582e8b08 Update dnode_next_offset_level to accept blkid instead of offset #17872 584762617 Pass flags to more DMU write/hold functions #17875 178a8be21 BRT: Round bv_entcount up to BRT_BLOCKSIZE #17875 e3acd0a72 Fix caching of DDT log and BRT #17877 67fc49433 Cleanup ZIO_FLAG_IO_RETRY vs TRYHARD usage #17824 dda711dbb Fix gang write late_arrival bug #17890 41878d57e Add BRT support to zpool prefetch command #17903 aaf374bd4 ZIO: Set minimum number of free issue threads to 32 #17906 ac0bc4cc0 spa_misc: add an API for spa_namespace_lock #17908 583db4003 FreeBSD: Add support for _PC_CASE_INSENSITIVE #17911 -multiple Update library ABI versions for v2.4.0 #17915 e305c7d59 BRT: Fix ranges to blocks conversion math #17916 002bc3da6 BRT: Increase block size from 4KB to 8KB #17921 e895c7619 ZAP: Remove dmu_object_info_from_dnode() call Approved by: re (cperciva) Obtained from: OpenZFS OpenZFS commit: 099f69ff5d3df7988632039db7ad6d183eb34042 OpenZFS tag: zfs-2.4.0-rc4 (cherry picked from commit 155d5b8a19baa864ebe9d8346d932bd04ea23aca) --- .../.github/workflows/scripts/generate-ci-type.py | 10 +- .../.github/workflows/scripts/qemu-2-start.sh | 20 +- .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 38 ++- sys/contrib/openzfs/.mailmap | 8 + sys/contrib/openzfs/AUTHORS | 14 + sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/README.md | 2 +- sys/contrib/openzfs/autogen.sh | 61 +---- sys/contrib/openzfs/cmd/zdb/zdb.c | 8 +- sys/contrib/openzfs/cmd/zfs/zfs_project.c | 36 ++- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 34 ++- sys/contrib/openzfs/cmd/ztest.c | 39 +-- sys/contrib/openzfs/config/deb.am | 8 +- sys/contrib/openzfs/contrib/debian/Makefile.am | 8 +- sys/contrib/openzfs/contrib/debian/clean | 4 +- sys/contrib/openzfs/contrib/debian/control | 26 +- .../{openzfs-libzfs6.docs => openzfs-libzfs7.docs} | 0 ...bzfs6.install.in => openzfs-libzfs7.install.in} | 0 ...enzfs-libzpool6.docs => openzfs-libzpool7.docs} | 0 ...ol6.install.in => openzfs-libzpool7.install.in} | 0 .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + sys/contrib/openzfs/include/sys/brt.h | 1 + sys/contrib/openzfs/include/sys/brt_impl.h | 2 +- sys/contrib/openzfs/include/sys/dmu.h | 8 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 4 +- sys/contrib/openzfs/include/sys/spa.h | 14 +- sys/contrib/openzfs/include/sys/vdev_impl.h | 1 + sys/contrib/openzfs/include/sys/zfs_project.h | 10 +- sys/contrib/openzfs/lib/libnvpair/Makefile.am | 2 +- sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/include/os/linux/sys/vfs.h | 33 +++ .../openzfs/lib/libspl/include/sys/tunables.h | 12 +- sys/contrib/openzfs/lib/libuutil/libuutil.abi | 69 ----- sys/contrib/openzfs/lib/libzfs/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 83 +----- sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 2 + sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 8 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 5 +- .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c | 37 +++ .../openzfs/lib/libzfs_core/libzfs_core.abi | 70 +---- .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi | 2 +- sys/contrib/openzfs/lib/libzpool/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzpool/kernel.c | 4 +- sys/contrib/openzfs/man/man4/zfs.4 | 42 ++- sys/contrib/openzfs/man/man7/vdevprops.7 | 8 +- sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 5 + sys/contrib/openzfs/man/man8/zfs-jail.8 | 79 +++--- sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 22 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 73 ++++-- sys/contrib/openzfs/man/man8/zpool-prefetch.8 | 27 +- sys/contrib/openzfs/module/Kbuild.in | 3 +- sys/contrib/openzfs/module/Makefile.bsd | 24 -- sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 5 +- sys/contrib/openzfs/module/os/freebsd/zfs/spa_os.c | 10 +- .../openzfs/module/os/freebsd/zfs/vdev_label_os.c | 8 +- .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 20 +- .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 2 + .../openzfs/module/os/freebsd/zfs/zvol_os.c | 12 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 3 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 93 +++++-- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 6 +- sys/contrib/openzfs/module/zcommon/zpool_prop.c | 3 + sys/contrib/openzfs/module/zfs/arc.c | 8 +- sys/contrib/openzfs/module/zfs/bpobj.c | 7 +- sys/contrib/openzfs/module/zfs/bptree.c | 9 +- sys/contrib/openzfs/module/zfs/brt.c | 48 +++- sys/contrib/openzfs/module/zfs/dbuf.c | 5 +- sys/contrib/openzfs/module/zfs/ddt_log.c | 7 +- sys/contrib/openzfs/module/zfs/dmu.c | 27 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 6 +- sys/contrib/openzfs/module/zfs/dnode.c | 156 +++++------- sys/contrib/openzfs/module/zfs/metaslab.c | 8 +- sys/contrib/openzfs/module/zfs/mmp.c | 4 +- sys/contrib/openzfs/module/zfs/spa.c | 281 +++++++++++++-------- sys/contrib/openzfs/module/zfs/spa_checkpoint.c | 2 +- sys/contrib/openzfs/module/zfs/spa_config.c | 8 +- sys/contrib/openzfs/module/zfs/spa_history.c | 5 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 110 +++++--- sys/contrib/openzfs/module/zfs/space_map.c | 2 +- sys/contrib/openzfs/module/zfs/vdev.c | 86 +++++-- .../openzfs/module/zfs/vdev_indirect_births.c | 2 +- .../openzfs/module/zfs/vdev_indirect_mapping.c | 5 +- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 8 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 33 +-- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 4 +- sys/contrib/openzfs/module/zfs/vdev_removal.c | 20 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 12 +- sys/contrib/openzfs/module/zfs/zap_micro.c | 4 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 9 +- sys/contrib/openzfs/module/zfs/zfs_fuid.c | 2 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 41 +-- sys/contrib/openzfs/module/zfs/zio.c | 13 +- sys/contrib/openzfs/module/zfs/zio_inject.c | 8 +- sys/contrib/openzfs/module/zfs/zvol.c | 9 +- .../openzfs/module/zstd/include/aarch64_compat.h | 38 --- .../openzfs/module/zstd/lib/common/compiler.h | 3 - .../openzfs/module/zstd/lib/common/zstd_internal.h | 9 + sys/contrib/openzfs/rpm/generic/zfs.spec.in | 44 ++-- sys/contrib/openzfs/scripts/Makefile.am | 4 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 4 + sys/contrib/openzfs/scripts/zfs2zol-patch.sed | 32 --- sys/contrib/openzfs/scripts/zol2zfs-patch.sed | 20 -- sys/contrib/openzfs/tests/runfiles/common.run | 2 +- .../tests/test-runner/bin/test-runner.py.in | 33 ++- .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + .../zpool_prefetch/zpool_prefetch_001_pos.ksh | 12 +- .../zpool_prefetch/zpool_prefetch_002_pos.ksh | 95 +++++++ .../tests/functional/events/zed_slow_io.ksh | 44 +++- .../tests/functional/trim/autotrim_config.ksh | 2 +- 115 files changed, 1386 insertions(+), 1059 deletions(-) diff --git a/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py b/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py index 08021aabcb61..059d6ad3872b 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py +++ b/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py @@ -7,7 +7,7 @@ Prints "quick" if (explicity required by user): - the *last* commit message contains 'ZFS-CI-Type: quick' or if (heuristics): - the files changed are not in the list of specified directories, and -- all commit messages do not contain 'ZFS-CI-Type: full' +- all commit messages do not contain 'ZFS-CI-Type: (full|linux|freebsd)' Otherwise prints "full". """ @@ -70,7 +70,7 @@ if __name__ == '__main__': for line in last_commit_message_raw.stdout.decode().splitlines(): if line.strip().lower() == 'zfs-ci-type: quick': - output_type('quick', f'explicitly requested by HEAD commit {head}') + output_type('quick', f'requested by HEAD commit {head}') # check all commit messages all_commit_message_raw = subprocess.run([ @@ -83,8 +83,12 @@ if __name__ == '__main__': for line in all_commit_message: if line.startswith('ZFS-CI-Commit:'): commit_ref = line.lstrip('ZFS-CI-Commit:').rstrip() + if line.strip().lower() == 'zfs-ci-type: freebsd': + output_type('freebsd', f'requested by commit {commit_ref}') + if line.strip().lower() == 'zfs-ci-type: linux': + output_type('linux', f'requested by commit {commit_ref}') if line.strip().lower() == 'zfs-ci-type: full': - output_type('full', f'explicitly requested by commit {commit_ref}') + output_type('full', f'requested by commit {commit_ref}') # check changed files changed_files_raw = subprocess.run([ diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh index 422b3e9df388..5bdd84ca2435 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh @@ -47,16 +47,15 @@ case "$OS" in OSNAME="Archlinux" URL="https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-cloudimg.qcow2" ;; + centos-stream9) + OSNAME="CentOS Stream 9" + URL="https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2" + ;; centos-stream10) OSNAME="CentOS Stream 10" - # TODO: #16903 Overwrite OSv to stream9 for virt-install until it's added to osinfo OSv="centos-stream9" URL="https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-10-latest.x86_64.qcow2" ;; - centos-stream9) - OSNAME="CentOS Stream 9" - URL="https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2" - ;; debian11) OSNAME="Debian 11" URL="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.qcow2" @@ -83,6 +82,11 @@ case "$OS" in OSv="fedora-unknown" URL="https://download.fedoraproject.org/pub/fedora/linux/releases/42/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-42-1.1.x86_64.qcow2" ;; + fedora43) + OSNAME="Fedora 43" + OSv="fedora-unknown" + URL="https://download.fedoraproject.org/pub/fedora/linux/releases/43/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-43-1.6.x86_64.qcow2" + ;; freebsd13-5r) FreeBSD="13.5-RELEASE" OSNAME="FreeBSD $FreeBSD" @@ -95,8 +99,8 @@ case "$OS" in FreeBSD="14.2-RELEASE" OSNAME="FreeBSD $FreeBSD" OSv="freebsd14.0" - KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz" + KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" ;; freebsd14-3r) FreeBSD="14.3-RELEASE" @@ -120,8 +124,8 @@ case "$OS" in URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz" ;; - freebsd15-0c) - FreeBSD="15.0-ALPHA4" + freebsd15-0s) + FreeBSD="15.0-STABLE" OSNAME="FreeBSD $FreeBSD" OSv="freebsd14.0" URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" diff --git a/sys/contrib/openzfs/.github/workflows/zfs-qemu-packages.yml b/sys/contrib/openzfs/.github/workflows/zfs-qemu-packages.yml index d8a95954fe1a..6367fb3a6ce2 100644 --- a/sys/contrib/openzfs/.github/workflows/zfs-qemu-packages.yml +++ b/sys/contrib/openzfs/.github/workflows/zfs-qemu-packages.yml @@ -52,7 +52,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['almalinux8', 'almalinux9', 'almalinux10', 'fedora41', 'fedora42'] + os: ['almalinux8', 'almalinux9', 'almalinux10', 'fedora41', 'fedora42', 'fedora43'] runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 diff --git a/sys/contrib/openzfs/.github/workflows/zfs-qemu.yml b/sys/contrib/openzfs/.github/workflows/zfs-qemu.yml index f1b189062bb7..2436b3d73e56 100644 --- a/sys/contrib/openzfs/.github/workflows/zfs-qemu.yml +++ b/sys/contrib/openzfs/.github/workflows/zfs-qemu.yml @@ -29,24 +29,34 @@ jobs: - name: Generate OS config and CI type id: os run: | - FULL_OS='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian12", "debian13", "fedora41", "fedora42", "freebsd13-5r", "freebsd14-3s", "freebsd15-0c", "ubuntu22", "ubuntu24"]' - QUICK_OS='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd14-3s", "ubuntu24"]' + ci_type="default" + # determine CI type when running on PR - ci_type="full" if ${{ github.event_name == 'pull_request' }}; then head=${{ github.event.pull_request.head.sha }} base=${{ github.event.pull_request.base.sha }} ci_type=$(python3 .github/workflows/scripts/generate-ci-type.py $head $base) fi - if [ "$ci_type" == "quick" ]; then - os_selection="$QUICK_OS" - else - os_selection="$FULL_OS" - fi + + case "$ci_type" in + quick) + os_selection='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd15-0s", "ubuntu24"]' + ;; + linux) + os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian11", "debian12", "debian13", "fedora41", "fedora42", "fedora43", "ubuntu22", "ubuntu24"]' + ;; + freebsd) + os_selection='["freebsd13-5r", "freebsd14-2r", "freebsd14-3r", "freebsd13-5s", "freebsd14-3s", "freebsd15-0s", "freebsd16-0c"]' + ;; + *) + # default list + os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian12", "debian13", "fedora42", "fedora43", "freebsd14-3r", "freebsd15-0s", "freebsd16-0c", "ubuntu22", "ubuntu24"]' + ;; + esac if ${{ github.event.inputs.fedora_kernel_ver != '' }}; then - # They specified a custom kernel version for Fedora. Use only - # Fedora runners. + # They specified a custom kernel version for Fedora. + # Use only Fedora runners. os_json=$(echo ${os_selection} | jq -c '[.[] | select(startswith("fedora"))]') else # Normal case @@ -62,13 +72,13 @@ jobs: strategy: fail-fast: false matrix: - # rhl: almalinux8, almalinux9, centos-stream9, fedora4x + # rhl: almalinux8, almalinux9, centos-streamX, fedora4x # debian: debian12, debian13, ubuntu22, ubuntu24 # misc: archlinux, tumbleweed - # FreeBSD variants of 2025-06: + # FreeBSD variants of november 2025: # FreeBSD Release: freebsd13-5r, freebsd14-2r, freebsd14-3r - # FreeBSD Stable: freebsd13-5s, freebsd14-3s - # FreeBSD Current: freebsd15-0c, freebsd16-0c + # FreeBSD Stable: freebsd13-5s, freebsd14-3s, freebsd15-0s + # FreeBSD Current: freebsd16-0c os: ${{ fromJson(needs.test-config.outputs.test_os) }} runs-on: ubuntu-24.04 steps: diff --git a/sys/contrib/openzfs/.mailmap b/sys/contrib/openzfs/.mailmap index e6f09c6c9d43..3397fbc3745d 100644 --- a/sys/contrib/openzfs/.mailmap +++ b/sys/contrib/openzfs/.mailmap @@ -53,6 +53,7 @@ Jason Harmening Jeremy Faulkner Jinshan Xiong John Poduska +Jo Zzsi Justin Scholz Ka Ho Ng Kash Pande @@ -67,6 +68,7 @@ Michael Gmelin Olivier Mazouffre Piotr Kubaj Quentin Zdanis +Roberto Ricci Roberto Ricci Rob Norris Rob Norris @@ -83,7 +85,10 @@ Youzhong Yang # Signed-off-by: overriding Author: Alexander Ziaee Felix Schmidt +Jean-Sébastien Pédron +Konstantin Belousov Olivier Certner +Patrick Xia Phil Sutter poscat Qiuhao Chen @@ -125,6 +130,7 @@ buzzingwires <131118055+buzzingwires@users.noreply.gi Cedric Maunoury <38213715+cedricmaunoury@users.noreply.github.com> Charles Suh Chris Peredun <126915832+chrisperedun@users.noreply.github.com> +classabbyamp <5366828+classabbyamp@users.noreply.github.com> Dacian Reece-Stremtan <35844628+dacianstremtan@users.noreply.github.com> Damian Szuberski <30863496+szubersk@users.noreply.github.com> Daniel Hiepler <32984777+heeplr@users.noreply.github.com> @@ -185,6 +191,7 @@ Michael Niewöhner Michael Zhivich <33133421+mzhivich@users.noreply.github.com> MigeljanImeri <78048439+MigeljanImeri@users.noreply.github.com> Mo Zhou <5723047+cdluminate@users.noreply.github.com> +nav1s <42621369+nav1s@users.noreply.github.com> Nick Mattis omni <79493359+omnivagant@users.noreply.github.com> Pablo Correa Gómez <32678034+pablofsf@users.noreply.github.com> @@ -206,6 +213,7 @@ Samuel Wycliffe <50765275+npc203@users.noreply.github Savyasachee Jha Scott Colby Sean Eric Fagan +Shreshth Srivastava <66148173+Shreshth3@users.noreply.github.com> Spencer Kinny <30333052+Spencer-Kinny@users.noreply.github.com> Srikanth N S <75025422+nssrikanth@users.noreply.github.com> Stefan Lendl <1321542+stfl@users.noreply.github.com> diff --git a/sys/contrib/openzfs/AUTHORS b/sys/contrib/openzfs/AUTHORS index 6c34c07f39ef..e496c0e8a807 100644 --- a/sys/contrib/openzfs/AUTHORS +++ b/sys/contrib/openzfs/AUTHORS @@ -154,6 +154,7 @@ CONTRIBUTORS: Chris Zubrzycki Chuck Tuffli Chunwei Chen + classabbyamp Clemens Fruhwirth Clemens Lang Clint Armstrong @@ -161,6 +162,7 @@ CONTRIBUTORS: Colin Ian King Colin Percival Colm Buckley + Cong Zhang Crag Wang Craig Loomis Craig Sanders @@ -217,6 +219,7 @@ CONTRIBUTORS: Eitan Adler Eli Rosenthal Eli Schwartz + Eric A. Borisch Eric Desrochers Eric Dillmann Eric Schrock @@ -288,6 +291,7 @@ CONTRIBUTORS: Henrik Riomar Herb Wartens Hiếu Lê + hoshinomori Huang Liu Håkan Johansson Igor K @@ -300,6 +304,7 @@ CONTRIBUTORS: ilovezfs InsanePrawn Isaac Huang + Ivan Shapovalov Ivan Volosyuk Jacek Fefliński Jacob Adams @@ -322,6 +327,7 @@ CONTRIBUTORS: Javen Wu Jaydeep Kshirsagar Jean-Baptiste Lallement + Jean-Sébastien Pédron Jeff Dike Jeremy Faulkner Jeremy Gill @@ -355,7 +361,9 @@ CONTRIBUTORS: Josh Soref Joshua M. Clulow José Luis Salvador Rufo + Jo Zzsi João Carlos Mendes Luís + JT Pennington Julian Brunner Julian Heuking jumbi77 @@ -388,6 +396,7 @@ CONTRIBUTORS: Kleber Tarcísio Kody A Kantor Kohsuke Kawaguchi + Konstantin Belousov Konstantin Khorenko KORN Andras kotauskas @@ -416,6 +425,7 @@ CONTRIBUTORS: luozhengzheng Luís Henriques Madhav Suresh + Maksym Shkolnyi manfromafar Manoj Joseph Manuel Amador (Rudd-O) @@ -482,6 +492,7 @@ CONTRIBUTORS: Nathaniel Clark Nathaniel Wesley Filardo Nathan Lewis + nav1s Nav Ravindranath Neal Gompa (ニール・ゴンパ) Ned Bass @@ -506,6 +517,7 @@ CONTRIBUTORS: Palash Gandhi Patrick Fasano Patrick Mooney + Patrick Xia Patrik Greco Paul B. Henson Paul Dagnelie @@ -605,6 +617,7 @@ CONTRIBUTORS: Shengqi Chen SHENGYI HONG Shen Yan + Shreshth Srivastava Sietse Simon Guest Simon Howard @@ -665,6 +678,7 @@ CONTRIBUTORS: Toyam Cox Trevor Bautista Trey Dockendorf + trick2011 Troels Nørgaard tstabrawa Tulsi Jain diff --git a/sys/contrib/openzfs/META b/sys/contrib/openzfs/META index 2bfa51841cc4..da43a41ab824 100644 --- a/sys/contrib/openzfs/META +++ b/sys/contrib/openzfs/META @@ -2,7 +2,7 @@ Meta: 1 Name: zfs Branch: 1.0 Version: 2.4.0 -Release: rc3 +Release: rc4 Release-Tags: relext License: CDDL Author: OpenZFS diff --git a/sys/contrib/openzfs/README.md b/sys/contrib/openzfs/README.md index a90736bb56b7..a39b88fedd12 100644 --- a/sys/contrib/openzfs/README.md +++ b/sys/contrib/openzfs/README.md @@ -10,7 +10,7 @@ This repository contains the code for running OpenZFS on Linux and FreeBSD. # Official Resources * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo - * [ZoL Site](https://zfsonlinux.org) - Linux release info & links + * [ZoL site](https://zfsonlinux.org) - Linux release info & links * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html) * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc) diff --git a/sys/contrib/openzfs/autogen.sh b/sys/contrib/openzfs/autogen.sh index 39eb82203d69..5cb152474698 100755 --- a/sys/contrib/openzfs/autogen.sh +++ b/sys/contrib/openzfs/autogen.sh @@ -1,62 +1,3 @@ #!/bin/sh -[ "${0%/*}" = "$0" ] || cd "${0%/*}" || exit -# %reldir%/%canon_reldir% (%D%/%C%) only appeared in automake 1.14, but RHEL/CentOS 7 has 1.13.4 -# This is an (overly) simplistic preprocessor that papers around this for the duration of the generation step, -# and can be removed once support for CentOS 7 is dropped -automake --version | awk '{print $NF; exit}' | ( - IFS=. read -r AM_MAJ AM_MIN _ - [ "$AM_MAJ" -gt 1 ] || [ "$AM_MIN" -ge 14 ] -) || { - process_root() { - root="$1"; shift - - grep -q '%[CD]%' "$root/Makefile.am" || return - find "$root" -name Makefile.am "$@" | while read -r dir; do - dir="${dir%/Makefile.am}" - grep -q '%[CD]%' "$dir/Makefile.am" || continue - - reldir="${dir#"$root"}" - reldir="${reldir#/}" - - canon_reldir="$(printf '%s' "$reldir" | tr -C 'a-zA-Z0-9@_' '_')" - - reldir_slash="$reldir/" - canon_reldir_slash="${canon_reldir}_" - [ -z "$reldir" ] && reldir_slash= - [ -z "$reldir" ] && canon_reldir_slash= - - echo "$dir/Makefile.am" >&3 - sed -i~ -e "s:%D%/:$reldir_slash:g" -e "s:%D%:$reldir:g" \ - -e "s:%C%_:$canon_reldir_slash:g" -e "s:%C%:$canon_reldir:g" "$dir/Makefile.am" - done 3>>"$substituted_files" - } - - rollback() { - while read -r f; do - mv "$f~" "$f" - done < "$substituted_files" - rm -f "$substituted_files" - } - - - echo "Automake <1.14; papering over missing %reldir%/%canon_reldir% support" >&2 - - substituted_files="$(mktemp)" - trap rollback EXIT - - roots="$(sed '/Makefile$/!d;/module/d;s:^\s*:./:;s:/Makefile::;/^\.$/d' configure.ac)" - - IFS=" -" - for root in $roots; do - root="${root#./}" - process_root "$root" - done - - set -f - # shellcheck disable=SC2086,SC2046 - process_root . $(printf '!\n-path\n%s/*\n' $roots) -} - -autoreconf -fiv && rm -rf autom4te.cache +autoreconf -fiv "$(dirname "$0")" && rm -rf "$(dirname "$0")"/autom4te.cache diff --git a/sys/contrib/openzfs/cmd/zdb/zdb.c b/sys/contrib/openzfs/cmd/zdb/zdb.c index 2560ad045db3..fa8e7fa691db 100644 --- a/sys/contrib/openzfs/cmd/zdb/zdb.c +++ b/sys/contrib/openzfs/cmd/zdb/zdb.c @@ -7899,11 +7899,11 @@ zdb_set_skip_mmp(char *target) * Disable the activity check to allow examination of * active pools. */ - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); if ((spa = spa_lookup(target)) != NULL) { spa->spa_import_flags |= ZFS_IMPORT_SKIP_MMP; } - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); } #define BOGUS_SUFFIX "_CHECKPOINTED_UNIVERSE" @@ -10022,13 +10022,13 @@ main(int argc, char **argv) * try opening the pool after clearing the * log state. */ - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); if ((spa = spa_lookup(target)) != NULL && spa->spa_log_state == SPA_LOG_MISSING) { spa->spa_log_state = SPA_LOG_CLEAR; error = 0; } - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); if (!error) { error = spa_open_rewind(target, &spa, diff --git a/sys/contrib/openzfs/cmd/zfs/zfs_project.c b/sys/contrib/openzfs/cmd/zfs/zfs_project.c index fbf5e6cbdc68..8925e6672bef 100644 --- a/sys/contrib/openzfs/cmd/zfs/zfs_project.c +++ b/sys/contrib/openzfs/cmd/zfs/zfs_project.c @@ -145,11 +145,11 @@ zfs_project_handle_one(const char *name, zfs_project_control_t *zpc) switch (zpc->zpc_op) { case ZFS_PROJECT_OP_LIST: (void) printf("%5u %c %s\n", fsx.fsx_projid, - (fsx.fsx_xflags & ZFS_PROJINHERIT_FL) ? 'P' : '-', name); + (fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) ? 'P' : '-', name); goto out; case ZFS_PROJECT_OP_CHECK: if (fsx.fsx_projid == zpc->zpc_expected_projid && - fsx.fsx_xflags & ZFS_PROJINHERIT_FL) + fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) goto out; if (!zpc->zpc_newline) { @@ -164,29 +164,30 @@ zfs_project_handle_one(const char *name, zfs_project_control_t *zpc) "(%u/%u)\n", name, fsx.fsx_projid, (uint32_t)zpc->zpc_expected_projid); - if (!(fsx.fsx_xflags & ZFS_PROJINHERIT_FL)) + if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT)) (void) printf("%s - project inherit flag is not set\n", name); goto out; case ZFS_PROJECT_OP_CLEAR: - if (!(fsx.fsx_xflags & ZFS_PROJINHERIT_FL) && + if (!(fsx.fsx_xflags & FS_XFLAG_PROJINHERIT) && (zpc->zpc_keep_projid || fsx.fsx_projid == ZFS_DEFAULT_PROJID)) goto out; - fsx.fsx_xflags &= ~ZFS_PROJINHERIT_FL; + fsx.fsx_xflags &= ~FS_XFLAG_PROJINHERIT; if (!zpc->zpc_keep_projid) fsx.fsx_projid = ZFS_DEFAULT_PROJID; break; case ZFS_PROJECT_OP_SET: if (fsx.fsx_projid == zpc->zpc_expected_projid && - (!zpc->zpc_set_flag || fsx.fsx_xflags & ZFS_PROJINHERIT_FL)) + (!zpc->zpc_set_flag || + fsx.fsx_xflags & FS_XFLAG_PROJINHERIT)) goto out; fsx.fsx_projid = zpc->zpc_expected_projid; if (zpc->zpc_set_flag) - fsx.fsx_xflags |= ZFS_PROJINHERIT_FL; + fsx.fsx_xflags |= FS_XFLAG_PROJINHERIT; break; default: ASSERT(0); @@ -194,11 +195,30 @@ zfs_project_handle_one(const char *name, zfs_project_control_t *zpc) } ret = ioctl(fd, ZFS_IOC_FSSETXATTR, &fsx); - if (ret) + if (ret) { (void) fprintf(stderr, gettext("failed to set xattr for %s: %s\n"), name, strerror(errno)); + if (errno == ENOTSUP) { + char *kver = zfs_version_kernel(); + /* + * Special case: a module/userspace version mismatch can + * return ENOTSUP due to us fixing the XFLAGs bits in + * #17884. In that case give a hint to the user that + * they should take action to make the versions match. + */ + if (strcmp(kver, ZFS_META_ALIAS) != 0) { + fprintf(stderr, + gettext("Warning: The zfs module version " + "(%s) and userspace\nversion (%s) do not " + "match up. This may be the\ncause of the " + "\"Operation not supported\" error.\n"), + kver, ZFS_META_ALIAS); + } + } + } + out: close(fd); return (ret); diff --git a/sys/contrib/openzfs/cmd/zpool/zpool_main.c b/sys/contrib/openzfs/cmd/zpool/zpool_main.c index 1feec55c0e8b..18952775bcfe 100644 --- a/sys/contrib/openzfs/cmd/zpool/zpool_main.c +++ b/sys/contrib/openzfs/cmd/zpool/zpool_main.c @@ -494,8 +494,7 @@ get_usage(zpool_help_t idx) "[--json-int, --json-pool-key-guid]] ...\n" "\t [-T d|u] [pool] [interval [count]]\n")); case HELP_PREFETCH: - return (gettext("\tprefetch -t [] \n" - "\t -t ddt \n")); + return (gettext("\tprefetch [-t ] \n")); case HELP_OFFLINE: return (gettext("\toffline [--power]|[[-f][-t]] " " ...\n")); @@ -4200,7 +4199,7 @@ zpool_do_checkpoint(int argc, char **argv) #define CHECKPOINT_OPT 1024 /* - * zpool prefetch [] + * zpool prefetch [-t ] * * Prefetchs a particular type of data in the specified pool. */ @@ -4245,20 +4244,27 @@ zpool_do_prefetch(int argc, char **argv) poolname = argv[0]; - argc--; - argv++; - - if (strcmp(typestr, "ddt") == 0) { - type = ZPOOL_PREFETCH_DDT; - } else { - (void) fprintf(stderr, gettext("unsupported prefetch type\n")); - usage(B_FALSE); - } - if ((zhp = zpool_open(g_zfs, poolname)) == NULL) return (1); - err = zpool_prefetch(zhp, type); + if (typestr == NULL) { + /* Prefetch all types */ + err = zpool_prefetch(zhp, ZPOOL_PREFETCH_DDT); + if (err == 0) + err = zpool_prefetch(zhp, ZPOOL_PREFETCH_BRT); + } else { + if (strcmp(typestr, "ddt") == 0) { + type = ZPOOL_PREFETCH_DDT; + } else if (strcmp(typestr, "brt") == 0) { + type = ZPOOL_PREFETCH_BRT; + } else { + (void) fprintf(stderr, + gettext("unsupported prefetch type\n")); + zpool_close(zhp); + usage(B_FALSE); + } + err = zpool_prefetch(zhp, type); + } zpool_close(zhp); diff --git a/sys/contrib/openzfs/cmd/ztest.c b/sys/contrib/openzfs/cmd/ztest.c index 89752dcb0f0f..89b1f68606ea 100644 --- a/sys/contrib/openzfs/cmd/ztest.c +++ b/sys/contrib/openzfs/cmd/ztest.c @@ -1228,10 +1228,10 @@ ztest_kill(ztest_shared_t *zs) * See comment above spa_write_cachefile(). */ if (raidz_expand_pause_point != RAIDZ_EXPAND_PAUSE_NONE) { - if (mutex_tryenter(&spa_namespace_lock)) { + if (spa_namespace_tryenter(FTAG)) { spa_write_cachefile(ztest_spa, B_FALSE, B_FALSE, B_FALSE); - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); ztest_scratch_state->zs_raidz_scratch_verify_pause = raidz_expand_pause_point; @@ -1246,9 +1246,9 @@ ztest_kill(ztest_shared_t *zs) return; } } else { - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); spa_write_cachefile(ztest_spa, B_FALSE, B_FALSE, B_FALSE); - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); } (void) raise(SIGKILL); @@ -2306,7 +2306,8 @@ ztest_replay_write(void *arg1, void *arg2, boolean_t byteswap) } if (abuf == NULL) { - dmu_write(os, lr->lr_foid, offset, length, data, tx); + dmu_write(os, lr->lr_foid, offset, length, data, tx, + DMU_READ_PREFETCH); } else { memcpy(abuf->b_data, data, length); VERIFY0(dmu_assign_arcbuf_by_dbuf(db, offset, abuf, tx, 0)); @@ -3688,10 +3689,10 @@ ztest_split_pool(ztest_ds_t *zd, uint64_t id) if (error == 0) { (void) printf("successful split - results:\n"); - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); show_pool_stats(spa); show_pool_stats(spa_lookup("splitp")); - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); ++zs->zs_splits; --zs->zs_mirrors; } @@ -3975,11 +3976,11 @@ raidz_scratch_verify(void) kernel_init(SPA_MODE_READ); - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); spa = spa_lookup(ztest_opts.zo_pool); ASSERT(spa); spa->spa_import_flags |= ZFS_IMPORT_SKIP_MMP; - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); VERIFY0(spa_open(ztest_opts.zo_pool, &spa, FTAG)); @@ -5243,7 +5244,8 @@ ztest_dmu_read_write(ztest_ds_t *zd, uint64_t id) * We've verified all the old bufwads, and made new ones. * Now write them out. */ - dmu_write(os, packobj, packoff, packsize, packbuf, tx); + dmu_write(os, packobj, packoff, packsize, packbuf, tx, + DMU_READ_PREFETCH); if (freeit) { if (ztest_opts.zo_verbose >= 7) { @@ -5258,7 +5260,8 @@ ztest_dmu_read_write(ztest_ds_t *zd, uint64_t id) " txg %"PRIx64"\n", bigoff, bigsize, txg); } - dmu_write(os, bigobj, bigoff, bigsize, bigbuf, tx); + dmu_write(os, bigobj, bigoff, bigsize, bigbuf, tx, + DMU_READ_PREFETCH); } dmu_tx_commit(tx); @@ -5513,7 +5516,8 @@ ztest_dmu_read_write_zcopy(ztest_ds_t *zd, uint64_t id) * We've verified all the old bufwads, and made new ones. * Now write them out. */ - dmu_write(os, packobj, packoff, packsize, packbuf, tx); + dmu_write(os, packobj, packoff, packsize, packbuf, tx, + DMU_READ_PREFETCH); if (ztest_opts.zo_verbose >= 7) { (void) printf("writing offset %"PRIx64" size %"PRIx64"" " txg %"PRIx64"\n", @@ -6119,7 +6123,8 @@ ztest_dmu_commit_callbacks(ztest_ds_t *zd, uint64_t id) "future leak: got %"PRIu64", open txg is %"PRIu64"", old_txg, txg); - dmu_write(os, od->od_object, 0, sizeof (uint64_t), &txg, tx); + dmu_write(os, od->od_object, 0, sizeof (uint64_t), &txg, tx, + DMU_READ_PREFETCH); (void) mutex_enter(&zcl.zcl_callbacks_lock); @@ -7422,11 +7427,11 @@ ztest_walk_pool_directory(const char *header) if (ztest_opts.zo_verbose >= 6) (void) puts(header); - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); while ((spa = spa_next(spa)) != NULL) if (ztest_opts.zo_verbose >= 6) (void) printf("\t%s\n", spa_name(spa)); - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); } static void @@ -8541,11 +8546,11 @@ ztest_run(ztest_shared_t *zs) /* * Verify that we can loop over all pools. */ - mutex_enter(&spa_namespace_lock); + spa_namespace_enter(FTAG); for (spa = spa_next(NULL); spa != NULL; spa = spa_next(spa)) if (ztest_opts.zo_verbose > 3) (void) printf("spa_next: found %s\n", spa_name(spa)); - mutex_exit(&spa_namespace_lock); + spa_namespace_exit(FTAG); /* * Verify that we can export the pool and reimport it under a diff --git a/sys/contrib/openzfs/config/deb.am b/sys/contrib/openzfs/config/deb.am index 9e58e1905b73..3e9a9379712e 100644 --- a/sys/contrib/openzfs/config/deb.am +++ b/sys/contrib/openzfs/config/deb.am @@ -58,9 +58,9 @@ deb-utils: deb-local rpm-utils-initramfs pkg1=$${name}-$${version}.$${arch}.rpm; \ pkg2=libnvpair3-$${version}.$${arch}.rpm; \ pkg3=libuutil3-$${version}.$${arch}.rpm; \ - pkg4=libzfs6-$${version}.$${arch}.rpm; \ - pkg5=libzpool6-$${version}.$${arch}.rpm; \ - pkg6=libzfs6-devel-$${version}.$${arch}.rpm; \ + pkg4=libzfs7-$${version}.$${arch}.rpm; \ + pkg5=libzpool7-$${version}.$${arch}.rpm; \ + pkg6=libzfs7-devel-$${version}.$${arch}.rpm; \ pkg7=$${name}-test-$${version}.$${arch}.rpm; \ pkg8=$${name}-dracut-$${version}.noarch.rpm; \ pkg9=$${name}-initramfs-$${version}.$${arch}.rpm; \ @@ -72,7 +72,7 @@ deb-utils: deb-local rpm-utils-initramfs path_prepend=`mktemp -d /tmp/intercept.XXXXXX`; \ echo "#!$(SHELL)" > $${path_prepend}/dh_shlibdeps; \ echo "`which dh_shlibdeps` -- \ - -xlibuutil3linux -xlibnvpair3linux -xlibzfs6linux -xlibzpool6linux" \ + -xlibuutil3linux -xlibnvpair3linux -xlibzfs7linux -xlibzpool7linux" \ >> $${path_prepend}/dh_shlibdeps; \ ## These -x arguments are passed to dpkg-shlibdeps, which exclude the ## Debianized packages from the auto-generated dependencies of the new debs, diff --git a/sys/contrib/openzfs/contrib/debian/Makefile.am b/sys/contrib/openzfs/contrib/debian/Makefile.am index 99d512312df6..3c219856005e 100644 --- a/sys/contrib/openzfs/contrib/debian/Makefile.am +++ b/sys/contrib/openzfs/contrib/debian/Makefile.am @@ -12,14 +12,14 @@ dist_noinst_DATA += %D%/openzfs-libpam-zfs.postinst dist_noinst_DATA += %D%/openzfs-libpam-zfs.prerm dist_noinst_DATA += %D%/openzfs-libuutil3.docs dist_noinst_DATA += %D%/openzfs-libuutil3.install.in -dist_noinst_DATA += %D%/openzfs-libzfs6.docs -dist_noinst_DATA += %D%/openzfs-libzfs6.install.in +dist_noinst_DATA += %D%/openzfs-libzfs7.docs +dist_noinst_DATA += %D%/openzfs-libzfs7.install.in dist_noinst_DATA += %D%/openzfs-libzfsbootenv1.docs dist_noinst_DATA += %D%/openzfs-libzfsbootenv1.install.in dist_noinst_DATA += %D%/openzfs-libzfs-dev.docs dist_noinst_DATA += %D%/openzfs-libzfs-dev.install.in -dist_noinst_DATA += %D%/openzfs-libzpool6.docs -dist_noinst_DATA += %D%/openzfs-libzpool6.install.in +dist_noinst_DATA += %D%/openzfs-libzpool7.docs +dist_noinst_DATA += %D%/openzfs-libzpool7.install.in dist_noinst_DATA += %D%/openzfs-python3-pyzfs.install dist_noinst_DATA += %D%/openzfs-zfs-dkms.config dist_noinst_DATA += %D%/openzfs-zfs-dkms.dkms diff --git a/sys/contrib/openzfs/contrib/debian/clean b/sys/contrib/openzfs/contrib/debian/clean index 4f52d01b8108..caabcd30c62a 100644 --- a/sys/contrib/openzfs/contrib/debian/clean +++ b/sys/contrib/openzfs/contrib/debian/clean @@ -6,6 +6,6 @@ contrib/pyzfs/libzfs_core/bindings/__pycache__/ contrib/pyzfs/pyzfs.egg-info/ debian/openzfs-libnvpair3.install debian/openzfs-libuutil3.install -debian/openzfs-libzfs6.install +debian/openzfs-libzfs7.install debian/openzfs-libzfs-dev.install -debian/openzfs-libzpool6.install +debian/openzfs-libzpool7.install diff --git a/sys/contrib/openzfs/contrib/debian/control b/sys/contrib/openzfs/contrib/debian/control index c5358dedc0fd..a886c2e86cc5 100644 --- a/sys/contrib/openzfs/contrib/debian/control +++ b/sys/contrib/openzfs/contrib/debian/control @@ -79,9 +79,9 @@ Architecture: linux-any Depends: libssl-dev | libssl1.0-dev, openzfs-libnvpair3 (= ${binary:Version}), openzfs-libuutil3 (= ${binary:Version}), - openzfs-libzfs6 (= ${binary:Version}), + openzfs-libzfs7 (= ${binary:Version}), openzfs-libzfsbootenv1 (= ${binary:Version}), - openzfs-libzpool6 (= ${binary:Version}), + openzfs-libzpool7 (= ${binary:Version}), ${misc:Depends} Replaces: libzfslinux-dev Conflicts: libzfslinux-dev @@ -91,18 +91,18 @@ Description: OpenZFS filesystem development files for Linux libraries of OpenZFS filesystem. . *** 5226 LINES SKIPPED *** From nobody Wed Nov 19 21:44:31 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkm1VpYz6JKCl for ; Wed, 19 Nov 2025 21:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkm0Prwz3CJv for ; Wed, 19 Nov 2025 21:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FHtW8NJtFy7+Tw4sR8O+g7+xj59mWKPLHfapSIaaRxY=; b=ISDpJuvkBxXHOVEixs9rkluvk4wO8+KEQpCgPwB/BRWUXE4ZEhPbbXejA+BTiGZAcKuUty Sg9DtcNJaceL9i3FZdv3jg/mef/TwN6aaO/iIk5iqIC4So1fUrNMLYem45LX+lsMVxu0eL YM4fywYEcH3mmg0oEUJQTdvr13LNoQdQnd+YGt6Y5y9uBYF6KWTS8lERNtmAKgjPcDxRWK dNEQz8jFNUSiufXPSR6bqVRx3UcCdsak6SNikj0hNsjMUy8hdmwozdWzMi3HMqxw/Ba0pH 6I5uPQHwdKcVU+IgxBRjLVNmCcrx7HmT2e2ytfHvU3v4109wGgl2L0xl+kE4+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FHtW8NJtFy7+Tw4sR8O+g7+xj59mWKPLHfapSIaaRxY=; b=U7hLgwj9nGUG2OFawcp0tq6S9RHXFQK2COs/KwuhiPO3/VQS9B01HKlO2iLrpTlx0qfq4L hxCPc2ZcdnN29kSLLNYaiQ7eFQu0Z1W1RVzkNGQPIGhjq9RrrGYAGS9bFd+emhJPgb2MWL HAYezSMUcgIbJ0wOYkgDkSXgD68TzThOTfgxCUQwgED6lIqFOFNGCQmlXpCChIhHKCZZVd 4beor5N6bCeFTHn0pBTod6X5ojabETdRu4sH22Fqeq2eqLHmipFw7TGAOfVWO7kapci9io I52DTRqlAFS3sqjOM2fmaUokZNP7jburFjsQ6SxnzF4mjaane3TGFSvruTnP2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588672; a=rsa-sha256; cv=none; b=FgNl9AJRFQMevvneTSjeNjUX5k33tD6R6oMRMNPZmpZ4oQq1E0KIxF1QBgD4TRsPiUBeuN fu4syT30iDYEoNHIfgy2Hghh8H4AblMk6i8uQGL3yhAENl87/jgdpRZs4ppyEnQzrgKeHY L+Yk7/i5iiP0APUJbUbmZLMmOzY1Z8BljCVFdOGGNICf/jh6ZVmmJPhJrPFVjoBldBU4Kc yUQIMKE/0cl+5SIuRmZiodvDFVgTMHs/jOjBqYg3hJ06vYvbssH8YiLow82m5WLS7JuTWH gQ4vrqA7B4v6k0hlqkHugzx2xgOgIf9iu93M1nASVgTxbs0KVlWv4nR6FWxD2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkl63ljzy17 for ; Wed, 19 Nov 2025 21:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33432 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Martin Matuska From: Colin Percival Subject: git: d10ce383bc19 - releng/15.0 - zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.4.0-rc4 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: d10ce383bc195c11fc105d76f1dfaf4e1ed46f71 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:31 +0000 Message-Id: <691e3a3f.33432.6cc34927@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d10ce383bc195c11fc105d76f1dfaf4e1ed46f71 commit d10ce383bc195c11fc105d76f1dfaf4e1ed46f71 Author: Martin Matuska AuthorDate: 2025-11-18 11:58:55 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:36:59 +0000 zfs: update zfs_config.h and zfs_gitrev.h to zfs-2.4.0-rc4 While here, fix compilation be unhiding zfs_tunables hidden in 5714090fb Approved by: re (cperciva) (cherry picked from commit 7128544353ac76cf0acfd02b327dec8e8f7faf1d) --- sys/contrib/openzfs/lib/libspl/include/sys/tunables.h | 3 ++- sys/modules/zfs/zfs_config.h | 4 ++-- sys/modules/zfs/zfs_gitrev.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h index c85400f6fd28..0ce348669bfe 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h @@ -25,7 +25,8 @@ */ #ifndef _SYS_TUNABLES_H -#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +//#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden"))) +#define _SYS_TUNABLES_H extern typedef enum { ZFS_TUNABLE_TYPE_INT, diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 339182042915..446c5c1a12cd 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -856,7 +856,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.0-rc3-FreeBSD_g814f9afba" +#define ZFS_META_ALIAS "zfs-2.4.0-rc4-FreeBSD_g099f69ff5" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -886,7 +886,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "rc3-FreeBSD_g814f9afba" +#define ZFS_META_RELEASE "rc4-FreeBSD_g099f69ff5" /* Define the project version. */ #define ZFS_META_VERSION "2.4.0" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index ba87aecc9751..cedd706372c4 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.0-rc3-0-g814f9afba" +#define ZFS_META_GITREV "zfs-2.4.0-rc4-0-g099f69ff5" From nobody Wed Nov 19 21:44:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkn3zn3z6JJnZ for ; Wed, 19 Nov 2025 21:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkm6s4wz3CGt for ; Wed, 19 Nov 2025 21:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fiwndPfrlByFyyXk6+HqtjfNRBvh6FTRYh59jWwIzvo=; b=X9S4sYeu5Jh+TLdvZr0J58pH/AYbxQioeYtVCZf5W68fe/M/8dd+qSbctYz/QEqGc5blKo q01L5eWRJugLerklc/7SxKEsSvpw4gnEUye9nt/lytAsnIfWPo+PdGPiQLVD4FWTiOwEBN LZgcM0J7AV4njHWKMZdHFenZc6fV0LJ14mGBPe2Qzq4rlYLrHPEMF9xecgkt29FadXT6WR +lxj+bGpxfaOtdzP/dgrCEWm6DUIU6Etzr5Dcq2iee9H8ck9kq7fBTTsiLqXlvhr0addiu Nu3POnE3k0f1Dy4EVOCkBEfqmQ7mHDgAHXakstchEhcv3h8JuM/uZHLEYog7EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fiwndPfrlByFyyXk6+HqtjfNRBvh6FTRYh59jWwIzvo=; b=hTs97hyxavRFCzpjnjnCDcjqXGVX1vpkCJD0uVcMi62OkKOh4bpcs8iv8AF8zqVdWcDE1f mOiWt2LCukcsTHCT9kM6Sv6nUph6LluZLaZPz2vvb3+Pb4WfP8z5MInMwoFh7ruYb1q0tb oLGANDnnvA3of6cROxET49tcypW5WKRmIcFcDX6ZRH75lO7C9eGNmz5Z268aXxlT3qAZ3q VyOAM931GQ8HQB/Euce/d2nPnVCQNTdQfPbDw8FVUpKR0b8zgexpFDm6HE4b5k70LHD+nX BqyFwEnb07DlS2i+jWl4IMBXHobDHMnIau8pW7RwAePcM73MLKGjDuzSM0Gpzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588673; a=rsa-sha256; cv=none; b=qM18zBZ5g34Y7UAKv4yUmxXr3QyUlLFnFJU8SNXZQ+68aq/rDe3J9VtvTMU3FNGCGgw4iL oQsRfu6yXdOgj9if+/al2zBH2jI4Fji+z0q04aiCKo5vLECgu25GIGN+KKP5wu7U5xQygZ 6t2gyaDciTGBeT/9byLnnGUM9JGEKuYCPb0X38JUmNVK/j+4C+B9yOx1BG4ggMl3bwz8af PO4jap679SBNBdQT5HQB+DyBgg2ray+nsjxCdJhEmvD7JOPczvDa64nJ89U5r1rsqF3Y2i aHLr0RMRIwaZuRf62b/z5TJptBtSEmAxMnJcvw+P4BkyLJU7VoVXbU9VDaAmDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkm6Pb8zy18 for ; Wed, 19 Nov 2025 21:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 328f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Martin Matuska From: Colin Percival Subject: git: c30f4ada165c - releng/15.0 - zfs: fix aarch64 build after zfs-2.4.0-rc4 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c30f4ada165c85a25f782549b84efc3b3e655ecd Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:32 +0000 Message-Id: <691e3a40.328f5.60b8b933@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c30f4ada165c85a25f782549b84efc3b3e655ecd commit c30f4ada165c85a25f782549b84efc3b3e655ecd Author: Martin Matuska AuthorDate: 2025-11-17 19:15:33 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:03 +0000 zfs: fix aarch64 build after zfs-2.4.0-rc4 Approved by: re (cperciva) (cherry picked from commit fb709935d64d5fd4ad21cf8c69faf580760999e4) (cherry picked from commit 484fa40ca71bc9c00ee6d3729e5e27cc5d68e131) --- sys/modules/zfs/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index ec531ed646a7..7a4d0bb51376 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -475,8 +475,6 @@ CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICA CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .if ${MACHINE_ARCH} == "aarch64" -__ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h -CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.error_private.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.fse_compress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} From nobody Wed Nov 19 21:44:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkq3fwCz6JJtS for ; Wed, 19 Nov 2025 21:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkq0nWJz3CDj for ; Wed, 19 Nov 2025 21:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=28G6CgAWeYeqpl5NaOKQ9kGAVHNK7ftmXb5Nhk5+t8I=; b=IIGcXnLfGn9g64XHFuDS8lJhXtNWOOSPhC/C6Qwk0l6ZDr4imIk84tvKAuaepwpr9Zv4EO aX0TtJWWNim2l+8FV58vpBuqcM84M73W3Zq3d2Cfp2cFYJFqWZK2Fx6521jgzEghXE2MO0 VgNz0VY+0ct5mmdfj/24/l2qd5s1QbZ2BUBb69+BQ61sJT6dDe+H2J1ItiqUPZX75bduyf cS49DLpNKwHxTPThVXNkpz+8oXzvS85Fk+eF+5LOXDX8hymMnBQWRuqWM0UzsNHzXIv4eD RJqlO7yamijTqU0Fp1i6SbAo7Q1VH3R0ZoZaJlveAictNN1YIGjS7HobmhYS+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=28G6CgAWeYeqpl5NaOKQ9kGAVHNK7ftmXb5Nhk5+t8I=; b=Fp2wUw8VO5r4v0dgC9j2YkckpPPN+A0HLmHBmXxl7V05gyL66qBCL+a6WPLtfSXeY4OCAD VxeYvs+TayX2PJ9ZnbSy8l+usTynwCZaAgf2sgKDl2Vy5m+f1cv6/AzZ0iyqptZ8Ucb48B R/kmGG/rLWkot1Gbx1o+rfqr3NiTWKLSMjjUwOviqjd2IYpUGh9JCvRmx7opVtqcaFkpsm kEGsudnHK1iWK/fJXQ7ZY1ZkcCYkYEAj8fOoR5nnGAw/8EMYZHtbG7fCpy/UazkWE7VG4N r5NHWF8b13p15Q5SbFQE00QCDB5f3EMTCjYsZ6EzR0GnnCFkjamtn/GXRk3q7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588675; a=rsa-sha256; cv=none; b=i1v9z1Av6Wg1z2zmAWEqthWQQvLPr6BQSOZg7Tc5nbhl0zRmh7gzi5uTavELIZvzKzaY9B 3DqhnYYW7cveNC76dnyLd5QAgGPFSGlxBhIAJf6+1IUYFtYILrGruAC5rnjQhUxhjjB7v3 2EAyXeQkacG5yNmnOBcUogBWkqZD4ErilXuCqViFIrW/EF7RbnV0XrMRP2++wS9L7gKX6o uifj/8P8rROgKiTMf6SKucvMSbV2vc83RWe3zS1/pRh7EA5LGwEWmMU09h7h8n3p6zhLcN 9NO4a/0NRc//beHdHnvr/BWdPMk0z605c6qbPMYXWgBuwu+E+5NnzORTZj0hkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkq0HX9zxyb for ; Wed, 19 Nov 2025 21:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33e5c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: 2c5edd4860b2 - releng/15.0 - nvme: Notify namespace changes better List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 2c5edd4860b2a1912f987557dfa09bae3c322d36 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:35 +0000 Message-Id: <691e3a43.33e5c.30af149a@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2c5edd4860b2a1912f987557dfa09bae3c322d36 commit 2c5edd4860b2a1912f987557dfa09bae3c322d36 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:09 +0000 nvme: Notify namespace changes better When we get a namespace notification, we have to reconstrut the namespace to get the new identification data from the namespace. For each namespace in the AEN, we will reconstrict it before we call the notification. We also flag it as changed for the duration of the change callback (prior versions of the patch needed to keep track, but we no longer do, so this bit may be removed). Note when we've seen the namespace so we can notify when it goes away. Approved by: re (cperciva) Co-authored-by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 20e94950c54e398049396647da36b9e2c3b639c1) (cherry picked from commit fe6ee00d174e0d7f4c7a38db9af7b94c56579054) --- sys/dev/nvme/nvme.h | 7 +++++-- sys/dev/nvme/nvme_ctrlr.c | 12 +++++++++++- sys/dev/nvme/nvme_ns.c | 9 ++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 17c5cdb4db87..8e69c0ffe339 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1930,8 +1930,11 @@ typedef void (*nvme_cons_async_fn_t)(void *, const struct nvme_completion *, typedef void (*nvme_cons_fail_fn_t)(void *); enum nvme_namespace_flags { - NVME_NS_DEALLOCATE_SUPPORTED = 0x1, - NVME_NS_FLUSH_SUPPORTED = 0x2, + NVME_NS_DEALLOCATE_SUPPORTED = 0x01, + NVME_NS_FLUSH_SUPPORTED = 0x02, + NVME_NS_ADDED = 0x04, + NVME_NS_CHANGED = 0x08, + NVME_NS_GONE = 0x10, }; int nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr, diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 07c1bcdfbf08..63b8643d97d7 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1216,10 +1216,20 @@ nvme_ctrlr_aer_task(void *arg, int pending) } else if (aer->log_page_id == NVME_LOG_CHANGED_NAMESPACE) { struct nvme_ns_list *nsl = (struct nvme_ns_list *)aer->log_page_buffer; + struct nvme_controller *ctrlr = aer->ctrlr; + for (int i = 0; i < nitems(nsl->ns) && nsl->ns[i] != 0; i++) { + struct nvme_namespace *ns; + uint32_t id = nsl->ns[i]; + if (nsl->ns[i] > NVME_MAX_NAMESPACES) break; - nvme_notify_ns(aer->ctrlr, nsl->ns[i]); + + ns = &ctrlr->ns[id - 1]; + ns->flags |= NVME_NS_CHANGED; + nvme_ns_construct(ns, id, ctrlr); + nvme_notify_ns(ctrlr, id); + ns->flags &= ~NVME_NS_CHANGED; } } diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index e84d2066930e..21d7965bf7a6 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -78,7 +78,7 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, break; case NVME_PASSTHROUGH_CMD: pt = (struct nvme_pt_command *)arg; - return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, + return (nvme_ctrlr_passthrough_cmd(ctrlr, pt, ns->id, 1 /* is_user_buffer */, 0 /* is_admin_cmd */)); case NVME_GET_NSID: { @@ -557,8 +557,10 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, * standard says the entire id will be zeros, so this is a * cheap way to test for that. */ - if (ns->data.nsze == 0) - return (ENXIO); + if (ns->data.nsze == 0) { + ns->flags |= NVME_NS_GONE; + return ((ns->flags & NVME_NS_ADDED) ? 0 : ENXIO); + } flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); @@ -622,6 +624,7 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, ns->cdev->si_drv2 = make_dev_alias(ns->cdev, "%sns%d", device_get_nameunit(ctrlr->dev), ns->id); ns->cdev->si_flags |= SI_UNMAPPED; + ns->flags |= NVME_NS_ADDED; return (0); } From nobody Wed Nov 19 21:44:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkp3DThz6JJtP for ; Wed, 19 Nov 2025 21:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkp0T0Wz3CVW for ; Wed, 19 Nov 2025 21:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m5+tZv+eCEb2y61I3FFAdqRljNf+SVyb4rgjFSDM6ZM=; b=coaC04TZ3K8jlfmB7eMnAbXbQ9MA8BdSQ6OMbx1vHnl6Knw9iMwPqAU/OEh1bPpCMhGG1Q 9n9f5R7qPSYoW/5x8LMIr6ecUygufl8egdKC9aTNUK3CK2HNI0zNW8nQ0hhIie6rF03MT7 038upaT4JOlC473RQjhMSdi4lDJjPMDx/BKcq0QK+KwJrLQ/NzVmJ/aBT8bXo6b58PBJQx 236R4SpP+9KPPe7zCb/tRwlamoI6ZCfuPlhi3VLtsolJpnNDtR0e8v7QI/Jhd6CwSyJXtR I+CTSCXK5ZyVAOaqBmzjRwWPYvsgHl4CZjTiLRu7qhFmMDZq3XcIPTXuh8PV8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m5+tZv+eCEb2y61I3FFAdqRljNf+SVyb4rgjFSDM6ZM=; b=UKCW91J5sOdRO4fuVjLVCqPLXl+1wv4tGBl9ke3UOJZcrCFygR1on6teohQ1V+EK20rI6l cN7vSTbA6fPpPcKWRAAW7KF2+caGD4zE8oap2GCAjOaZpkMdLCMvt02aDeVcR5vx39XRWZ bng3IX83oxcTN9gA0+w/z/B6Mv4XHWnu1p1KX1w45Vncm19Hk43CoHfF5I6wnHa66LYTu7 7JmnhK1E4dBqEPjF6bXyCvJt0oBrQtiP/oCPKeyKzk1vLIUzQIteGACzIz3MiAlAdWqZcn ZnEMU6LrG6idVMbuHo5etdhGuYaSxzEdbE/UrcN/3xg8E93xZSKxHBA8geQB2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588674; a=rsa-sha256; cv=none; b=aQW7+xJupRPRWRvCq/es2Q9qSPX7sPEOdzhAnd+tqty5H/xi2mEpT9z+pUl4viWakLDKW0 fY/qjsc8j06rsMRhzaIRSF/bLigNO9iydIdROF3p8eZvugRjYX6+8cfcs6KyDnuGwJVpIJ ksmh5/MsPpeWx2QQQkhDg0gBwEsHZwgKFtbm+liEPYGrLowudbTfBC9Lgi4NIGzkqSghdt 9pfLtmteNaN2YZi4Fw0gQzvZ+Nemxjhlo8gqIvktaH26iBsTcEZxTDTVrTDIBzRYYZcT6b ejBRotU4ZJz6gCByujr5nJAr5LG17PHyQvqpOmJ2QRvdiKt4pHYluF5uf0tcvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkn6wk1zxnr for ; Wed, 19 Nov 2025 21:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh From: Colin Percival Subject: git: 7b31e6a121c7 - releng/15.0 - nvme: Fix backwards sense of error condition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 7b31e6a121c788829d5546f6474a250770c1609e Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:33 +0000 Message-Id: <691e3a41.314f0.4db050ad@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7b31e6a121c788829d5546f6474a250770c1609e commit 7b31e6a121c788829d5546f6474a250770c1609e Author: Warner Losh AuthorDate: 2025-11-18 20:07:11 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:05 +0000 nvme: Fix backwards sense of error condition b21e67875bf0c tested for the good condition, not the error condition, so we'd never do anything else in this function. This was causing certain logging not to happen, and also prevented forthcoming namespace size change code from working as well. Approved by: re (cperciva) Fixes: b21e67875bf0c Sponsored by: Netflix (cherry picked from commit 27481c268916b0790c7ad16202a5b012625ce1a8) (cherry picked from commit fd737810a16329449d9ceb1e77e5429fdbb51953) --- sys/dev/nvme/nvme_ctrlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 6ed9cb33f991..07c1bcdfbf08 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1153,7 +1153,7 @@ nvme_ctrlr_aer_task(void *arg, int pending) mtx_sleep(aer, &aer->mtx, PRIBIO, "nvme_pt", 0); mtx_unlock(&aer->mtx); - if (aer->log_page_size != (uint32_t)-1) { + if (aer->log_page_size == (uint32_t)-1) { /* * If the log page fetch for some reason completed with an * error, don't pass log page data to the consumers. In From nobody Wed Nov 19 21:44:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkr5Cb1z6JJwj for ; Wed, 19 Nov 2025 21:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkr1DJSz3CSt for ; Wed, 19 Nov 2025 21:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K7yLCrW6A87SbPTRseU75aJQ+H920CgNhL3UaTtL9hQ=; b=T838uh/0EsKeIOvJrnuZQ62fkk+0uo1HZhqE4PeAitXfKiu5YkwumCi1//JCxxi8YtO675 GZOH1N+TQCo+nMuasFZe+z+c9KKYBVkPJs3F0zqwYDEbjBpkJ4vd/0sbMeYbzy62KKnfKI COVqE+kVv38D4YcOCg/E0/1C5SnZyjemsO/mCQhInC8XfnDVdqUZfIE+pMe1E2pPBiBRQZ DHnZ6V5if+svvHEoQTh7/kjIsJ2/JlYC7ZTDIZDlvWvox/KpFG+Zj+6k1oZejfKbcCt6lS ixtA8B3HugeV3AWF2igxdZQOOUA3uB/EDqSqKiXlmgv8ONNcL8YG05QWlyOAig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K7yLCrW6A87SbPTRseU75aJQ+H920CgNhL3UaTtL9hQ=; b=vz75qanxuJFnw/HV8w9aid5WlAxYrqQhro8VpACCWap3K/jKjGgMCEwxH+17jVRvAhTjtf ssq22MtJ5WWehZ9PbRZE6I3VWfK15CBT0Shgo1Kvl2yC73OLqb2PqItY7GVrkfRDjMMW9J unL4DgRkEa1w0b3OpYb6LhmlswoRRnKFW7719+oiSaIqjsI0Zo8w9uFAihhhRtImXQUzI/ daFrMHjbqsxFnJpE8MU8Cn1jfs9T8KH8wT3NwY1lusvKsPCxe84hJrhr5FnnRkbThURop0 wB0Qr65pDZNSsKhCX5vuLlEPi5xu45p/Ph8nzBr2JP+wdFYCXJ7sDi3sazlAlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588676; a=rsa-sha256; cv=none; b=tOvIlQacdwthpuB2TE37TG4p7Sr+4p8SHpwZv+eVABhVHfiYHEbxl2m3KF0x2Op49LNPQa 3no5Zi7KtOWV4SGcf+wG1rzuCTzxHAQe8kaRRYuuk6XqFLFzf/Z+Q6fgrf/tFLJpoYF2W0 pcFzme+taM0MK7hqvDKYxdMO4ij+Ro3s5R7FMPi2PN7Dyklgr+850BYg11ng8/mOX3Y9qH aroxR35SMjhvEUkqCZxtFzLFT1g2kA9EE0hY0xgt+hzx6i8tK8UCrkkIZc5kbH3S3l0tV4 XsZZD1NDtx1WZBOOY8tS1ttyYOi181tGkbYazd2o4rBD0rcs6rnCChTIDd6cDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkr0k0lzxyc for ; Wed, 19 Nov 2025 21:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 338a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: 0ccc71de6284 - releng/15.0 - nvme: Refactor geom setting to function. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 0ccc71de62848366446a86487d36983146609605 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:36 +0000 Message-Id: <691e3a44.338a1.32b68dfa@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0ccc71de62848366446a86487d36983146609605 commit 0ccc71de62848366446a86487d36983146609605 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:12 +0000 nvme: Refactor geom setting to function. Refactor setting of geometry for the disk to its own function. No functional changes. Approved by: re (cperciva) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit dffd882d12d2a71aca464f48209ec9ae6f393b15) (cherry picked from commit 31412fda9fa71d85a19604151d662ac65c301c2a) --- sys/cam/nvme/nvme_da.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 1c0d5e8381d8..330f4ca66e1e 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -643,6 +643,35 @@ ndacleanup(struct cam_periph *periph) cam_periph_lock(periph); } +static void +ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) +{ + struct disk *disk = softc->disk; + struct ccb_pathinq cpi; + const struct nvme_namespace_data *nsd; + const struct nvme_controller_data *cd; + uint8_t flbas_fmt, lbads, vwc_present; + + nsd = nvme_get_identify_ns(periph); + cd = nvme_get_identify_cntrl(periph); + + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); + disk->d_sectorsize = 1 << lbads; + disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); + disk->d_delmaxsize = disk->d_mediasize; + disk->d_flags = DISKFLAG_DIRECT_COMPLETION; + if (nvme_ctrlr_has_dataset_mgmt(cd)) + disk->d_flags |= DISKFLAG_CANDELETE; + vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); + if (vwc_present) + disk->d_flags |= DISKFLAG_CANFLUSHCACHE; + if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { + disk->d_flags |= DISKFLAG_UNMAPPED_BIO; + softc->unmappedio = 1; + } +} + static void ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) @@ -846,7 +875,6 @@ ndaregister(struct cam_periph *periph, void *arg) const struct nvme_namespace_data *nsd; const struct nvme_controller_data *cd; char announce_buf[80]; - uint8_t flbas_fmt, lbads, vwc_present; u_int maxio; int quirks; @@ -903,21 +931,8 @@ ndaregister(struct cam_periph *periph, void *arg) else if (maxio > maxphys) maxio = maxphys; /* for safety */ disk->d_maxsize = maxio; - flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); - lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); - disk->d_sectorsize = 1 << lbads; - disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); - disk->d_delmaxsize = disk->d_mediasize; - disk->d_flags = DISKFLAG_DIRECT_COMPLETION; - if (nvme_ctrlr_has_dataset_mgmt(cd)) - disk->d_flags |= DISKFLAG_CANDELETE; - vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); - if (vwc_present) - disk->d_flags |= DISKFLAG_CANFLUSHCACHE; - if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { - disk->d_flags |= DISKFLAG_UNMAPPED_BIO; - softc->unmappedio = 1; - } + ndasetgeom(softc, periph); + /* * d_ident and d_descr are both far bigger than the length of either * the serial or model number strings. From nobody Wed Nov 19 21:44:37 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZks5sL5z6JK3C for ; Wed, 19 Nov 2025 21:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZks21FWz3CHs for ; Wed, 19 Nov 2025 21:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zH65J3yC0vTCgxFVLwqYm2fXKpPSod6HwbeVvz90KQU=; b=q1v/VVwogI5+pNGRhdTAd8YZ3lEecJpBLdTg8Nimj6O5TIy/zuepFpXKUyw6rcBlu2ifQf mYSE5RrvX7bxkraCAlSjUejMPp7gEMHjBU2WImKhej+xIWYpP05SF5hNn1bI6uMed9OWF1 tUWEXY73s2SUEVpFTdhVq+7kFeGJ56koCiS/AnUPVeGuDzeSLifDp8kIC5fr0KkJucqAq4 j1KNcC5Lrpt14OuauiymYiw2MMfaISyrRNWDpejKtw1O4oFpulD3G4OqkxBbFfjJOLtwd0 +dD60OblX8fUoGsZzzpjsCu+fdQSGDJ9p5fYNLwpgsGMbCID9euNG2KrYhmWgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zH65J3yC0vTCgxFVLwqYm2fXKpPSod6HwbeVvz90KQU=; b=PfNJ5d77vxIlv6zrbHOnUiGfy7o5nnpzBiOSYJs9IKl8lWFejiVngQI3cqdlGXsGQBAn+S lKWQXcFpP952rZXHcUSoI4kv4uUsGLqDONHEs+vKTwI9HHM4mStE6tZ6zavXgk9sivpv27 qppYqTRjYOyluelBZq1AsYwHRUxhE3Q495BGXlUbA441ZCZlOCbU9Z7+NgWshtsV6w0Z29 do8q66FRzHGSdCv6gvVdPJAmuRDz2f9OCr+HcdhsuxnJvWdocLF+EokBuUU6Y5YmTle8ud fi9huGPRohgaub3FHdPZL1L+Y+BpdTAlrlONBot5H7LO8qhj0uAAik799EBesQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588677; a=rsa-sha256; cv=none; b=uPwcoDuPb2us/pTflYKW0G4Uv4qGo5Iv85rwa+LDHNr1nCjqmlBzEuG64S+btn2EA42zrc cRKuknILZNmUZ/6oVZQfypmRpMJBevNAd/7uhStjesiutyHqUOJU0sMOy5JWBlY3AkyUGm HHcthLOSwVPfmQdTGu7N8O1v+dvgg6jQkEX3Zc+cqZ1nSXCJKqtH2yr4FmyM3/CMyHJ8OA qRjpg7Zva45hGSoMbfOcKZ15EuGAYHb498cCVVCj4fSXAOFhc+r0LRo1EHmQFR+eMRstmS e9o85PUBhAneX2datDfo9nQoAC295gUTXlNn3UKUtT3NDskcw2+PhdhEF3cL5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZks1FJvzxm4 for ; Wed, 19 Nov 2025 21:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: ecfb0e51b212 - releng/15.0 - nda: React to namespace change events List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: ecfb0e51b21259a679519d666dbdb52e9b18c539 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:37 +0000 Message-Id: <691e3a45.33c7b.3ddda341@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ecfb0e51b21259a679519d666dbdb52e9b18c539 commit ecfb0e51b21259a679519d666dbdb52e9b18c539 Author: Wanpeng Qian AuthorDate: 2025-11-18 15:24:23 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:15 +0000 nda: React to namespace change events Register for AC_GETDEV_CHANGED. When we receive a namespace notification, we only create a new device if it was unconfigured. If it was configured, generate this async event. Rely on the fact that we reconstruct namespace to just get the data from the identify data and call disk_resised. Approved by: re (cperciva) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 86d3ec359a56d1b5d015718bd19ef4bda681a032) (cherry picked from commit 9a465b37ea17642d45597d4ee7d3283b02dfa6f0) --- sys/cam/nvme/nvme_da.c | 29 ++++++++++++++++++++--------- sys/cam/nvme/nvme_xpt.c | 2 ++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 330f4ca66e1e..2eb43809f4b1 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -673,12 +673,11 @@ ndasetgeom(struct nda_softc *softc, struct cam_periph *periph) } static void -ndaasync(void *callback_arg, uint32_t code, - struct cam_path *path, void *arg) +ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) { - struct cam_periph *periph; + struct cam_periph *periph = callback_arg; + struct nda_softc *softc; - periph = (struct cam_periph *)callback_arg; switch (code) { case AC_FOUND_DEVICE: { @@ -709,17 +708,29 @@ ndaasync(void *callback_arg, uint32_t code, "due to status 0x%x\n", status); break; } + case AC_GETDEV_CHANGED: + { + int error; + + softc = periph->softc; + ndasetgeom(softc, periph); + error = disk_resize(softc->disk, M_NOWAIT); + if (error != 0) { + xpt_print(periph->path, "disk_resize(9) failed, error = %d\n", error); + break; + } + break; + + } case AC_ADVINFO_CHANGED: { uintptr_t buftype; + softc = periph->softc; buftype = (uintptr_t)arg; if (buftype == CDAI_TYPE_PHYS_PATH) { - struct nda_softc *softc; - - softc = periph->softc; disk_attr_changed(softc->disk, "GEOM::physpath", - M_NOWAIT); + M_NOWAIT); } break; } @@ -997,7 +1008,7 @@ ndaregister(struct cam_periph *periph, void *arg) * Register for device going away and info about the drive * changing (though with NVMe, it can't) */ - xpt_register_async(AC_LOST_DEVICE | AC_ADVINFO_CHANGED, + xpt_register_async(AC_LOST_DEVICE | AC_ADVINFO_CHANGED | AC_GETDEV_CHANGED, ndaasync, periph, periph->path); softc->state = NDA_STATE_NORMAL; diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index f6667df07be0..c22d5fed350c 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -463,6 +463,8 @@ device_fail: if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; xpt_action(done_ccb); xpt_async(AC_FOUND_DEVICE, path, done_ccb); + } else { + xpt_async(AC_GETDEV_CHANGED, path, NULL); } NVME_PROBE_SET_ACTION(softc, NVME_PROBE_DONE); break; From nobody Wed Nov 19 21:44:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkt72dfz6JKFZ for ; Wed, 19 Nov 2025 21:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkt3VfJz3CWL for ; Wed, 19 Nov 2025 21:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z54zxsIVPhz7NJP4dvMlkL+4dBzV4tf3GzaXBlMrPLQ=; b=do4X4NT/n3Qth7z4W/T8DgezRfxIzdmhecaJUIanI/lcaOSQy2fysA/P0QrIvbLUGDI011 Ca99gnl8QgNCesD8a/Q54gXo8FYRHMcMlWComh2YYmbechlJI4vyI/Swry3rtBXbpB3fqf +BlF7VDZqyefU3kq+PW6W8ACRKVGUCP3xZBB41/ZRHh047Jg/4y0vSrPPrynC7PNAgB1HO kuEvhDL8lSqA91tfwF7eRu89LhmZjHlBRkJVLqxBQnSVO877ZZsH3vsyOeuRbMyX/SUjIE eVd3RiB398wopBd4EV9tRYc0628gOv8yx+P5QfSWaYHa1AVWCGz3WwjJodVYwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z54zxsIVPhz7NJP4dvMlkL+4dBzV4tf3GzaXBlMrPLQ=; b=ewpbDutCvFK5OZyqAyf2J2XaBmdAC//ryq+X8ZP5qC1ftPDStDcFPaj3Qh6bCKhTCnB5pc 1EV1DkIs7cYlWRhdfboP743IonYq8dBiSfC4BsyAGL2+61FHx4bPWr4JqmF+Mis9Ed6WuE NLqjbuQEGSOG1w4BLuxTOt/SgOuO5O1LW3syJfQjq0C8K0t/i9A9s2830rNU5Y8jgi8kQX gLCYuJnqrqenAuiWpzW+rJ9ZL4lcH4xpGVDqVPGdsEYeEU/fd+IvAG+VM6pfQffJkV+r3q YX1MdEV03XOOgTo2LX96FSt43pVChdC/IgmaVHAKNL9b/csDA3dRl73M3aJ3NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588678; a=rsa-sha256; cv=none; b=OmO5szBShxvzYqATFV6ZpIKvhZg+rfsi3cSnDP2xrtdJegYIgW2FWHYS4hE8X8vCd4Vlz9 OXgrbfjrEDGeBSgAsY5VsdgMWtnZfQV+qAK550JLlEA29FMo6R/G1eusnEJdXPdFYjIzHk /pPDBDXSfvnxGt19RVG1mB0+p+QZAyQQP8rMPAVbVw5reopK9UztAEXBtjulVyYYfZCN3k EFDrMOfxUqCtjCSAjkVtlPtGWGU5AY/CQjm7eCdSiBzFvMJlTKLEFaDbr77zDSCIaOKxlc 3VuKghKXJU7iccFJOI/0wsJus3uDap5KIuARFiAVFCku75TiN/ZzYZIaFnTXcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkt2mPczxnv for ; Wed, 19 Nov 2025 21:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: da71efa95d34 - releng/15.0 - nvd: handle namespace changes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: da71efa95d340ca6625a9b1cd9a8ceb6cd199daa Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:38 +0000 Message-Id: <691e3a46.314f5.5ffe55b9@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=da71efa95d340ca6625a9b1cd9a8ceb6cd199daa commit da71efa95d340ca6625a9b1cd9a8ceb6cd199daa Author: Wanpeng Qian AuthorDate: 2025-11-18 17:24:13 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:19 +0000 nvd: handle namespace changes Signal the new media size when the namespace changes size. Approved by: re (cperciva) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit bd769e73d8f1d5141b1c2eb2322b4c6caed5d9e0) (cherry picked from commit 96a7ed1e7fb41df17e783503371533cc8db98540) --- sys/dev/nvd/nvd.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c index 33b43efd24c1..4737b2b03ae9 100644 --- a/sys/dev/nvd/nvd.c +++ b/sys/dev/nvd/nvd.c @@ -61,6 +61,7 @@ static void nvd_done(void *arg, const struct nvme_completion *cpl); static void nvd_gone(struct nvd_disk *ndisk); static void *nvd_new_disk(struct nvme_namespace *ns, void *ctrlr); +static void *nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr); static void *nvd_new_controller(struct nvme_controller *ctrlr); static void nvd_controller_fail(void *ctrlr); @@ -154,7 +155,7 @@ nvd_load(void) TAILQ_INIT(&ctrlr_head); TAILQ_INIT(&disk_head); - consumer_handle = nvme_register_consumer(nvd_new_disk, + consumer_handle = nvme_register_consumer(nvd_ns_changed, nvd_new_controller, NULL, nvd_controller_fail); return (consumer_handle != NULL ? 0 : -1); @@ -512,6 +513,48 @@ nvd_new_disk(struct nvme_namespace *ns, void *ctrlr_arg) return (ndisk); } +static void +nvd_resize(struct nvd_disk *ndisk) +{ + struct disk *disk = ndisk->disk; + struct nvme_namespace *ns = ndisk->ns; + + disk->d_sectorsize = nvme_ns_get_sector_size(ns); + disk->d_mediasize = (off_t)nvme_ns_get_size(ns); + disk->d_maxsize = nvme_ns_get_max_io_xfer_size(ns); + disk->d_delmaxsize = (off_t)nvme_ns_get_size(ns); + if (disk->d_delmaxsize > nvd_delete_max) + disk->d_delmaxsize = nvd_delete_max; + + disk_resize(disk, M_NOWAIT); + + printf(NVD_STR"%u: NVMe namespace resized\n", ndisk->unit); + printf(NVD_STR"%u: %juMB (%ju %u byte sectors)\n", disk->d_unit, + (uintmax_t)disk->d_mediasize / (1024*1024), + (uintmax_t)disk->d_mediasize / disk->d_sectorsize, + disk->d_sectorsize); +} + +static void * +nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr_arg) +{ + struct nvd_disk *ndisk; + struct nvd_controller *ctrlr = ctrlr_arg; + + if ((ns->flags & NVME_NS_CHANGED) == 0) + return (nvd_new_disk(ns, ctrlr_arg)); + + mtx_lock(&nvd_lock); + TAILQ_FOREACH(ndisk, &ctrlr->disk_head, ctrlr_tailq) { + if (ndisk->ns->id != ns->id) + continue; + nvd_resize(ndisk); + break; + } + mtx_unlock(&nvd_lock); + return (ctrlr_arg); +} + static void nvd_controller_fail(void *ctrlr_arg) { From nobody Wed Nov 19 21:44:39 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkv6g2Jz6JKLW for ; Wed, 19 Nov 2025 21:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkv3mRNz3CL5 for ; Wed, 19 Nov 2025 21:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ogsko3CcNGWqtaVWV+v0a5PmF+F4AYRZXYjGWH30KzM=; b=ogjgXkIr5ZnVrqTL8iHR4r5jgHSalmlbqNCtKolqwuNJ0DmMarSBMGvBc3zBLMsw8l9PAm BvlDXUcU+n3bUQYbrXllpAJswUeaRz5HDcWMAIDHVk+bDbmQR2v9lwZfCkxls7loZthWUc gzXDUxIPsO9/dUna2tofZYwfPVPXiEn9aJQh8X+giVovA26gSgbRk8MzphFemy1yqJknxG G2QgybFBRg2IVDhdbZIYRLWOQfzRHE8nRN4VHECB7VhNESz2QSi2YfdhiNF3R4VypP9KFp eARd0vI+Ml59HoLq7j83TXraNmuG07nSmBhoO6ZMPHAWdwJW9OyNeiHpmfS6LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ogsko3CcNGWqtaVWV+v0a5PmF+F4AYRZXYjGWH30KzM=; b=PEyyjBjBVpqRif7wR+3LIpTQshqFuLaAiLmwX47Aw++99vloHkFswbiVH3xeRn8xtTlgMJ gw7faSMcRpvmQT8bgSM4h5f0g9exWGQovOmz3Es7QF27i22NXU4xsHccDynYEW3IIytkmd 4EMi2aS26owE4PxTAhGTa5x+stO/oZ9HALl6Qc+3AbaQG7zYMIIvWWdvpnI48d6abogU1f VaJ4PJGeV3Dgg4neoVdae8yCs9qCp0fsjSrj8G1MH5YXThp/xRWC+ooeUzVOKQlja9byWr scZtrmQt4tY6pW1ZcJ7d/hniEiEyZ7yQjQ9vjaPWm0TrRweVkvwfWoLpODRR6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588679; a=rsa-sha256; cv=none; b=grCtExOdnaFSdmCTNFk8YIuqJoDZEcDjAy8rrq952M+ngBI3BxitCsF3Dg8ikcPxw5DKqY h3tffbmjmh1WGseGqJjnoLC+JQTcl2rlSZJdjLBpFb6ilbvTB7KGgTaHwMw1U6U9taIWu7 OD58LxyJ/vcc/C9nHq/+UQq0S+OZEYeYUzgO8zdjtD94WgsEwurXflHwA2fF/PtUJ1ZyYz tnGc7jbEzbhTwW8QvsajyT/DUnKqG3JStviys2P67RL/xkT7UH49G7ZxtaUcn8fGX9s0B7 sTYBtY13ynH1rKThg7dwUxUkUBaOYn+BgvF75u5th4QcSP5EHaBtSguJtkUNww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkv31sGzxm6 for ; Wed, 19 Nov 2025 21:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33542 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wanpeng Qian From: Colin Percival Subject: git: e4416d1e95c4 - releng/15.0 - nvme_sim: signal namespace depature List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: e4416d1e95c40b772dbb6889f468538f4ea9f711 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:39 +0000 Message-Id: <691e3a47.33542.8fca695@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e4416d1e95c40b772dbb6889f468538f4ea9f711 commit e4416d1e95c40b772dbb6889f468538f4ea9f711 Author: Wanpeng Qian AuthorDate: 2025-11-18 17:24:13 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:21 +0000 nvme_sim: signal namespace depature Signal when the namespace is gone so we can tear down the disk when a nvme drive is removed. Approved by: re (cperciva) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33032 (cherry picked from commit 4640f5008922c5b189d2f7b63edf73300277e6df) (cherry picked from commit b7ffac04541f98d3d8c6078092d59f0fed88b1ef) --- sys/dev/nvme/nvme_sim.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index a06774a64761..f7fd0cee931b 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -352,25 +352,35 @@ static void * nvme_sim_ns_change(struct nvme_namespace *ns, void *sc_arg) { struct nvme_sim_softc *sc = sc_arg; + struct cam_path *tmppath; union ccb *ccb; + if (xpt_create_path(&tmppath, /*periph*/NULL, + cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { + printf("unable to create path for rescan\n"); + return (NULL); + } + /* + * If it's gone, then signal that and leave. + */ + if (ns->flags & NVME_NS_GONE) { + xpt_async(AC_LOST_DEVICE, tmppath, NULL); + xpt_free_path(tmppath); + return (sc_arg); + } + ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) { printf("unable to alloc CCB for rescan\n"); return (NULL); } + ccb->ccb_h.path = tmppath; /* - * We map the NVMe namespace idea onto the CAM unit LUN. For - * each new namespace, we create a new CAM path for it. We then - * rescan the path to get it to enumerate. + * We map the NVMe namespace idea onto the CAM unit LUN. For each new + * namespace, scan or rescan the path to enumerate it. tmppath freed at + * end of scan. */ - if (xpt_create_path(&ccb->ccb_h.path, /*periph*/NULL, - cam_sim_path(sc->s_sim), 0, ns->id) != CAM_REQ_CMP) { - printf("unable to create path for rescan\n"); - xpt_free_ccb(ccb); - return (NULL); - } xpt_rescan(ccb); return (sc_arg); From nobody Wed Nov 19 21:44:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkw5tTYz6JKFc for ; Wed, 19 Nov 2025 21:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBZkw4GvNz3CP8 for ; Wed, 19 Nov 2025 21:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SioJb4825MdOu7OKnmKdN+S3TY91FGBtWlV2q72cdqw=; b=jVLdsI5k0bZqnqY0Co9k9I2vPy6vXwgRRIHfXY0rGWzjgH4RCQM7yXyQ+wu2aO2U3LQwhe IRLW4fCSSjG7LdnuFSkj/PWTQFbQeUX2XeXCbJl3n0cv7T+bjwRl4hKCMS5CGeCxOiBShs q4VCPUDwcaJjn71v+3gASDfUQ26WWOuJHNpal0ud8d5prlAjy9dDZmytjhf3fiUn7BV6HQ s9LwdGfBz6g8xMYY6TcpallgvC6Arlnj4xFNXzGbAM3t/8tXwYdKwvOWzHIDmFSwPD+W3w 6zHOCUNGCMBgc0oCwTmN+2OwpOvRiBDzQjR1CllhsM6abXgKB32saze4nCt3hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SioJb4825MdOu7OKnmKdN+S3TY91FGBtWlV2q72cdqw=; b=a747vDm6IIaopdDGM5YshVzbEQIZZ3oEWyqnyyrq7MRb1kFS6MFQQsGfxNXG1SixyxPSn6 PPKYwaBmA8oRHipoq4vHpzNdb51fO9x8yxULGftpYSYSwhjUKu6kLPaZAYXrZ2+vy/GY/9 PME4qfsqL8AmR/+pQRY3FeQQmwAQ6B1DIzkva/lPWKHu4mwxrHPPpor/3QnD6ThRDHx90G Z3IdZh8SD8HSjn2CbNS4ICjF9k6v4UDuv4XZQozeV8hezUzXgEDMz6Ydj9Bayus7L37KPN dr1CMtjtNoB49q90Urwn9eWwbK+9QXLBZMKHeGc1l1GbjtYEFxmA2TYT7WgryA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588680; a=rsa-sha256; cv=none; b=BMjlODTHCGVUnBcuKMF6aEPjGWUF01x0ESYhZ7/FCsnAeFTwzNeCztRxAILRPIlUcFpqX3 rOS84y7Aph8ooh2i2tER3kPwv+Y9HDkspBSY2WjWtIInYLZgnRXobEn650HoqUcGoMPok4 RTo7YAYEnLY0VipUmvub0o7QiUG4CVSOjqdDK1Q4sCgjln7wBJmwMkm0sy8gZQuwhnhait ISdrycxBZSZ+AmKxGnxYh4c/ZxC93K0uRMTEnKJWGkH0TkKfUQSEQUc523iVFKIPRSnIJ0 mfsw8JG/1sjKPUFLdYyeIKX6kCXR28jtIKsfv97JaW9TsZlbOwXbgz9qIJGh+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBZkw3n9tzyFH for ; Wed, 19 Nov 2025 21:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3185d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 07b7bd2311af - releng/15.0 - release: Remove KDE from dvd1.iso List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 07b7bd2311aff496b73f9552a5b3d8019685ef01 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:40 +0000 Message-Id: <691e3a48.3185d.3866c2a0@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=07b7bd2311aff496b73f9552a5b3d8019685ef01 commit 07b7bd2311aff496b73f9552a5b3d8019685ef01 Author: Colin Percival AuthorDate: 2025-11-18 05:41:47 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:24 +0000 release: Remove KDE from dvd1.iso Prior to this commit, we were shipping 2155 MB of packages (from the ports tree, not counting pkgbase) on dvd1.iso. Due to the amount of space required by shipping pkgbase packages *and* distribution sets on the DVD images, we only have 1696 MB available if we want to fit into the 4.7 GB limit for DVDs. Many users have indicated that this is indeed important. It is practically impossible to hit this target without removing KDE; while KDE and its dependencies narrowly fit (1550 MB), we exceed the limit as soon as we include either of freebsd-doc-all or gnome. While we would pick KDE over GNOME (surveys regularly indicate that KDE is the more widely used of the two), we believe that documentation is the most important thing to include. Since removing KDE leaves a bit of extra space, add editors/emacs and editors/vim. This takes the 15.0 amd64 dvd1.iso up to 4.689 GB. [1] Approved by: re (cperciva) Requested by: adamw [1] MFC after: immediately (for 15.0-RC3) Differential Revision: https://reviews.freebsd.org/D53800 (cherry picked from commit 6cc6beb4c889a049170d0aeaa9c88b9093776d6e) (cherry picked from commit 142df248ac06bd255f5aa63a5544626bb502c656) --- release/scripts/pkg-stage.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 6d460a83e1da..083b1baa3358 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -15,6 +15,8 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES=" devel/git@lite +editors/emacs +editors/vim misc/freebsd-doc-all net/mpd5 net/rsync @@ -29,7 +31,6 @@ sysutils/tmux www/firefox www/links x11/gnome -x11/kde x11/sddm x11/xorg x11-wm/sway From nobody Thu Nov 20 02:48:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBjTf4N3nz6Gm0P for ; Thu, 20 Nov 2025 02:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBjTf3Hfrz3sPm for ; Thu, 20 Nov 2025 02:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763606918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sq28osGepoy80fwYNl3/IlITO/gtnPvpCHogEAY1A40=; b=JrDXZJmaPxUS8TDCOSXoOq900MDSZOv9PVHINa1fIMY8iJSGED//dB5TFG3SDj2U0UO7S6 2dsEhZEfs48EjS9gZILGFzJ4pY0QK4k4BU7vIIJF/JAv/jYwyNhrZ3MUY+oghlKL6AkOi0 EFQFV226xNAP+D6aH+n/qSU5P5mLntcAOpjSoZFdmKSG8fbDAmOgnDLufgEVZx91+57LrW wbg/cGjLq0Atnnz+Drhe3NK3WXFHgJB+kXIQLxoYHh4ACHOW9VcgcdxhPSV0jUcjKlckyC EspQv/a3x3l1zJmcFDwMpDLdulantLJp29QTEMqvUv2QKZk+rmpnd2HDOgkl4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763606918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sq28osGepoy80fwYNl3/IlITO/gtnPvpCHogEAY1A40=; b=Mk7+2F79QbODuhNNJd+X2mWHST0HsgQgresbQc+2erymCa2c148mlkmFr8mY/tscW/Em5U i+oLFKSWLBr0ryYZ4lmjUfbffs4taXD0DO28N9qglqvlQ4KRPEoq7v0BZ2t9IxRNZRiXce hQmS7qEJqU+z6+b1iawarNQBn89PmC05IbXPjB1k+YdJCWKtcmi0W172Vpry+LhVYyJxFk xNKRo1GjSK8L4aMSOFQ5GoPBY3MMFjmfyFVncDUuECAw+mOuOjhnSVzmgECfL2PF9sK6BI kf8k5MwUgCtJeeeAJg8qhgbVwuUeWB0wrkrLlHik4LMDfaFoAXxIL6j/64gO7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763606918; a=rsa-sha256; cv=none; b=lI5XBLPJwLi2vHeSnMvQdnHYrTNZUMzoOITKLkld2FqE80wnLctTPBISH5iGGZ0RS3UQzK 95dL1YXw75gK4iRgkb6xW/JpH22waTFueEqc7PBtKUl1ArWUrf1uVyhHt4cogzPEHYHJVN 1BRQ0yMwGWoUwyaKAtfk40MQIFipi6VW3lNj9cl9yLkeCeU0vTpbtcrYxCdp537RRBfLgT 6w0ztGynJ+Wvwm7NWQrmpEhaijFSyjrhd2iItf9zIO8rmxxitEBYlTybz6MihHFSnqxE3+ VWZaEmmqp6x8a1uBZm+J2vPOaKN9WbrhPXU0jWGsEx+l0xz126hYffEjSIqjlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBjTf2nkHz16G0 for ; Thu, 20 Nov 2025 02:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 330a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 02:48:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d653eca0ef88 - stable/15 - freebsd-update: Add some diagnositic information for a failure case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d653eca0ef889a8e3fa1e370d2b3ce7b031441a2 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 02:48:38 +0000 Message-Id: <691e8186.330a1.3d50439a@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d653eca0ef889a8e3fa1e370d2b3ce7b031441a2 commit d653eca0ef889a8e3fa1e370d2b3ce7b031441a2 Author: Ed Maste AuthorDate: 2025-08-28 16:04:06 +0000 Commit: Ed Maste CommitDate: 2025-11-20 02:48:04 +0000 freebsd-update: Add some diagnositic information for a failure case Users report freebsd-update failing with "The update metadata index is correctly signed, but failed an integrity check." Add a hint at which of the cases is failing to help track down the issue. PR: 264205 Reviewed by: dch Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52222 (cherry picked from commit af4ba95daf75cf1b1624dd57038cfaa3ed2753e7) --- usr.sbin/freebsd-update/freebsd-update.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 23f1106e3bde..2f2afa38f553 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1402,7 +1402,7 @@ fetch_metadata_index () { fetch_metadata_bogus () { echo echo "The update metadata$1 is correctly signed, but" - echo "failed an integrity check." + echo "failed an integrity check ($2)." echo "Cowardly refusing to proceed any further." return 1 } @@ -1413,7 +1413,7 @@ fetch_metadata_index_merge () { for METAFILE in $@; do if [ `grep -E "^${METAFILE}\|" ${TINDEXHASH} | wc -l` \ -ne 1 ]; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "${METAFILE} count not 1" return 1 fi @@ -1436,7 +1436,7 @@ fetch_metadata_index_merge () { # specifically grepped out of ${TINDEXHASH}. fetch_metadata_index_sanity () { if grep -qvE '^[0-9A-Z.-]+\|[0-9a-f]{64}$' tINDEX.new; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "unexpected entry in tINDEX.new" return 1 fi } @@ -1453,7 +1453,7 @@ fetch_metadata_sanity () { # Check that the first four fields make sense. if gunzip -c < files/$1.gz | grep -qvE "^[a-z]+\|[0-9a-z-]+\|${P}+\|[fdL-]\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid initial fields" return 1 fi @@ -1464,28 +1464,28 @@ fetch_metadata_sanity () { # Sanity check entries with type 'f' if grep -E '^f' sanitycheck.tmp | grep -qvE "^f\|${M}\|${H}\|${P}*\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type f entry" return 1 fi # Sanity check entries with type 'd' if grep -E '^d' sanitycheck.tmp | grep -qvE "^d\|${M}\|\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type d entry" return 1 fi # Sanity check entries with type 'L' if grep -E '^L' sanitycheck.tmp | grep -qvE "^L\|${M}\|${P}*\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type L entry" return 1 fi # Sanity check entries with type '-' if grep -E '^-' sanitycheck.tmp | grep -qvE "^-\|\|\|\|\|\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type - entry" return 1 fi From nobody Thu Nov 20 11:23:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvH6ShWz6HDCs for ; Thu, 20 Nov 2025 11:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBwvH4nkNz3kHv for ; Thu, 20 Nov 2025 11:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/s5PX05zVn5oh+sr2UObWdpkNrUO947iDnC2/uLyarc=; b=Yr7FvtK2EHHY0HXqeGZPYIHuyrE8vKrDCj89//cWLcyyakJ98GYcDEc0YaupsGW5AmE8sy lreIsGhlIU6BF56uS9YoiHiRpSNqpaiSaFXCI9p77AyIZ9J5HwwrXhuqoLt8wPEyvhwLK3 fuz0ZZV3jtmSxOY51JlHpWymst1wKenUcaa0GSnX4QYtO3GPneRFlEB2ilcnUB/OJSsW8z 0xAXGvNqVYzVQJpyxFSc3kGFek4RrQC0q4rXuLegMTaPtr+a8avMjWxEbmJ1nskV+WS0NQ KS3a8DzirsKf4rEHhVyzoqLXy6JO49uCM1AowLfXrHuowmsZ731RzULBgTcRuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/s5PX05zVn5oh+sr2UObWdpkNrUO947iDnC2/uLyarc=; b=AN58HNA9HKCC2W37SWhUHB321+j/KDYp0U42iOKc/YwyWwNID4M9/+Zk5TdiFhPhxoSNMH ksGlMFGmpvlzFowGBPwzwOo14jy0EKYk2UTxaVqIEVRZFm/48bj6O0eVH7Y8+4EjUydJ3M V360VOyrbvXtPFFr8BTmDPygaNv3Fyctw9DPROlSjquiZQR7GTYu2VA3nzIu0Xp98ePZNA 9KaErubzDGy0bIOIB9iE6x7LjDaff0EXyR8s/BYI928IlCiKXUNohboELP+Aeq+ZSsl9zZ mQjC54LrPpnwFJi0AqaXzdnVhZPeNzuTd/z4Ekx3COQb1UdmPK7rgC0NNHC9lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763637787; a=rsa-sha256; cv=none; b=IQs7Ib/REry4NuekexZhIkWWEgqJRnWRh0dk4KKG65RsWtUSJTGTMQDWfaN73mAYABoZLe cPeIEllHx2QZdj/3CaTIZH3uuBE0n6NBOCNXKSz+6SI8C/VyaHSzUAhNBILUdrSiyC6L7V bP/wfnvBb0vFuHQIxne1GTFa5l/49w3CS879ba5UhQNFXDyecMrPG7oCxGQKxJ+Z9/bxyR ErB9aQQNmO5jWKzZItn+1/+GtxCsTyLoBY96A32sE+QDqjpjuWyOqgXBZ8lFuYF4BT4wlc lFyMuQJUxXytp9DeQHvhHCpaCvwWP7YyDAvo5bzqW4AkN0z4hQXitbHnQrDJpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvH4LgLz8fY for ; Thu, 20 Nov 2025 11:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e79b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 11:23:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b94750f60552 - stable/15 - iwx.4: Fix SYNOPSIS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b94750f6055250d1e2a0a9406e8eae8f16883803 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 11:23:07 +0000 Message-Id: <691efa1b.e79b.2c704bab@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b94750f6055250d1e2a0a9406e8eae8f16883803 commit b94750f6055250d1e2a0a9406e8eae8f16883803 Author: Alexander Ziaee AuthorDate: 2025-11-14 15:04:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-20 11:22:34 +0000 iwx.4: Fix SYNOPSIS PR: 290812 MFC after: 3 days Fixes: 27c41b28b1d7 (iwx.4: Initial manual page) Reported by: Dimitry Lukhtionov (cherry picked from commit b0c1ead2b9be0f6aa5a715d849b9ca7af093b513) --- share/man/man4/iwx.4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/share/man/man4/iwx.4 b/share/man/man4/iwx.4 index 295a5f318afa..e57ddbc7c980 100644 --- a/share/man/man4/iwx.4 +++ b/share/man/man4/iwx.4 @@ -17,14 +17,13 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd May 2, 2025 +.Dd November 14, 2025 .Dt IWX 4 amd64 .Os .Sh NAME .Nm iwx .Nd Intel WiFi 6 IEEE 802.11ax wireless network driver .Sh SYNOPSIS -.Cd device iwx .Cd device wlan .Pp In From nobody Thu Nov 20 11:23:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvF4vfDz6HD6t for ; Thu, 20 Nov 2025 11:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBwvF3KRsz3k37 for ; Thu, 20 Nov 2025 11:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZkqAbpMRcDAMyuik8n5bFDcI5n6RLDU41+hrq7pipJw=; b=F6r13w9GvRQV+sdfHIqv+7sKj0ZyG0+RIMNfxZvRI6UETFFzEGwT2Wy9YOmRQXDFDIGIGT HtY2Ha/gApbMNd0r/lApUqt1okkQVV+hrKkFBasR1018fdNi/RzBCHflTsahVsDqGMZQ0T 1X51PdFl5nIHG1aZAnVry5ntzAq3K4kcAG9yE4yT/JH2wurZOb4ffvhH1/RBmQ21jeKoQm eBQdH7cl1cEABSOhmbZH7Z/P1gbTIPIIrzs1KeYYIRGdqTjJ/TBkmUI+RufhR/XM4X4xee M4MFDZqCFhgcY2qI8p4TlLV/rRxNAfORFyuy8nC5JiT4wS7Y/lokORxnso/UWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZkqAbpMRcDAMyuik8n5bFDcI5n6RLDU41+hrq7pipJw=; b=JTCZCrz1yeFnDaJfHXIj3ZpcAwOuAb02PCSDZ2xSYhv1MK+GD3aGlRvSWyl2nTJt/8oSwt qUoobi0dP52EtIDdw7lJ+7WDmWFQJtkyLKs+j3/J8FRUyBXlxRjLVMzc0JUDmdyb3E+dvH 5jZNjkbKYTMEHSFg/8kEpccMPZwhh/gkF6HVPrk4f3PIXFq3ssTUYwCyDA/MMWZkGSkVNR TqQJurcvLe/YHkh5Q5sokOxsqMaMTOHIZ7YqgW2WtZ+p/0nS7KV/VPHmpaCxWwVOkQzFXc rk3JRU8MiQTBMdafjilQqV7omgcOD6k81l4AcUMoWu/cSWQxIsvCk/lN4wKvcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763637785; a=rsa-sha256; cv=none; b=Sz0EuZwUMQ94AyoSUcKOdrI/8VkEdtmZ6wxbo2cpZ6VEU835D+AZMcZQF7SkP/aNTn0cWI 4dv3uUdOdRlS/du7bStEVfC65bW962jVgH4PnPldhsh5ei0OQFfo9jZN+lxkQwe7a707Bs ntorbmBDGPecm3eYfw5ZSJYququ6ud35mVxEjK7HYM8MfRfVTfFGQ+YrU3KM/UFYfvAy7M UP3/1s1giOvVFpedK4v+j95lSMc2+mVe855Z8VY9F1zUctIa0/SO4nOrF2clwMXPufGxkn C2UmSc3F2X/gDZt/zpD6t0xJqoJDx3RstBeS51kXvCS5bRs9uUZn09UTopGS1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvF2lCVz8fW for ; Thu, 20 Nov 2025 11:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id eaae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 11:23:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 0f9ab6c5232b - stable/15 - sys/conf/files: Add iwx driver List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0f9ab6c5232b5f748a21d22849dcf84b4b0bbab5 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 11:23:05 +0000 Message-Id: <691efa19.eaae.4cbc9f09@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0f9ab6c5232b5f748a21d22849dcf84b4b0bbab5 commit 0f9ab6c5232b5f748a21d22849dcf84b4b0bbab5 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-15 03:18:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-20 11:22:33 +0000 sys/conf/files: Add iwx driver PR: 290812 Fixes: 2ad0f7e91582 ("Import iwx as ported from OpenBSD by Future Crew.") Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53758 (cherry picked from commit a615ded5bf2dd7f563eed6766d32fc063ae36f92) --- sys/conf/files | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index 8c9993d8f57a..da5e22e0669b 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2277,6 +2277,10 @@ iwn6050.fw optional iwn6050fw | iwnfw \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwn6050.fw" +dev/iwx/if_iwx.c optional iwx \ + compile-with "${NORMAL_C} -DIWX_DEBUG=1" +dev/iwx/if_iwx_debug.c optional iwx \ + compile-with "${NORMAL_C} -DIWX_DEBUG=1" dev/ixgbe/if_ix.c optional ix inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP" dev/ixgbe/if_ixv.c optional ixv inet \ From nobody Thu Nov 20 11:23:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvD4P29z6HDSB for ; Thu, 20 Nov 2025 11:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBwvD2cSQz3k1L for ; Thu, 20 Nov 2025 11:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JT3upMS7Tq+SS36wkDU6DxhpdhY9Nbs9/Ch7R58FYQs=; b=MKY6MB2KzUCI/gBKnx6lwxMp/zEpGl77FeKz2bQwG+pMDskNXkUL6UCraPTiEr1aKdi41u Doy9wNEG0Iyf6hdxnDmISLKVYMeAiSgdj5sFJkvkRDKm1ZPPUekUwLtEf/Sv7giUcT4wTV neKZIVU9xIo+HtIv7PktuxMmbKK+uhlKHd52W1Bv/KNm9IDF8tgh86R2nDbnME23kA/NVb AQsAUiVz3q5zZApDc/dh2e9fMkdFSAC5tJQ6mpL8ui4PdCYK6nndbJ7cZVHEemyfhZjARl XBvv1rV+QQVcdni7qAOjeMo30QDLSFCK8Gr1J+z1WRv4trEZ4LqbxfcFw4JFng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JT3upMS7Tq+SS36wkDU6DxhpdhY9Nbs9/Ch7R58FYQs=; b=dLsIIP/J+JMrsPINHH0WzfSiDP6TftASy96ZRd1WjneqETKICaUy4CBOLMq7UoFMaTZylX Qd6+7B532P5pp15uHUqpigPSBoHEzg0o1SERE5VHn1envBBj3C/iUgId7INEBduQDIJUp2 y1w7P4Slrxiek/bsP8UPFx5F7TPjn7VV1JPovgXNr31AWEX4VnCV0W2Dwa0hhJR5KEdU2r RnXMPTpddmHEmz7fGkGwcPZXGS7eqjfkmTrESQt2HqgU2wU+fIDHH1kGHd1gNCFeg+40ha 7ROd/9+2LHgUQ6v5q9rZJtprE5eHmkvqGmdG3ZxQWYKqtdkG5ep8s1LM/M249Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763637784; a=rsa-sha256; cv=none; b=GOF+rcIYPQDC5ApxMKszytbLYnl+Cz9TW0MZvseVq8WCoonpujaB7wVCbMt0wSR0Q+pZu0 +OC3qGPCd6WWtOehkggwJzPqY6gwowYyTXAhGlSr1QVTxw/A2cRS2dQw9oLAxN0DzMUGdU xcN+WLO6LWla65KQIAQBYskSF2PyaZaCbaCxW0TAwQlVSCJ9aZTYAlVI/Bj7vMB26mYvY4 R+ixx7q2aNK1ecwKcRCQ5p/zxs7bCNNpAYC1cQyZtDSqa1RQkRKUHQUzZS2GvmtIZDFjxo Vw6uwERWHnP0WSBo9DkEue1xkkU0ctW5FL0HOedjQbkH1DCiTTxubdekymNjzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBwvD1vkfz8hR for ; Thu, 20 Nov 2025 11:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id da6f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 11:23:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c67643712dc6 - stable/15 - Use install instead of cp to copy bootstrap tools List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c67643712dc6ccd02ea7807729fc53288db47a87 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 11:23:04 +0000 Message-Id: <691efa18.da6f.15363fa7@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c67643712dc6ccd02ea7807729fc53288db47a87 commit c67643712dc6ccd02ea7807729fc53288db47a87 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-15 03:18:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-20 11:22:33 +0000 Use install instead of cp to copy bootstrap tools We need to preserve modification times on bootstrap tools, but `cp -p` also tries to preserve flags, which fails if OBJROOT is on NFS. A -N option was added to cp for this purpose, but trying to use that would break cross-building on hosts that don't have that option. The best remaining option is `install -p`, which we already assume is present. PR: 275030 Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D53751 (cherry picked from commit f3cf4c0af5af6ce95065a615f998117ec1cd63aa) --- Makefile.inc1 | 2 +- tools/build/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 3f93e1065622..6ef7bdf101f7 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2833,7 +2833,7 @@ ${_bt}-link-${_tool}: .PHONY if [ ! -e "$${source_path}" ] ; then \ echo "Cannot find host tool '${_tool}'"; false; \ fi; \ - cp -pf "$${source_path}" "${WORLDTMP}/legacy/bin/${_tool}" + install -p "$${source_path}" "${WORLDTMP}/legacy/bin/${_tool}" ${_bt}-links: ${_bt}-link-${_tool} .endfor diff --git a/tools/build/Makefile b/tools/build/Makefile index 3c4e07e3cfc2..bff73fc715ef 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -410,7 +410,7 @@ _LINK_HOST_TOOL= ln -sfn # When building on FreeBSD we always copy the host tools instead of linking # into WORLDTMP to avoid issues with incompatible libraries (see r364030). # Note: we could create links if we don't intend to update the current machine. -_COPY_HOST_TOOL= cp -pf +_COPY_HOST_TOOL= install -p .else # However, this is not necessary on Linux/macOS. Additionally, copying the host # tools to another directory with cp -p results in freezes on macOS Big Sur for From nobody Thu Nov 20 11:25:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBwyN3fP6z6HDX3 for ; Thu, 20 Nov 2025 11:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBwyN2G06z3llN for ; Thu, 20 Nov 2025 11:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35v3OQiRT/wWkckuCzMUlp7Ism6Jo1XUlqO9SlrDuNc=; b=nI1HIpM14Fk4ao2Fo9YknB98/2q59ERLavmQdUFNXCwWVWEJ0KXETaZpoteOjgJCKl0X+K yAYCTBMz5wwN9fCphQT7gB0lKKvVNSSYfq3x4BmEUQbytO1BGg0kkklVGFIWNXsAhhX8DR q89VRwA5Wu6sI3+bmntFEKcRWey3Uc/qpdEdGcwKBqF2UJ3ERdhG4VLAEXR8a/qYVAFYhD uaN2UztvuXDCv4VN+5NsSYAhmz8DB2rxmVQDcDXFnaQDQzQjgQeKdR4L/3aUBwiLbPQnTu VHHRTZG+lycmMCwhIMqKN8vftUUhpWZVF/Ej3vRQAdzh+qFCxRHHd/Wb2cktuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763637948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35v3OQiRT/wWkckuCzMUlp7Ism6Jo1XUlqO9SlrDuNc=; b=AQgqaajE2Yw8q3RXimmf/ksqI6/kVKf8YzQmOqrjJ9YUsf6oJ2jp6Di3VuEwVfTDV1KoMY 6aydFafm9kwnqIneSyQbz4Az1lCclKuf2/Kw9HIenNpDWKhIGDXcBUafhUCmwMyFv6OM6S qD+DsIjwIgRN+Ky4pn0pQ+0SeNU3wG6FUCkeOF9UEPQL5Wf658huP5aCw9rzBBNpJuYzk/ ukCg4f5gqqBP7GyJb0Gj4WnubSuDw2AC9YCWPsP3CyhNX1jv+MbHd80EvqV2xc8z7Ij3tY ZSpz4K4AwX6WZDsu6M50glZrrUvkgf5tJLJfvA8LUIqV9WDYwrVY3xx0JhjwuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763637948; a=rsa-sha256; cv=none; b=TeypT9+GY5dyybglo0Hd92uYE8sCrNmKV6Rl6v2w7pyw/VkmrXes7MbsPzv6kaOs1NZfkh PwEgzoXKmDZmxCmtrQmeotspINInu/rDT2I46ogQCqdC745tgXzZJwDfNSHvTpx1BmoH8I ku0RPSFYj4IHr1NC7FBzAbaTd8cfkd/HYu3YQqnomIKM3gMlYb3/Z2SbzwgpWphgmSRxJW DHns1b3zuILo1ImBLdijESjKy81fpTrS54DGWal+/s5cWwAQBDMujDIBtTSGD/r6zHECYh 8qxWgACfi6TWN3MgUyczPlUDljQh6TDkNoEJtTnbiqTvHLNVQE8hVxFWs15FWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBwyN1qDYz8fd for ; Thu, 20 Nov 2025 11:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e985 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 11:25:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b4a6b62e683b - stable/14 - NOTES: Add iwm List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b4a6b62e683b9f1d86525d921e4abc9c48d195e7 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 11:25:48 +0000 Message-Id: <691efabc.e985.31182de@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b4a6b62e683b9f1d86525d921e4abc9c48d195e7 commit b4a6b62e683b9f1d86525d921e4abc9c48d195e7 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-15 03:18:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-20 11:25:33 +0000 NOTES: Add iwm (cherry picked from commit b1039bbe185bbadea24207b600f4bea065a2dbee) --- sys/x86/conf/NOTES | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/x86/conf/NOTES b/sys/x86/conf/NOTES index 5042585da310..c329613378b9 100644 --- a/sys/x86/conf/NOTES +++ b/sys/x86/conf/NOTES @@ -441,6 +441,7 @@ device gve # Google Virtual NIC (gVNIC) device igc # Intel I225 2.5G Ethernet device ipw # Intel 2100 wireless NICs. device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs. +device iwm # Intel IEEE 802.11ac wireless NICs. device iwn # Intel 4965/1000/5000/6000 wireless NICs. device mthca # Mellanox HCA InfiniBand device mlx4 # Shared code module between IB and Ethernet From nobody Thu Nov 20 13:31:40 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlc544dz6HP2y for ; Thu, 20 Nov 2025 13:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlc32NWz44Xc for ; Thu, 20 Nov 2025 13:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lcy0wad7lnD5i+sMSTZn95QO7OSe8opb/zqEvdzCQQk=; b=QAoYaD36tns56ih1GklIOstRPhKsWKbnMYiKAHzZY0Ws/u9fIKGhC48YzkTt0upQgWc/cH RIhG7KCv+uJmHc96G4Rukk9fD5/+mbwlAH6pNiQv9jJd/zKK92sjAAznfqOFEUUVyvT0TH SO52lVnfrTbmvv18WMyDPj+v8FzReJtU2xsnQ68Hd3Z/kGtdkRdNIkyISSEjgyhJdpIw9a FNmMhq801h18Yv9KGgsjNNAPAz/WTz3pkFlKNpI/pCa3GZFI94wW9zf/737EU/MMgTjPB5 M+hiUHp14iAvETkeX1YXH/xgMcw0jIYBA3sjPikUplkoJc/ZxXE7NjJ9r0BDUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lcy0wad7lnD5i+sMSTZn95QO7OSe8opb/zqEvdzCQQk=; b=wr9CoNZ3nJlQVQa4vY92+4XAT2teCwi6yWprCVXkPWlGyd1VnCDTBbdEctCJ3ISMchTt1m FyTmlxjL4V7kAts0iCOx3K0OkQ5RJ1VGaM/Wm60ggNIqqfOdrNzJ1WGZqNWJXbsj2VINv6 UjHrA+XcrtOIir1eqO+7PS9MXyU0Vz2o4AcUlVdAFhn+Md7XNPrBVKeIle4FETSftXUfEx 8dQKmFWrlhBQjr81rVxHWFqfrbio22M1uAGR6GyETquvBVjNP569ZRPagf6UjaHJDyyB05 BVXzpcBi9Ek0mADJFENRKMkkeo583B64dsO2GMSKufGTb20Nwuiwd0ibo5l2Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645500; a=rsa-sha256; cv=none; b=s5YAQrCxogdvsxlM+Gvt1l959cI1OvIYoPaUkQyq7SXyOjwSHNNOLM6xFxINxUsaNU0CPL 1VY/M1X/5NK9gXMTEqxLom6JAi9hADA21t25UatYktfrVPxjX8PV3VNEuM8xY+WpSkvRKl QMdox0vkH+4GfqUQlZ54G/akWBcytZikO7Sb2dadbnaBDfDEGfra9sGtz/9CR8SGhaEqLz 9XS/aIbf7XlTrMHL87lXqd7OwO+N9rdTVXiCFnrLDK1WhnX/NCRq1sAx8kkqmFxbBko5ch rm+BpSPbbGaoYl+geMp/58FEZbkAsegQsG7LqFra80+rr+9FcSQkVUqf2xXB/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlc2b7JzCYX for ; Thu, 20 Nov 2025 13:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2cd2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: cc931f5bf6b2 - stable/15 - sound: Retire unused mixer functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cc931f5bf6b2a2aa2290980898bb7cb6b7805914 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:40 +0000 Message-Id: <691f183c.2cd2b.c380ff0@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=cc931f5bf6b2a2aa2290980898bb7cb6b7805914 commit cc931f5bf6b2a2aa2290980898bb7cb6b7805914 Author: Christos Margiolis AuthorDate: 2025-11-13 12:53:18 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 sound: Retire unused mixer functions No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit b55adf9b261b91ddd3c7293720bbbbfb4ffe7066) --- sys/dev/sound/pcm/mixer.c | 43 ------------------------------------------- sys/dev/sound/pcm/mixer.h | 4 ---- 2 files changed, 47 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index f281dff36248..5fa3ff5cc83c 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -608,14 +608,6 @@ mix_getparent(struct snd_mixer *m, u_int32_t dev) return m->parent[dev]; } -u_int32_t -mix_getchild(struct snd_mixer *m, u_int32_t dev) -{ - if (m == NULL || dev >= SOUND_MIXER_NRDEVICES) - return 0; - return m->child[dev]; -} - u_int32_t mix_getdevs(struct snd_mixer *m) { @@ -1024,14 +1016,6 @@ mix_getrecsrc(struct snd_mixer *m) return (ret); } -int -mix_get_type(struct snd_mixer *m) -{ - KASSERT(m != NULL, ("NULL snd_mixer")); - - return (m->type); -} - device_t mix_get_dev(struct snd_mixer *m) { @@ -1573,30 +1557,3 @@ mixer_get_lock(struct snd_mixer *m) } return (m->lock); } - -int -mix_get_locked(struct snd_mixer *m, u_int dev, int *pleft, int *pright) -{ - int level; - - level = mixer_get(m, dev); - if (level < 0) { - *pright = *pleft = -1; - return (-1); - } - - *pleft = level & 0xFF; - *pright = (level >> 8) & 0xFF; - - return (0); -} - -int -mix_set_locked(struct snd_mixer *m, u_int dev, int left, int right) -{ - int level; - - level = (left & 0xFF) | ((right & 0xFF) << 8); - - return (mixer_set(m, dev, m->mutedevs, level)); -} diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h index 7139a766b392..c47247ab570d 100644 --- a/sys/dev/sound/pcm/mixer.h +++ b/sys/dev/sound/pcm/mixer.h @@ -47,13 +47,10 @@ void mixer_hwvol_step(device_t dev, int left_step, int right_step); int mixer_busy(struct snd_mixer *m); -int mix_get_locked(struct snd_mixer *m, u_int dev, int *pleft, int *pright); -int mix_set_locked(struct snd_mixer *m, u_int dev, int left, int right); int mix_set(struct snd_mixer *m, u_int dev, u_int left, u_int right); int mix_get(struct snd_mixer *m, u_int dev); int mix_setrecsrc(struct snd_mixer *m, u_int32_t src); u_int32_t mix_getrecsrc(struct snd_mixer *m); -int mix_get_type(struct snd_mixer *m); device_t mix_get_dev(struct snd_mixer *m); void mix_setdevs(struct snd_mixer *m, u_int32_t v); @@ -65,7 +62,6 @@ u_int32_t mix_getmutedevs(struct snd_mixer *m); void mix_setparentchild(struct snd_mixer *m, u_int32_t parent, u_int32_t childs); void mix_setrealdev(struct snd_mixer *m, u_int32_t dev, u_int32_t realdev); u_int32_t mix_getparent(struct snd_mixer *m, u_int32_t dev); -u_int32_t mix_getchild(struct snd_mixer *m, u_int32_t dev); void *mix_getdevinfo(struct snd_mixer *m); struct mtx *mixer_get_lock(struct snd_mixer *m); From nobody Thu Nov 20 13:31:39 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlb3Hqsz6HP8N for ; Thu, 20 Nov 2025 13:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlb2DJzz44b5 for ; Thu, 20 Nov 2025 13:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FBVqRVbM25rwL9XWgxP0fg+Pwpy89G4Ro2NTXKhiDdA=; b=v8ZCkLOs7Wp52Q705Lf9NBt8C1behzpENiuZzdrfrcll2paKUMRIax0owNKB5Q0ziy6u+u lb4n7hbElD0r3AwqAQXCywpRSAH+j5Xd/yyHBGYpEjDmwKPTMJRe944Mxu0gtkjLjiFo17 0w93NhIbs5KvWQ1HnUWyuckFFwfY/Vd6h+k307YOgmo8B6AUmwpUPLpOzDGQydmrTKoFwm P0gGNR9psFsf95AtJa6iEwODXO3RU3VExboJC6cqUwARtLx77OgC4q5YU/SFh19nN0P0iO kFI7oJsfW15dweICDsv4XY2YKG3WY0pDmU60TOL9ZpTnLINl+fxPFNpS2bs16A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FBVqRVbM25rwL9XWgxP0fg+Pwpy89G4Ro2NTXKhiDdA=; b=umgAbA/O8Rn8CeYCLiazW8aN09iOlI16w9dLIQWZynhqt3OVmVBINgWNWMZyzPyt7Y/yyu zvZO8+K0zA/dBMjDv6wMGU1XDuK0isc1zKCjqDIgv+4+/oTLHOYDw/BuMQnxE4dTKrbTk3 miOmRjv80DipyEtqp8ABseQ3Nekr6NC5qYCwTINlT1dhjeiFnM/cv3Pqdy2KZOFACl6Oc1 APHosmQWtcDWl2JpfkbgMRZCi2j8EpmiwJnklIzVQvaodOzzm9oKtM70cVIPNUK1nTvxtp OBgoXbrJOROn/tCVZ6p27PimqAOqHg0uJO9n44vbnK/WCrBex/dvDX/ibcx+7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645499; a=rsa-sha256; cv=none; b=yzbTh3hA+YhN2uX+l3j/PdsLW9dGx3SklsBMrT4HaNkXJzcLBKapeBfu43wNTh1UxYmYLo kIMtodbdbh/bEvXBpSHmId7iOtlH7nPCWDimq2HZS0iJlSbicMMxfpkOHS63j30eGBRFOJ fIL/SkHpjot1avUsChBjITnXiOyOe9A/tpVoRH7+aWLxSvcg0usDgMWUY83uLw2TOW9MTd o//Dqz+jklaQn6IPqxf4r+kHaGQAjZJ3KmZ7XbZCeMkB+mnJ60H7T40PN26mU5GsFwpUFd 7W7EOx+yh4H9nyJ3lV/aL8HZFZYYi5aYXNGpIA+N+fmIXtD7xvw8ixL4LFHRCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlb1p1GzCKV for ; Thu, 20 Nov 2025 13:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2cd91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d26b3c9b3415 - stable/15 - cuse: Fix cdevpriv bugs in cuse_client_open() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d26b3c9b341522090885ec362aa5cd1f90eb57c9 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:39 +0000 Message-Id: <691f183b.2cd91.71b71dca@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d26b3c9b341522090885ec362aa5cd1f90eb57c9 commit d26b3c9b341522090885ec362aa5cd1f90eb57c9 Author: Christos Margiolis AuthorDate: 2025-11-13 12:11:06 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 cuse: Fix cdevpriv bugs in cuse_client_open() If devfs_set_cdevpriv() fails, we will panic when we enter the cuse_client_free() callback, for a number of reasons: - pcc->server is not yet assigned, so we'll use a NULL pointer. - pcc has not yet been added to the pcs->hcli TAILQ, but we'll try to remove it. - pccmd->sx and pccmd->cv are not yet initializated, but we'll try to destroy them. Even if we'd get past all these somehow, we'd still get two errors in the devfs_set_cdevpriv() failure block: - We'll unref the server twice, once in cuse_client_free(), and again in cuse_client_open(). - A double-free panic, since we'd be trying to free(pcc), which has already been freed in cuse_client_free(). Fix all those issues. While here, also get rid of some unnecessary devfs_clear_cdevpriv(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D53708 (cherry picked from commit 634e578ac7b0a03ae25427c723c0da27e894a340) --- sys/fs/cuse/cuse.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c index b2524324584a..b914b2d5017c 100644 --- a/sys/fs/cuse/cuse.c +++ b/sys/fs/cuse/cuse.c @@ -1516,13 +1516,6 @@ cuse_client_open(struct cdev *dev, int fflags, int devtype, struct thread *td) } pcc = malloc(sizeof(*pcc), M_CUSE, M_WAITOK | M_ZERO); - if (devfs_set_cdevpriv(pcc, &cuse_client_free)) { - printf("Cuse: Cannot set cdevpriv.\n"); - /* drop reference on server */ - cuse_server_unref(pcs); - free(pcc, M_CUSE); - return (ENOMEM); - } pcc->fflags = fflags; pcc->server_dev = pcsd; pcc->server = pcs; @@ -1553,10 +1546,12 @@ cuse_client_open(struct cdev *dev, int fflags, int devtype, struct thread *td) } cuse_server_unlock(pcs); - if (error) { - devfs_clear_cdevpriv(); /* XXX bugfix */ + if (error != 0) return (error); - } + + if ((error = devfs_set_cdevpriv(pcc, &cuse_client_free)) != 0) + return (error); + pccmd = &pcc->cmds[CUSE_CMD_OPEN]; cuse_cmd_lock(pccmd); @@ -1575,9 +1570,6 @@ cuse_client_open(struct cdev *dev, int fflags, int devtype, struct thread *td) cuse_cmd_unlock(pccmd); - if (error) - devfs_clear_cdevpriv(); /* XXX bugfix */ - return (error); } From nobody Thu Nov 20 13:31:41 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzld5BVWz6HPRh for ; Thu, 20 Nov 2025 13:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzld486Dz44b8 for ; Thu, 20 Nov 2025 13:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3flrxlU4DY6QEWnGci2iTfcLqjIqfVrhh8dZQvq3SAc=; b=xPRHPSkYPmjq93ocM+eaVxMwZ94jGQvuhL+wmmmshqBNYXQYDNg0nEiVgsqwr8Y1KgGhjh ZX0zJlfrkTH0SUvZwBQoiSds9LiYv8f4zJUDMAMAyGFNCsray4y6ON9AB5eRy9MRqObYcP d/FRbApEBID80ixH1e3pi2wqStrfRi/CqkpszT2vS1smrYt4q80jx2/Y0AEcI7zCzkCRod 4vIsZ6RwxOkd6uKlU3+G1p54HUGzEqP6GQ2Rmpgew5M56aJOpjM4oRs2z44FBNpZIdIPIC RWoouoot04X9FWlQozaH7ttwFvF3QUsAUbuE7XRX8V0b4yvbGb0NLxJYHwDRkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3flrxlU4DY6QEWnGci2iTfcLqjIqfVrhh8dZQvq3SAc=; b=VwUCCJbgE/i6dFqY5l1CeXRlWhUeWZPB1/Nu+5ull7a/jGPhj1OjaSLDM7UeXEAg+K4YAo aWeHm7Mdq2I9hLboGpwtVMxMN4h+fhzzfGyHVSxw8krfO3JNfyv/Dpk2aH1rvgzwnfukLB 04rWFWTyczJVUS+Hxg3r40jCGs+7rI2q3GID35IJY1NT9IcAmk4l7t7wJO64+RirCfjnqL 6kFYfPZpbnd52E9piqLCAJQhP4Cmf/8Fxh7bwDZjzphHLIfyAgetzKPVNkZoMHN57KLo8D Sl55AMtqcFVr7SATlRlVTTJcgc1bVoRKBgB7eHfL/zQdojKFFn8JPz/QHNt6KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645501; a=rsa-sha256; cv=none; b=YgmcjWpKA/vmZAs0qTIrgslG5qQwmXxY+cdKwGXv9Z4NHSp1L/zvpBbcXlXFojtnRmWa4g 8CsWa4tVD2r2DrnsfVdQKUDiFzcgTU5mPv/+0i+WyMvAXengLHEExtIv0y4JheUUp7ZJsA sVShLhoUP8W1zbXJFOIj9cbX0eN4nI4hnTxsj3/FDp2k7Vi+bzNktrg8g1TyJm9HWdnT7c xiPksn/bkeWkTqG2MztBA0exMMk0tf0kalgNKRuaH/EgviJPfHEEoHsvUoR3IPAwiXqCgh 2jhpohkqgBEbCwTFif4LorJ35h07Ywm/olVNvzHJsn3vwjoH4uGMWw/tnRWQQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzld3Q9VzD36 for ; Thu, 20 Nov 2025 13:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2cd2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: a6601bb409d8 - stable/15 - sound: Move mixer->modify_counter to more appropriate place List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a6601bb409d86f6a2b73a708d7ef718d3ab0d923 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:41 +0000 Message-Id: <691f183d.2cd2f.1cdc5825@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a6601bb409d86f6a2b73a708d7ef718d3ab0d923 commit a6601bb409d86f6a2b73a708d7ef718d3ab0d923 Author: Christos Margiolis AuthorDate: 2025-11-13 13:33:24 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 sound: Move mixer->modify_counter to more appropriate place No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 15d77c1fdcb1c7f022a21892dcb78990986f1a3c) --- sys/dev/sound/pcm/mixer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 5fa3ff5cc83c..adbde195c34c 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -65,11 +65,6 @@ struct snd_mixer { char name[MIXER_NAMELEN]; struct mtx *lock; oss_mixer_enuminfo enuminfo; - /** - * Counter is incremented when applications change any of this - * mixer's controls. A change in value indicates that persistent - * mixer applications should update their displays. - */ int modify_counter; }; @@ -1474,6 +1469,11 @@ mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) mi->dev = i; snprintf(mi->id, sizeof(mi->id), "mixer%d", i); strlcpy(mi->name, m->name, sizeof(mi->name)); + /** + * Counter is incremented when applications change any of this + * mixer's controls. A change in value indicates that + * persistent mixer applications should update their displays. + */ mi->modify_counter = m->modify_counter; mi->card_number = i; /* From nobody Thu Nov 20 13:31:42 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlf6L56z6HPQ5 for ; Thu, 20 Nov 2025 13:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlf4dH1z44PP for ; Thu, 20 Nov 2025 13:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EZXlrRGnYhGx29RyCC1+JXGq6bikea5llOtAxRozB5k=; b=CK1hj+BNwph16vIRwzCSgTA/HKJqLdPub6F/4K7B7650Wi0C3emww5IvqD2X91q6f/s7Vw fRRz3Li/tDTTcuSqOPiOM0WqW1eze6YssOTHPw5+rhtbu+M7kKmIfoi9vjQ9liIb4FLQO2 VyomVazb9Azd4JkZzrkb6UPA9xFvNSNMhgtEa8dhzyzsR2WGruPbfzM/EabM2JbZAGch4m tqDsoGc4RIpyxALsY1akOvWZSX1ZwzCW0FRrGZ1RC5lCfW2wgc9OWMb4yMRB3lAOw3/s2G 1ds2PKNb7T45GdksmboNjyEdSWB/+FrLPpqiXD9cjUCC5Z9Se8d9o9X1dWHIVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EZXlrRGnYhGx29RyCC1+JXGq6bikea5llOtAxRozB5k=; b=vWiLC9Rwlwh26xfYFyVHVOdzzLy1zRoCZrYLOiYqnI/mvlVAw+EFY04h2iklCTIwEIGAmS S8tDzn+Npwop7U/1fmq08LSw/EwL/lHNTsvQVNNxWk5cHSUGnodas78/U25Oy8L3tQceM5 gxQd1gbRycswHohmUnzB6JqicIe5HhgCpBQShW3LDOHINPWUltFEhJc2gmOSYYD6yKmDfp 2ePFoJfv7IlMgxQDbOHFG7spuLaRGqi+uRIBXk58pw/Cda0dzs4NApxK1hZXbRAb8PesQN ZcVVuon5Zsxdo+CyuOxBeZq5CaX2xJn65ChFQcc2wrMdMuvDqiQE1GXW88ORzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645502; a=rsa-sha256; cv=none; b=bhHu8oBvEarW0WpMZhRsV7BkrjlhWjDtVf0Q2XvyGHOaPGW6PZcZmV29wGEn2GG/YnE8rN 5xyoRzyE7/UOwqY6vzGnX4XySrfHFpF9eC7wKXGv6Ml42muD/T9+KTXfH7jIUyHHEBq+vO xKQ1z6Wn4UIrNXol8Zig14q0h83xPJD6WKem3nIEDxB0VKDINERqCxWZwREzfr8JeTHGx2 xHxfTDCYB1bv0XhvF7GzKxKE5wddif3kwO8Qd4GU7GFQfJW+vpAvcq44MlIYcOs7yZ6ga6 a3HUpizNvmPXmNlVl5kiRSiprcNiiQeUZdsjcxm1C5IJx0zEsg3g2sdHte8zhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlf49z1zCcq for ; Thu, 20 Nov 2025 13:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2af46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 3c1061a33db7 - stable/15 - sound: Retire OLDPCM_IOCTL List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3c1061a33db7c64365a2c31a8d37423ead4c0452 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:42 +0000 Message-Id: <691f183e.2af46.2ad4cb62@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3c1061a33db7c64365a2c31a8d37423ead4c0452 commit 3c1061a33db7c64365a2c31a8d37423ead4c0452 Author: Christos Margiolis AuthorDate: 2025-11-13 13:33:28 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 sound: Retire OLDPCM_IOCTL It is defined by default, and there is no reason to have a switch for it. While here, also get rid of some unnecessary comments and ioctl definitions. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 1fe7bfd6c70160c064237eac104e7d9c71390c4f) --- sys/dev/sound/pcm/dsp.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index d0ed405fb25b..429586e64aef 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -72,8 +72,6 @@ SYSCTL_INT(_hw_snd, OID_AUTO, basename_clone, CTLFLAG_RWTUN, #define DSP_F_READ(x) ((x) & FREAD) #define DSP_F_WRITE(x) ((x) & FWRITE) -#define OLDPCM_IOCTL - static d_open_t dsp_open; static d_read_t dsp_read; static d_write_t dsp_write; @@ -808,10 +806,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, } switch(cmd) { -#ifdef OLDPCM_IOCTL - /* - * we start with the new ioctl interface. - */ case AIONWRITE: /* how many bytes can write ? */ if (wrch) { CHN_LOCK(wrch); @@ -1028,10 +1022,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, printf("AIOSYNC chan 0x%03lx pos %lu unimplemented\n", ((snd_sync_parm *)arg)->chan, ((snd_sync_parm *)arg)->pos); break; -#endif - /* - * here follow the standard ioctls (filio.h etc.) - */ case FIONREAD: /* get # bytes to read */ if (rdch) { CHN_LOCK(rdch); @@ -1070,11 +1060,6 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, } break; - /* - * Finally, here is the linux-compatible ioctl interface - */ -#define THE_REAL_SNDCTL_DSP_GETBLKSIZE _IOWR('P', 4, int) - case THE_REAL_SNDCTL_DSP_GETBLKSIZE: case SNDCTL_DSP_GETBLKSIZE: chn = wrch ? wrch : rdch; if (chn) { From nobody Thu Nov 20 13:31:43 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlg6d5Nz6HPNJ for ; Thu, 20 Nov 2025 13:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlg5TJyz44PQ for ; Thu, 20 Nov 2025 13:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nf/+Z2ZVAsC+wsfBCD+WQjt2I89BfRkMCqOv2/jnjs8=; b=hfr63bAqML83V+37kDo5ZNqxZhUw/eMHqGxX12NBW+j097a4waKorJYl1FxQSW4TaJEGGB YaB6drG1zhVsgfZXOQtn7apNNcOb/YgmwQa+3grqJntoVzZhYdyuunQPRAslu+An8IxHYn Xj0+XiwZX8cGbQjraJ7nkGWi7AKItWeZldIks3HHd1Krv76TghHt182qwbPCpSCerZnCr0 ei81ULEkHe2Vw/t9hCrkAJfBhe7pTFo6MDp1enFX3WPKKW5D2HPJJTGHmrTO0P584eqPTZ N5Ap8SoXLGU04SahjkEHwFco5K0e353/95K24ZVeGtj8VmkltMNtga71GqTgEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nf/+Z2ZVAsC+wsfBCD+WQjt2I89BfRkMCqOv2/jnjs8=; b=E1oCermo0AymFpVXcCvnUTvcbq/AIpDTE+ja8FfFhTFtV4Pag2rK1p342ddV+OjJeJne3e LsMqYsh8F461MN6pzyjPc3k/GI6w1l1j2laA5yGrHTn/KpkMHhv4MaGlICiWouJN7+u56J 8OvaNzD4QGUlSLt++TxaKs+508Tr4n3C69LToD40t/TsUV1PoOtforcfYrNBQ1/Hc6BGMO HV6vyc/WozWzplvlmwySUKKqr2DJC7AZAzneEj1j1U/Uvlb61/hldcYUXpCaJ+OTTHjy+d Fx1H4FRHpSdZHQrcmaSSsDAp6mZVaFn3PayKlWbO8xRG+SM6JC917ZyG+X4nHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645503; a=rsa-sha256; cv=none; b=vxsxe0tBgRDm3AY7y4fmHpQQV9oGQQLsWjkY3Hi4vF+lpAasTa9CVmewRbadGDwcll3d0y 0q5CBM2CbB0LSaVP0vt1bregYpMI40af3nydfDndc6aFTSVYz2MooIO2LbxLHvbbB7fP9K zK1kbD2BrDwktUhwdaCZ8ssI639tPHi2jTQopewNICUyOKch33i9KKHiJYZIurxRr/vunf jhRUpgSq3iXxByGAMaucny8seLQt0VrVixy+W7Y2uvNCCjoVz60XbwYJ5CcBcy6J0YEJNq ecHvzFhWPNpEGRGhmj3K3qFtCY7BxJnYfYCaVBMmmUJXQHX92nrujo52DSjy4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlg50RGzC8b for ; Thu, 20 Nov 2025 13:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2b17d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ccb095bd1c98 - stable/15 - sound: Remove unnecessary uio checks in dsp_io_ops() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ccb095bd1c98b5b053fe8065c013ec028e174dcc Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:43 +0000 Message-Id: <691f183f.2b17d.5c62d1da@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ccb095bd1c98b5b053fe8065c013ec028e174dcc commit ccb095bd1c98b5b053fe8065c013ec028e174dcc Author: Christos Margiolis AuthorDate: 2025-11-13 14:35:48 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 sound: Remove unnecessary uio checks in dsp_io_ops() uiomove_faultflag() takes care of that already. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D53733 (cherry picked from commit 6b5431941c10b6fdf164ad9d3dfa4b4f1b2edc22) --- sys/dev/sound/pcm/dsp.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 429586e64aef..f7188fd16356 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -467,10 +467,6 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) int prio, ret; pid_t runpid; - KASSERT(buf != NULL && - (buf->uio_rw == UIO_READ || buf->uio_rw == UIO_WRITE), - ("%s(): io train wreck!", __func__)); - d = priv->sc; if (!DSP_REGISTERED(d)) return (EBADF); @@ -488,9 +484,6 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) ch = &priv->wrch; chn_io = chn_write; break; - default: - panic("invalid/corrupted uio direction: %d", buf->uio_rw); - break; } runpid = buf->uio_td->td_proc->p_pid; From nobody Thu Nov 20 13:31:44 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlj1J0sz6HP35 for ; Thu, 20 Nov 2025 13:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlh6Cftz44bC for ; Thu, 20 Nov 2025 13:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A1NKu/ZiZe4LdKSGMVfDn43/mkmNBwlMGpj4hIrxrng=; b=DBCYhViS/oJCRmJIO6dWUNFaxoyKxmXzB7woIfeFu2ySnQD1KRfnAPGZSjn+HoOj5UQZtF NzZhdUDYIxmKaX8ktf15/R+EQ2TeWwN6G9y22TyeZzU48Ee40DCeeY5n1+d5BHWzMCDYmU OQ/cpWz1HB0V4SY9J+jOFNSkFm2yXRU+Sdh0OhDkS5m8mTOugjMctXZmwC6WS4bUbg2KDx +x4OBDA4q0nyWtJtFwnxzzb9S5X7RXWY2BRxo+CIYd1rYTYhR4sghYN3uGZSvsY3AeDxPh MM7iyWtOtBzNjXUBEpk3jZJTlgWLTyq70ns4fRNnyqt4pgNcD2tNPAFyNtYxhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A1NKu/ZiZe4LdKSGMVfDn43/mkmNBwlMGpj4hIrxrng=; b=cZ+zBLJeyGzsEbajnmzWiNofv6q0XmexzPuC4k+wNcXoxQTZCOBAHAKxz2mhY7ULeT73pa mcMvWBASqenJ5/keKtzLMBVM4cv2pSc+GBgcVmb45M1kH0mzfVYdybUpsH1VhWAP4GofPd Ol5zpeXriB/OiW5bBfJpreqpovJiZarf+MyZS7CSXnfbSZ9yrRaEdHy3KIr+p4JcgdP/YW 9MW0RO/IVPwdWDG1td1X05ZxLAj2kydWZFhBBmoGuvQ7UyZW9/7uxcMf0UFoup8OmPq2TP A5EzipHS7xnrxWl6PRwBEmLLpkwl/kkWKGKZbq+/7qrC+IpdqJUSzyPpdb8wAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645504; a=rsa-sha256; cv=none; b=HYXC8b0U+evNT3NcBo/qTBScvBYVtjckpJs/2CZNhI2A8dEwwLGWwFSZBKX/lpU3BgFpR+ 75vHq7wn5qYKiNMyfjD48I/m3TDZl2ycyiNpKZuxO+7fgINRKQyoVHnP8jjT3Y1kmrAMIL duT+CELd0nQgCcea20UHomk2r0vs3k1xI2vTGZu8+Y9EHSo4Hbun01FgJeDwsKPy8M9Hfn RiHZYKdXoocTKEQk/uegubwMdAfgT3Ju2Ey9VyWPb/CTRZJm3cAj7Ed0Par5b9jZjaT3gJ oq49pKzn/zjrP2HYJp9xEbqvdhIgtx/AnC2BEFE/n2pUiF1uXhaPQnP0In2cyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlh5pZPzCN3 for ; Thu, 20 Nov 2025 13:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2d082 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 47bdb815f31d - stable/15 - sound: Do not use double pointer in dsp_io_ops() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 47bdb815f31dc9b584700ed988a729e3f239378a Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:44 +0000 Message-Id: <691f1840.2d082.2a20e63@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=47bdb815f31dc9b584700ed988a729e3f239378a commit 47bdb815f31dc9b584700ed988a729e3f239378a Author: Christos Margiolis AuthorDate: 2025-11-13 14:35:53 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:15 +0000 sound: Do not use double pointer in dsp_io_ops() No reason to do so. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D53734 (cherry picked from commit fa7bc983076661e85107970e39de66a1e54d87d1) --- sys/dev/sound/pcm/dsp.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index f7188fd16356..1ae090f252c2 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -462,7 +462,7 @@ static __inline int dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) { struct snddev_info *d; - struct pcm_channel **ch; + struct pcm_channel *ch; int (*chn_io)(struct pcm_channel *, struct uio *); int prio, ret; pid_t runpid; @@ -476,12 +476,12 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) switch (buf->uio_rw) { case UIO_READ: prio = FREAD; - ch = &priv->rdch; + ch = priv->rdch; chn_io = chn_read; break; case UIO_WRITE: prio = FWRITE; - ch = &priv->wrch; + ch = priv->wrch; chn_io = chn_write; break; } @@ -490,21 +490,21 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) dsp_lock_chans(priv, prio); - if (*ch == NULL || !((*ch)->flags & CHN_F_BUSY)) { + if (ch == NULL || !(ch->flags & CHN_F_BUSY)) { if (priv->rdch != NULL || priv->wrch != NULL) dsp_unlock_chans(priv, prio); PCM_GIANT_EXIT(d); return (EBADF); } - if (((*ch)->flags & (CHN_F_MMAP | CHN_F_DEAD)) || - (((*ch)->flags & CHN_F_RUNNING) && (*ch)->pid != runpid)) { + if (ch->flags & (CHN_F_MMAP | CHN_F_DEAD) || + (ch->flags & CHN_F_RUNNING && ch->pid != runpid)) { dsp_unlock_chans(priv, prio); PCM_GIANT_EXIT(d); return (EINVAL); - } else if (!((*ch)->flags & CHN_F_RUNNING)) { - (*ch)->flags |= CHN_F_RUNNING; - (*ch)->pid = runpid; + } else if (!(ch->flags & CHN_F_RUNNING)) { + ch->flags |= CHN_F_RUNNING; + ch->pid = runpid; } /* @@ -512,11 +512,11 @@ dsp_io_ops(struct dsp_cdevpriv *priv, struct uio *buf) * from/to userland, so up the "in progress" counter to make sure * someone else doesn't come along and muss up the buffer. */ - ++(*ch)->inprog; - ret = chn_io(*ch, buf); - --(*ch)->inprog; + ch->inprog++; + ret = chn_io(ch, buf); + ch->inprog--; - CHN_BROADCAST(&(*ch)->cv); + CHN_BROADCAST(&ch->cv); dsp_unlock_chans(priv, prio); From nobody Thu Nov 20 13:31:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlk2XX5z6HPNK for ; Thu, 20 Nov 2025 13:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBzlj72Znz44VJ for ; Thu, 20 Nov 2025 13:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PA0acWEGUydKbgpwTqgR6Cst/EAYFJBNM2hAkkTqgbY=; b=i79QhF4v6uEgQkHmrPMSNhKU51VRz0HbLUcFrAdeE9U+d9d5xL8W8xmBxTcJ2NCpjpTmHu gvZy5ToiWbdCfePKIs1YfpU4hCpqAbv/+Uxn8wrC82sR26MphcqXuh99YfyPvctwyZyBIW a+46k3GUgTzHqFew5ZI3XjOWJjAcetBoZcLgq5ydJNqwxSMQOaI06tcjc7RxgIsv+cZ/XJ 26ogwdl3j8WC9tClxKyk/Rj0TOTuzt6gbqB0HMm2XU6zHE5kRAYlFLQObfEgcR2T9ZEZf0 Y6EUB0fXEZmuILEzEU/UdBd2fjswQKr+MxfFKKJYuAdr+NLGqtSSdiVDOc4/xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PA0acWEGUydKbgpwTqgR6Cst/EAYFJBNM2hAkkTqgbY=; b=ChBEaXgBx0KwyzXl1WwRODzssnQPh6iqNyt146wHqTR3N5sYSoFCTMOmc3i5/B2b3F3BXT i0Di/ZbVA0hJ08eXBOT+aC+LzXBBQoV8Nt1j6YpPcnb0OHuI/p2jzwy6o4h6UzWzBpNQjx K/MGApaXculV37yq4bQNha6jacrrOi4sONb7ReTWjxStBzX0n7niWbmJ09pjiZ81/dFFrw 9sD9YtLWUu8397kF8e2AnLwzBeEPDHFCuk5Wc06hHMUW894H6y8CnvwJsu52NArDVAhhEt jwgD3HttiTbTljwl/pNMqQ2ci6julA6c+BTeq+gT0WIk9LFkZCnqQbcImKKETw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645506; a=rsa-sha256; cv=none; b=kPjTbv4eF98BiW2VO5kewhZEFwiZU1Jl7eQOdQhAch8CHjLn2L3xgtp9OC5KGyW2y+ygbT FLpNFq5JTYgTwlomfSkt6wikiCbLjKT3JA0Hr9/Nw6AtCZDxKWxTXcQqTvrFhEZ96uf+xN Szq0c4XGhiCarTSRsQQgd/XKTSN7Q5BRSpLalegK7YY7jaxvtZ9/BeKGwYLsvvk1TmD+PM YVxgKx2FdNv2N+XTTjtxbUyOxmxCRdCRsNOlNTMHOZuxuR6BvBGiEuvdWkqenFweDSo+GF ykNpsmvjjZNsRyVAdyU6PkMEZYQnjYw5EanwX4T5c5URY5YTLP8M+l4cBn2t2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBzlj6dW9zCKZ for ; Thu, 20 Nov 2025 13:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2bd45 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 538df10f545e - stable/15 - sound: Retire SND_DIAGNOSTIC PCM locking macros List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 538df10f545e8e658a7010f7ec6eb9834f1aaf1c Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:45 +0000 Message-Id: <691f1841.2bd45.47ed0749@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=538df10f545e8e658a7010f7ec6eb9834f1aaf1c commit 538df10f545e8e658a7010f7ec6eb9834f1aaf1c Author: Christos Margiolis AuthorDate: 2025-11-13 14:35:58 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:15 +0000 sound: Retire SND_DIAGNOSTIC PCM locking macros Disabled by default, but also redundant, since most of the errors they catch will be caught anyway by WITNESS and the locking subsystem. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D53735 (cherry picked from commit b19e61f223a1982cce103b9716568391a071892a) --- sys/dev/sound/pcm/sound.h | 103 ---------------------------------------------- 1 file changed, 103 deletions(-) diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index c5107d5fba1c..8542a96ccb14 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -251,108 +251,6 @@ int sound_oss_card_info(oss_card_info *); * For PCM_[WAIT | ACQUIRE | RELEASE], be sure to surround these * with PCM_LOCK/UNLOCK() sequence, or I'll come to gnaw upon you! */ -#ifdef SND_DIAGNOSTIC -#define PCM_WAIT(x) do { \ - if (!PCM_LOCKOWNED(x)) \ - panic("%s(%d): [PCM WAIT] Mutex not owned!", \ - __func__, __LINE__); \ - while ((x)->flags & SD_F_BUSY) { \ - if (snd_verbose > 3) \ - device_printf((x)->dev, \ - "%s(%d): [PCM WAIT] calling cv_wait().\n", \ - __func__, __LINE__); \ - cv_wait(&(x)->cv, (x)->lock); \ - } \ -} while (0) - -#define PCM_ACQUIRE(x) do { \ - if (!PCM_LOCKOWNED(x)) \ - panic("%s(%d): [PCM ACQUIRE] Mutex not owned!", \ - __func__, __LINE__); \ - if ((x)->flags & SD_F_BUSY) \ - panic("%s(%d): [PCM ACQUIRE] " \ - "Trying to acquire BUSY cv!", __func__, __LINE__); \ - (x)->flags |= SD_F_BUSY; \ -} while (0) - -#define PCM_RELEASE(x) do { \ - if (!PCM_LOCKOWNED(x)) \ - panic("%s(%d): [PCM RELEASE] Mutex not owned!", \ - __func__, __LINE__); \ - if ((x)->flags & SD_F_BUSY) { \ - (x)->flags &= ~SD_F_BUSY; \ - cv_broadcast(&(x)->cv); \ - } else \ - panic("%s(%d): [PCM RELEASE] Releasing non-BUSY cv!", \ - __func__, __LINE__); \ -} while (0) - -/* Quick version, for shorter path. */ -#define PCM_ACQUIRE_QUICK(x) do { \ - if (PCM_LOCKOWNED(x)) \ - panic("%s(%d): [PCM ACQUIRE QUICK] Mutex owned!", \ - __func__, __LINE__); \ - PCM_LOCK(x); \ - PCM_WAIT(x); \ - PCM_ACQUIRE(x); \ - PCM_UNLOCK(x); \ -} while (0) - -#define PCM_RELEASE_QUICK(x) do { \ - if (PCM_LOCKOWNED(x)) \ - panic("%s(%d): [PCM RELEASE QUICK] Mutex owned!", \ - __func__, __LINE__); \ - PCM_LOCK(x); \ - PCM_RELEASE(x); \ - PCM_UNLOCK(x); \ -} while (0) - -#define PCM_BUSYASSERT(x) do { \ - if (!((x) != NULL && ((x)->flags & SD_F_BUSY))) \ - panic("%s(%d): [PCM BUSYASSERT] " \ - "Failed, snddev_info=%p", __func__, __LINE__, x); \ -} while (0) - -#define PCM_GIANT_ENTER(x) do { \ - int _pcm_giant = 0; \ - if (PCM_LOCKOWNED(x)) \ - panic("%s(%d): [GIANT ENTER] PCM lock owned!", \ - __func__, __LINE__); \ - if (mtx_owned(&Giant) != 0 && snd_verbose > 3) \ - device_printf((x)->dev, \ - "%s(%d): [GIANT ENTER] Giant owned!\n", \ - __func__, __LINE__); \ - if (!((x)->flags & SD_F_MPSAFE) && mtx_owned(&Giant) == 0) \ - do { \ - mtx_lock(&Giant); \ - _pcm_giant = 1; \ - } while (0) - -#define PCM_GIANT_EXIT(x) do { \ - if (PCM_LOCKOWNED(x)) \ - panic("%s(%d): [GIANT EXIT] PCM lock owned!", \ - __func__, __LINE__); \ - if (!(_pcm_giant == 0 || _pcm_giant == 1)) \ - panic("%s(%d): [GIANT EXIT] _pcm_giant screwed!", \ - __func__, __LINE__); \ - if ((x)->flags & SD_F_MPSAFE) { \ - if (_pcm_giant == 1) \ - panic("%s(%d): [GIANT EXIT] MPSAFE Giant?", \ - __func__, __LINE__); \ - if (mtx_owned(&Giant) != 0 && snd_verbose > 3) \ - device_printf((x)->dev, \ - "%s(%d): [GIANT EXIT] Giant owned!\n", \ - __func__, __LINE__); \ - } \ - if (_pcm_giant != 0) { \ - if (mtx_owned(&Giant) == 0) \ - panic("%s(%d): [GIANT EXIT] Giant not owned!", \ - __func__, __LINE__); \ - _pcm_giant = 0; \ - mtx_unlock(&Giant); \ - } \ -} while (0) -#else /* !SND_DIAGNOSTIC */ #define PCM_WAIT(x) do { \ PCM_LOCKASSERT(x); \ while ((x)->flags & SD_F_BUSY) \ @@ -422,7 +320,6 @@ int sound_oss_card_info(oss_card_info *); mtx_unlock(&Giant); \ } \ } while (0) -#endif /* SND_DIAGNOSTIC */ #define PCM_GIANT_LEAVE(x) \ PCM_GIANT_EXIT(x); \ From nobody Thu Nov 20 13:54:43 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC0GD4XPSz6HQbs for ; Thu, 20 Nov 2025 13:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC0GD2hd8z48ZS for ; Thu, 20 Nov 2025 13:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763646884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y29m93qpucwHGj3C/l5y0wlVb6Z1lGw1lR4MFgeYRis=; b=O72PPWgQsr4c88LfUpzueO3frcIPZdwMZgx2PfjmhYREavwJSeR46FHVtZnQxmTHKvovlP H6wXI2reVWQIRH4dkYeEBK6EyFxJL1pEMy7WXMxxfYO53sdkDYvQxIIefneEggQrUONMmj xFJPXOLPOILSTT3h3rsXnQc1RVMnun6zV8MbL6PQZlKUQkg1+zXfDvVmFKNbSdTHXfKadz 9osRgjfaJXp5Kgk41dLeVLxIen41jhn56yWYKSU2UW/lVrElmJ78zsIBjhjJUGRiyhycnh zkOlrInMvFMFC1Pw64s363FL0HDhrN0DB86eml1ggZBLGXrr3W0JXfrfQj1JAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763646884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y29m93qpucwHGj3C/l5y0wlVb6Z1lGw1lR4MFgeYRis=; b=MWu4K/hSFwyZOB68IN/D7XzLD7LzuLd6r16bhtGQmI8Cn2ve4tt+I1xiKBdu+ttRWVOm50 nYSMpYs+LaaGlaNb6tdiIwX8iSFu/xH+IB29UoNi36Vx9RaZh8Vhh/kmz6GCqzMIJ/uJ4G gePKWsm+Hr6iN2Jh9FHwrTGvEOsNmI+/VAbziLhervh9A6qiWSCd0WV+tqhZPmAmz6JKE0 iZ5w2+nq4Fohtf5VzBOLOCRau/i7q5pnwfB2bRZ2t8oaTZixSexafb8sEY6Oh+C0fYv2jd ExPt27BacteAMTdL2hNOVbCT4eIZ56gmnUclkHM4MrZmaj+wv980GPSqgkhPaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763646884; a=rsa-sha256; cv=none; b=r+N8ByCbtjR/Omes3w3jTl5jkdbj3Mx7aZEoPRvPSiYHDiPjzhu9gCyr5pvVmMRCc6/3CJ kzWQAYlcqOtILZohuzgURLlTjJ6uVxS4oVr/0xeCc4xFYOWGOzQioqxhf72rydeCAsChqZ k9mFFPgLDhk5G8P6mX7MYkiWgyDvcLWNRlYh4zremapMV/6P7ItOx+KB1WPE/zlu39u3ef gnW4yf3QJ9feGpfcwsVIEM2OGoPxQyTekYPfVhdXH/vVrkEfY6CpMaaIkiVuV52IWs2ugC RWYMorav5IPIB+4pHdmOFfBU/WkzRUJoUdHDz6xB8+RunAqLgdoNh+D5/aVU2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC0GC71q4zDP9 for ; Thu, 20 Nov 2025 13:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2ebcb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:54:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9cafea4c44a7 - stable/15 - ObsoleteFiles.inc: Fix up incorrect merge List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9cafea4c44a7046ac2ac15b28471f9e09fceb6f9 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:54:43 +0000 Message-Id: <691f1da3.2ebcb.2448e8f6@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9cafea4c44a7046ac2ac15b28471f9e09fceb6f9 commit 9cafea4c44a7046ac2ac15b28471f9e09fceb6f9 Author: Mark Johnston AuthorDate: 2025-11-20 13:46:43 +0000 Commit: Mark Johnston CommitDate: 2025-11-20 13:47:44 +0000 ObsoleteFiles.inc: Fix up incorrect merge This is a direct commit to stable/15. Reported by: des Fixes: 838c8027f9d8 ("libexec/kgdb: Add new modules and install them together with debug info") --- ObsoleteFiles.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d9ef4033911e..6a61bf537561 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -62,9 +62,6 @@ OLD_FILES+=usr/lib/libnss_tacplus.a OLD_FILES+=usr/libexec/kgdb/acttrace.py OLD_DIRS+=usr/libexec/kgdb -# 20251001: test helper sendto-IP_MULTICAST_IF renamed -OLD_FILES+=usr/tests/sys/netinet/sendto-IP_MULTICAST_IF - # 20250930: Rename wlanstats to wlanstat OLD_FILES+=usr/sbin/wlanstats OLD_FILES+=usr/share/man/man8/wlanstats.8.gz From nobody Thu Nov 20 15:37:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC2YJ04Cyz6HXvg for ; Thu, 20 Nov 2025 15:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC2YH3RWlz3QJq for ; Thu, 20 Nov 2025 15:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763653075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aewqi2VMTY8GrnQMFe3WXgZcRgshNg0Fiz3NqmM/fxU=; b=wPz2Dy73hN1aIa9s6iE58ZTBVaZSdc6vATFU55DGU8Rm8zNGkp/bnoEeY8v/EWWLcJpcGg axZIcPuCw+NY7j2V5LHFYyzR65huXFzKfg16kj6ODgPdXH9nlCFMfe+dpb8xllbNC8+O12 SIh2s8FmRAUTMzVu1snIOcAmF39oxQd4Rq9BP10t7VxxuXtQAGE4yJlOCGiIjOz1ZQJ4hy WV0UtTxMhxyJdQYfjUpqeqAsp4Mv1AFYsLj3x5e+ERloil1T/tJljCGAPSafOns5CU3NrJ S+2ZPAMsvINFFIZoFdijTtcW0p+1fdUexuJfopS9jeeXZCN6Vv3QV0A+nNhK0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763653075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aewqi2VMTY8GrnQMFe3WXgZcRgshNg0Fiz3NqmM/fxU=; b=JSA9l7NUoDCSXcW8cawpBuniIjK4XFkc+qan4cZpWwTG7zqtFNiWdf9IdVr1AB94xAWIYA 5PO+IaK6Y4qB1mKkxvVGvPu5vaRGUG3XUWH/UUF+8BDgYRsfBZEhX8mZJJU2CL4RvNNVBy hX2gi+Ok5AUL9wa9Ef8Un0y9nUO0/qxfDS7Ujt+Xvq96BKwJx2LONjqv30+iYCD84CXagx 1OdUFFtkCUd9cZJJ3KXXfjJPFKk42Uu90hyo3PowR7mkzymoQ8HiFaB1qJ/amfLSqzOd+T zKSjNmb0Mh5vRB0tXVB7O6g2nPE5d3wP3iZRtr0smJbc+UdaLm4+PeQskkh8UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763653075; a=rsa-sha256; cv=none; b=aFCl1Hm10ET8jVAdBD16RdZqQ60NCozPm4/NcG8joSn1C3B95GQhQvKclkYSdfBHKqYcIP lpI71j9L3ZgD4W15q1m99hGH6wm3krdiICPAfzEvRPH7z5bMM/ASzSAItfssFLZvVxg9ls 01Wsj7pjol1TTQAWVuVneD9z8EHlWxRIk30q2QodmqqvV7h79OfMi3taOycfHWmnlS/89q Dw+oV3+wGQxp3YVgWQMA0uwtjih6usRmZP97c5sQvxSuZQF6lD6/Qdv0Re6Wiv4BgjLavq 0bDT6mGy/ribEc9Iiu+XSFC2+Bi6i1Hkz1+prNn8ui2Z4mYbLNZOduL/ZfnAuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC2YH23L6zYmS for ; Thu, 20 Nov 2025 15:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37c6f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 15:37:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f67361967214 - stable/14 - fdisk: Bump removal to FreeBSD 16.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f6736196721420caff102724b461e3a5211cfa09 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 15:37:55 +0000 Message-Id: <691f35d3.37c6f.371127b0@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f6736196721420caff102724b461e3a5211cfa09 commit f6736196721420caff102724b461e3a5211cfa09 Author: Ed Maste AuthorDate: 2025-10-24 15:08:25 +0000 Commit: Ed Maste CommitDate: 2025-11-20 15:37:34 +0000 fdisk: Bump removal to FreeBSD 16.0 Removal did not happen prior to 15.0. Sponsored by: The FreeBSD Foundation (cherry picked from commit f817f6e7f4a8dc507f3e1b1603dfd2d81093e3bd) (cherry picked from commit 739750ae7c63c653025ad84cac6ba7cb6756dcf8) (cherry picked from commit 2be4c64a0d27a9136cc05c9bdf7a45162339aa69) --- sbin/fdisk/fdisk.8 | 4 ++-- sbin/fdisk/fdisk.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index ea54a51a43ae..aa3a4ef0b6d2 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -1,5 +1,5 @@ .\" -.Dd October 5, 2016 +.Dd October 24, 2025 .Dt FDISK 8 .Os .Sh NAME @@ -18,7 +18,7 @@ .Sh DEPRECATION NOTICE .Nm is deprecated and is not available in -.Fx 15.0 +.Fx 16.0 or later. Use .Xr gpart 8 diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index a9295b0d1319..f65e3024d46f 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -266,7 +266,7 @@ main(int argc, char *argv[]) struct dos_partition *partp; fprintf(stderr, - "WARNING: fdisk is deprecated and is not available in FreeBSD 15 or later.\n" + "WARNING: fdisk is deprecated and is not available in FreeBSD 16 or later.\n" "Please use gpart instead.\n\n"); while ((c = getopt(argc, argv, "BIab:f:ipqstuv1234")) != -1) From nobody Thu Nov 20 15:38:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dC2ZP0ry3z6HYZP for ; Thu, 20 Nov 2025 15:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dC2ZN5GW9z3R6t for ; Thu, 20 Nov 2025 15:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763653132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=umEjtpkLy0cbOFJlJ8ItVSjQ36kKaXAM3RTSjDxmeXA=; b=ZkAzjz8ae7Hmc09cn7cl7KcfwqMHD4fiKYZTC2QiN8YAuU5c7FP0nLVZScGJ4BlEuojjoW k8gIFFZrJ05HUijoBrNT1RFKXETtuelMxcap3KZdE9FLHjtJn4wkyuNr1ZUTjv47otnfzg gkhW1vUnOdBWTp2Zp9ds2p9OTSLhmH7EEQtDJnIJ1Zyuj/j6pmAqQitbzeInfOMWFutoWm 34kQt7VEPUCzNLUzzdYSYHEFjzRv23I2sqUW2M3/rZKZjiqzwIrM3TdXfz+PmpfucEDOy2 NzIMVlKAZNf5mUYAN8Pq3oDYdzizb1pz8uWBlx42fvYk5gLrqUJ/1OOdptvhmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763653132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=umEjtpkLy0cbOFJlJ8ItVSjQ36kKaXAM3RTSjDxmeXA=; b=moDDvEn5pJc+jrNUVIu1NIFFhVDWSvKx0dLeSCuzpnU32v1NI1otmn82lUsIL0OJsi62EZ QmiILepuKKQ6gI5fdG1W9SSoL0SCBd18ZSvtan4ukKKAVUgrLMJtKLS+ZoPnxFZCkdHm17 G8YbgBemw2WBX5RZLWXMDiN9pF2GVG08rPoEgXRlMURlRALy+hINFIzJAM3t3H/2VaGs7C 1xoIu40BcJ+kIrmgmHn92i3e+WNviyMCi9cBDLekuZSpA5C8bASH0yGzDx5vLsRtuAZJtQ XMHLV1EwlJT0fsYQEvhbGyAt2cL10qkKHbHXlYkWMdXyM52RmghMlgT1Pm1jKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763653132; a=rsa-sha256; cv=none; b=jQ+34pklPVMSFG/utysiWHbnsKJcz24I5vRDLXXd99sFYUz8BROhEq4KDTFWGkP6JNX+nA WZ4sP+++AaeaIOZWnVHt/1diCnsDL90f7Sx1OTi7X5Ia1rcrr7/zEUhsm8WBoZyixkiBhF 3N6La6l2ifE5DrpPsMgtbRJVUATvA4XcGFOjkEWieZz6uY9cnYZMT3ZQk+1xvy6M0xo3Yy ip7cA6KCeVO9DLMvnx1CS68uqC5IqljYutaFmcNTJsE92/PRo+DSpO4N+7VA8dC3pKQvz+ 3zXfCoT2pGGZCV+mTxZZARslzQktq+g61XX8WjwBM8chUq+BAHUIjkdsZBiT1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dC2ZN4p6RzXfV for ; Thu, 20 Nov 2025 15:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 395a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 15:38:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 57865e505aef - stable/14 - ipfw: Retire obsolete compat code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 57865e505aef2dafb548039619de5d5322dd7157 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 15:38:52 +0000 Message-Id: <691f360c.395a7.72f96e1c@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=57865e505aef2dafb548039619de5d5322dd7157 commit 57865e505aef2dafb548039619de5d5322dd7157 Author: Ed Maste AuthorDate: 2025-10-24 20:15:01 +0000 Commit: Ed Maste CommitDate: 2025-11-20 15:37:34 +0000 ipfw: Retire obsolete compat code The current IPFW version 3 dates to 2010 (commit cc4d3c30ea28, "Bring in the most recent version of ipfw and dummynet, developed"). The compat code for FreeBSD 8 and earlier has a number of issues and is no longer needed, so remove it. Reported by: Ilja Van Sprundel Reviewed by: ae, glebius Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53343 (cherry picked from commit c59aab9a5b3970b3ccec744f759e6cb87e938dbe) (cherry picked from commit 9657c50cdd7741404d99881fdd9243175086ede1) --- sys/conf/files | 1 - sys/modules/dummynet/Makefile | 3 +- sys/netinet/raw_ip.c | 4 - sys/netpfil/ipfw/ip_dn_glue.c | 849 --------------------------------------- sys/netpfil/ipfw/ip_dn_private.h | 10 +- sys/netpfil/ipfw/ip_dummynet.c | 96 ++--- 6 files changed, 29 insertions(+), 934 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 427f6fdebf57..0ef8c0d3b062 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4481,7 +4481,6 @@ netpfil/ipfw/dn_sched_rr.c optional inet dummynet netpfil/ipfw/dn_sched_wf2q.c optional inet dummynet netpfil/ipfw/ip_dummynet.c optional inet dummynet netpfil/ipfw/ip_dn_io.c optional inet dummynet -netpfil/ipfw/ip_dn_glue.c optional inet dummynet netpfil/ipfw/ip_fw2.c optional inet ipfirewall netpfil/ipfw/ip_fw_bpf.c optional inet ipfirewall netpfil/ipfw/ip_fw_dynamic.c optional inet ipfirewall \ diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile index 6c7599eae45f..1c1eccbcaa91 100644 --- a/sys/modules/dummynet/Makefile +++ b/sys/modules/dummynet/Makefile @@ -1,8 +1,7 @@ .PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= dummynet -SRCS= ip_dummynet.c -SRCS+= ip_dn_glue.c ip_dn_io.c +SRCS= ip_dummynet.c ip_dn_io.c SRCS+= dn_aqm_codel.c dn_aqm_pie.c SRCS+= dn_heap.c dn_sched_fifo.c dn_sched_qfq.c dn_sched_rr.c dn_sched_wf2q.c SRCS+= dn_sched_prio.c dn_sched_fq_codel.c dn_sched_fq_pie.c diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 36258b3283d6..a0fcdd7d464c 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -682,7 +682,6 @@ rip_ctloutput(struct socket *so, struct sockopt *sopt) break; case IP_DUMMYNET3: /* generic dummynet v.3 functions */ - case IP_DUMMYNET_GET: if (ip_dn_ctl_ptr != NULL) error = ip_dn_ctl_ptr(sopt); else @@ -749,9 +748,6 @@ rip_ctloutput(struct socket *so, struct sockopt *sopt) break; case IP_DUMMYNET3: /* generic dummynet v.3 functions */ - case IP_DUMMYNET_CONFIGURE: - case IP_DUMMYNET_DEL: - case IP_DUMMYNET_FLUSH: if (ip_dn_ctl_ptr != NULL) error = ip_dn_ctl_ptr(sopt); else diff --git a/sys/netpfil/ipfw/ip_dn_glue.c b/sys/netpfil/ipfw/ip_dn_glue.c deleted file mode 100644 index 204b34091781..000000000000 --- a/sys/netpfil/ipfw/ip_dn_glue.c +++ /dev/null @@ -1,849 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa - * All rights reserved - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * - * Binary compatibility support for /sbin/ipfw RELENG_7 and RELENG_8 - */ - -#include "opt_inet6.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */ -#include -#include /* ip_output(), IP_FORWARDING */ -#include -#include - -#include -#include -#include -#ifdef NEW_AQM -#include -#endif -#include - -/* FREEBSD7.2 ip_dummynet.h r191715*/ - -struct dn_heap_entry7 { - int64_t key; /* sorting key. Topmost element is smallest one */ - void *object; /* object pointer */ -}; - -struct dn_heap7 { - int size; - int elements; - int offset; /* XXX if > 0 this is the offset of direct ptr to obj */ - struct dn_heap_entry7 *p; /* really an array of "size" entries */ -}; - -/* Common to 7.2 and 8 */ -struct dn_flow_set { - SLIST_ENTRY(dn_flow_set) next; /* linked list in a hash slot */ - - u_short fs_nr ; /* flow_set number */ - u_short flags_fs; -#define DNOLD_HAVE_FLOW_MASK 0x0001 -#define DNOLD_IS_RED 0x0002 -#define DNOLD_IS_GENTLE_RED 0x0004 -#define DNOLD_QSIZE_IS_BYTES 0x0008 /* queue size is measured in bytes */ -#define DNOLD_NOERROR 0x0010 /* do not report ENOBUFS on drops */ -#define DNOLD_HAS_PROFILE 0x0020 /* the pipe has a delay profile. */ -#define DNOLD_IS_PIPE 0x4000 -#define DNOLD_IS_QUEUE 0x8000 - - struct dn_pipe7 *pipe ; /* pointer to parent pipe */ - u_short parent_nr ; /* parent pipe#, 0 if local to a pipe */ - - int weight ; /* WFQ queue weight */ - int qsize ; /* queue size in slots or bytes */ - int plr ; /* pkt loss rate (2^31-1 means 100%) */ - - struct ipfw_flow_id flow_mask ; - - /* hash table of queues onto this flow_set */ - int rq_size ; /* number of slots */ - int rq_elements ; /* active elements */ - struct dn_flow_queue7 **rq; /* array of rq_size entries */ - - u_int32_t last_expired ; /* do not expire too frequently */ - int backlogged ; /* #active queues for this flowset */ - - /* RED parameters */ -#define SCALE_RED 16 -#define SCALE(x) ( (x) << SCALE_RED ) -#define SCALE_VAL(x) ( (x) >> SCALE_RED ) -#define SCALE_MUL(x,y) ( ( (x) * (y) ) >> SCALE_RED ) - int w_q ; /* queue weight (scaled) */ - int max_th ; /* maximum threshold for queue (scaled) */ - int min_th ; /* minimum threshold for queue (scaled) */ - int max_p ; /* maximum value for p_b (scaled) */ - u_int c_1 ; /* max_p/(max_th-min_th) (scaled) */ - u_int c_2 ; /* max_p*min_th/(max_th-min_th) (scaled) */ - u_int c_3 ; /* for GRED, (1-max_p)/max_th (scaled) */ - u_int c_4 ; /* for GRED, 1 - 2*max_p (scaled) */ - u_int * w_q_lookup ; /* lookup table for computing (1-w_q)^t */ - u_int lookup_depth ; /* depth of lookup table */ - int lookup_step ; /* granularity inside the lookup table */ - int lookup_weight ; /* equal to (1-w_q)^t / (1-w_q)^(t+1) */ - int avg_pkt_size ; /* medium packet size */ - int max_pkt_size ; /* max packet size */ -}; -SLIST_HEAD(dn_flow_set_head, dn_flow_set); - -#define DN_IS_PIPE 0x4000 -#define DN_IS_QUEUE 0x8000 -struct dn_flow_queue7 { - struct dn_flow_queue7 *next ; - struct ipfw_flow_id id ; - - struct mbuf *head, *tail ; /* queue of packets */ - u_int len ; - u_int len_bytes ; - - u_long numbytes; - - u_int64_t tot_pkts ; /* statistics counters */ - u_int64_t tot_bytes ; - u_int32_t drops ; - - int hash_slot ; /* debugging/diagnostic */ - - /* RED parameters */ - int avg ; /* average queue length est. (scaled) */ - int count ; /* arrivals since last RED drop */ - int random ; /* random value (scaled) */ - u_int32_t q_time; /* start of queue idle time */ - - /* WF2Q+ support */ - struct dn_flow_set *fs ; /* parent flow set */ - int heap_pos ; /* position (index) of struct in heap */ - int64_t sched_time ; /* current time when queue enters ready_heap */ - - int64_t S,F ; /* start time, finish time */ -}; - -struct dn_pipe7 { /* a pipe */ - SLIST_ENTRY(dn_pipe7) next; /* linked list in a hash slot */ - - int pipe_nr ; /* number */ - uint32_t bandwidth; /* really, bytes/tick. */ - int delay ; /* really, ticks */ - - struct mbuf *head, *tail ; /* packets in delay line */ - - /* WF2Q+ */ - struct dn_heap7 scheduler_heap ; /* top extract - key Finish time*/ - struct dn_heap7 not_eligible_heap; /* top extract- key Start time */ - struct dn_heap7 idle_heap ; /* random extract - key Start=Finish time */ - - int64_t V ; /* virtual time */ - int sum; /* sum of weights of all active sessions */ - - int numbytes; - - int64_t sched_time ; /* time pipe was scheduled in ready_heap */ - - /* - * When the tx clock come from an interface (if_name[0] != '\0'), its name - * is stored below, whereas the ifp is filled when the rule is configured. - */ - char if_name[IFNAMSIZ]; - struct ifnet *ifp ; - int ready ; /* set if ifp != NULL and we got a signal from it */ - - struct dn_flow_set fs ; /* used with fixed-rate flows */ -}; -SLIST_HEAD(dn_pipe_head7, dn_pipe7); - -/* FREEBSD8 ip_dummynet.h r196045 */ -struct dn_flow_queue8 { - struct dn_flow_queue8 *next ; - struct ipfw_flow_id id ; - - struct mbuf *head, *tail ; /* queue of packets */ - u_int len ; - u_int len_bytes ; - - uint64_t numbytes ; /* credit for transmission (dynamic queues) */ - int64_t extra_bits; /* extra bits simulating unavailable channel */ - - u_int64_t tot_pkts ; /* statistics counters */ - u_int64_t tot_bytes ; - u_int32_t drops ; - - int hash_slot ; /* debugging/diagnostic */ - - /* RED parameters */ - int avg ; /* average queue length est. (scaled) */ - int count ; /* arrivals since last RED drop */ - int random ; /* random value (scaled) */ - int64_t idle_time; /* start of queue idle time */ - - /* WF2Q+ support */ - struct dn_flow_set *fs ; /* parent flow set */ - int heap_pos ; /* position (index) of struct in heap */ - int64_t sched_time ; /* current time when queue enters ready_heap */ - - int64_t S,F ; /* start time, finish time */ -}; - -struct dn_pipe8 { /* a pipe */ - SLIST_ENTRY(dn_pipe8) next; /* linked list in a hash slot */ - - int pipe_nr ; /* number */ - uint32_t bandwidth; /* really, bytes/tick. */ - int delay ; /* really, ticks */ - - struct mbuf *head, *tail ; /* packets in delay line */ - - /* WF2Q+ */ - struct dn_heap7 scheduler_heap ; /* top extract - key Finish time*/ - struct dn_heap7 not_eligible_heap; /* top extract- key Start time */ - struct dn_heap7 idle_heap ; /* random extract - key Start=Finish time */ - - int64_t V ; /* virtual time */ - int sum; /* sum of weights of all active sessions */ - - /* Same as in dn_flow_queue, numbytes can become large */ - int64_t numbytes; /* bits I can transmit (more or less). */ - uint64_t burst; /* burst size, scaled: bits * hz */ - - int64_t sched_time ; /* time pipe was scheduled in ready_heap */ - int64_t idle_time; /* start of pipe idle time */ - - char if_name[IFNAMSIZ]; - struct ifnet *ifp ; - int ready ; /* set if ifp != NULL and we got a signal from it */ - - struct dn_flow_set fs ; /* used with fixed-rate flows */ - - /* fields to simulate a delay profile */ -#define ED_MAX_NAME_LEN 32 - char name[ED_MAX_NAME_LEN]; - int loss_level; - int samples_no; - int *samples; -}; - -#define ED_MAX_SAMPLES_NO 1024 -struct dn_pipe_max8 { - struct dn_pipe8 pipe; - int samples[ED_MAX_SAMPLES_NO]; -}; -SLIST_HEAD(dn_pipe_head8, dn_pipe8); - -/* - * Changes from 7.2 to 8: - * dn_pipe: - * numbytes from int to int64_t - * add burst (int64_t) - * add idle_time (int64_t) - * add profile - * add struct dn_pipe_max - * add flag DN_HAS_PROFILE - * - * dn_flow_queue - * numbytes from u_long to int64_t - * add extra_bits (int64_t) - * q_time from u_int32_t to int64_t and name idle_time - * - * dn_flow_set unchanged - * - */ - -/* NOTE:XXX copied from dummynet.c */ -#define O_NEXT(p, len) ((void *)((char *)p + len)) -static void -oid_fill(struct dn_id *oid, int len, int type, uintptr_t id) -{ - oid->len = len; - oid->type = type; - oid->subtype = 0; - oid->id = id; -} -/* make room in the buffer and move the pointer forward */ -static void * -o_next(struct dn_id **o, int len, int type) -{ - struct dn_id *ret = *o; - oid_fill(ret, len, type, 0); - *o = O_NEXT(*o, len); - return ret; -} - -static size_t pipesize7 = sizeof(struct dn_pipe7); -static size_t pipesize8 = sizeof(struct dn_pipe8); -static size_t pipesizemax8 = sizeof(struct dn_pipe_max8); - -/* Indicate 'ipfw' version - * 1: from FreeBSD 7.2 - * 0: from FreeBSD 8 - * -1: unknown (for now is unused) - * - * It is update when a IP_DUMMYNET_DEL or IP_DUMMYNET_CONFIGURE request arrives - * NOTE: if a IP_DUMMYNET_GET arrives and the 'ipfw' version is unknown, - * it is suppose to be the FreeBSD 8 version. - */ -static int is7 = 0; - -static int -convertflags2new(int src) -{ - int dst = 0; - - if (src & DNOLD_HAVE_FLOW_MASK) - dst |= DN_HAVE_MASK; - if (src & DNOLD_QSIZE_IS_BYTES) - dst |= DN_QSIZE_BYTES; - if (src & DNOLD_NOERROR) - dst |= DN_NOERROR; - if (src & DNOLD_IS_RED) - dst |= DN_IS_RED; - if (src & DNOLD_IS_GENTLE_RED) - dst |= DN_IS_GENTLE_RED; - if (src & DNOLD_HAS_PROFILE) - dst |= DN_HAS_PROFILE; - - return dst; -} - -static int -convertflags2old(int src) -{ - int dst = 0; - - if (src & DN_HAVE_MASK) - dst |= DNOLD_HAVE_FLOW_MASK; - if (src & DN_IS_RED) - dst |= DNOLD_IS_RED; - if (src & DN_IS_GENTLE_RED) - dst |= DNOLD_IS_GENTLE_RED; - if (src & DN_NOERROR) - dst |= DNOLD_NOERROR; - if (src & DN_HAS_PROFILE) - dst |= DNOLD_HAS_PROFILE; - if (src & DN_QSIZE_BYTES) - dst |= DNOLD_QSIZE_IS_BYTES; - - return dst; -} - -static int -dn_compat_del(void *v) -{ - struct dn_pipe7 *p = (struct dn_pipe7 *) v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *) v; - struct { - struct dn_id oid; - uintptr_t a[1]; /* add more if we want a list */ - } cmd; - - /* XXX DN_API_VERSION ??? */ - oid_fill((void *)&cmd, sizeof(cmd), DN_CMD_DELETE, DN_API_VERSION); - - if (is7) { - if (p->pipe_nr == 0 && p->fs.fs_nr == 0) - return EINVAL; - if (p->pipe_nr != 0 && p->fs.fs_nr != 0) - return EINVAL; - } else { - if (p8->pipe_nr == 0 && p8->fs.fs_nr == 0) - return EINVAL; - if (p8->pipe_nr != 0 && p8->fs.fs_nr != 0) - return EINVAL; - } - - if (p->pipe_nr != 0) { /* pipe x delete */ - cmd.a[0] = p->pipe_nr; - cmd.oid.subtype = DN_LINK; - } else { /* queue x delete */ - cmd.oid.subtype = DN_FS; - cmd.a[0] = (is7) ? p->fs.fs_nr : p8->fs.fs_nr; - } - - return do_config(&cmd, cmd.oid.len); -} - -static int -dn_compat_config_queue(struct dn_fs *fs, void* v) -{ - struct dn_pipe7 *p7 = (struct dn_pipe7 *)v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - struct dn_flow_set *f; - - if (is7) - f = &p7->fs; - else - f = &p8->fs; - - fs->fs_nr = f->fs_nr; - fs->sched_nr = f->parent_nr; - fs->flow_mask = f->flow_mask; - fs->buckets = f->rq_size; - fs->qsize = f->qsize; - fs->plr = f->plr; - fs->par[0] = f->weight; - fs->flags = convertflags2new(f->flags_fs); - if (fs->flags & DN_IS_GENTLE_RED || fs->flags & DN_IS_RED) { - fs->w_q = f->w_q; - fs->max_th = f->max_th; - fs->min_th = f->min_th; - fs->max_p = f->max_p; - } - - return 0; -} - -static int -dn_compat_config_pipe(struct dn_sch *sch, struct dn_link *p, - struct dn_fs *fs, void* v) -{ - struct dn_pipe7 *p7 = (struct dn_pipe7 *)v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - int i = p7->pipe_nr; - - sch->sched_nr = i; - sch->oid.subtype = 0; - p->link_nr = i; - fs->fs_nr = i + 2*DN_MAX_ID; - fs->sched_nr = i + DN_MAX_ID; - - /* Common to 7 and 8 */ - p->bandwidth = p7->bandwidth; - p->delay = p7->delay; - if (!is7) { - /* FreeBSD 8 has burst */ - p->burst = p8->burst; - } - - /* fill the fifo flowset */ - dn_compat_config_queue(fs, v); - fs->fs_nr = i + 2*DN_MAX_ID; - fs->sched_nr = i + DN_MAX_ID; - - /* Move scheduler related parameter from fs to sch */ - sch->buckets = fs->buckets; /*XXX*/ - fs->buckets = 0; - if (fs->flags & DN_HAVE_MASK) { - sch->flags |= DN_HAVE_MASK; - fs->flags &= ~DN_HAVE_MASK; - sch->sched_mask = fs->flow_mask; - bzero(&fs->flow_mask, sizeof(struct ipfw_flow_id)); - } - - return 0; -} - -static int -dn_compat_config_profile(struct dn_profile *pf, struct dn_link *p, - void *v) -{ - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - - p8->samples = &(((struct dn_pipe_max8 *)p8)->samples[0]); - - pf->link_nr = p->link_nr; - pf->loss_level = p8->loss_level; -// pf->bandwidth = p->bandwidth; //XXX bandwidth redundant? - pf->samples_no = p8->samples_no; - strncpy(pf->name, p8->name,sizeof(pf->name)); - bcopy(p8->samples, pf->samples, sizeof(pf->samples)); - - return 0; -} - -/* - * If p->pipe_nr != 0 the command is 'pipe x config', so need to create - * the three main struct, else only a flowset is created - */ -static int -dn_compat_configure(void *v) -{ - struct dn_id *buf = NULL, *base; - struct dn_sch *sch = NULL; - struct dn_link *p = NULL; - struct dn_fs *fs = NULL; - struct dn_profile *pf = NULL; - int lmax; - int error; - - struct dn_pipe7 *p7 = (struct dn_pipe7 *)v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - - int i; /* number of object to configure */ - - lmax = sizeof(struct dn_id); /* command header */ - lmax += sizeof(struct dn_sch) + sizeof(struct dn_link) + - sizeof(struct dn_fs) + sizeof(struct dn_profile); - - base = buf = malloc(lmax, M_DUMMYNET, M_WAITOK|M_ZERO); - o_next(&buf, sizeof(struct dn_id), DN_CMD_CONFIG); - base->id = DN_API_VERSION; - - /* pipe_nr is the same in p7 and p8 */ - i = p7->pipe_nr; - if (i != 0) { /* pipe config */ - sch = o_next(&buf, sizeof(*sch), DN_SCH); - p = o_next(&buf, sizeof(*p), DN_LINK); - fs = o_next(&buf, sizeof(*fs), DN_FS); - - error = dn_compat_config_pipe(sch, p, fs, v); - if (error) { - free(buf, M_DUMMYNET); - return error; - } - if (!is7 && p8->samples_no > 0) { - /* Add profiles*/ - pf = o_next(&buf, sizeof(*pf), DN_PROFILE); - error = dn_compat_config_profile(pf, p, v); - if (error) { - free(buf, M_DUMMYNET); - return error; - } - } - } else { /* queue config */ - fs = o_next(&buf, sizeof(*fs), DN_FS); - error = dn_compat_config_queue(fs, v); - if (error) { - free(buf, M_DUMMYNET); - return error; - } - } - error = do_config(base, (char *)buf - (char *)base); - - if (buf) - free(buf, M_DUMMYNET); - return error; -} - -int -dn_compat_calc_size(void) -{ - int need = 0; - /* XXX use FreeBSD 8 struct size */ - /* NOTE: - * - half scheduler: schk_count/2 - * - all flowset: fsk_count - * - all flowset queues: queue_count - * - all pipe queue: si_count - */ - need += V_dn_cfg.schk_count * sizeof(struct dn_pipe8) / 2; - need += V_dn_cfg.fsk_count * sizeof(struct dn_flow_set); - need += V_dn_cfg.si_count * sizeof(struct dn_flow_queue8); - need += V_dn_cfg.queue_count * sizeof(struct dn_flow_queue8); - - return need; -} - -int -dn_c_copy_q (void *_ni, void *arg) -{ - struct copy_args *a = arg; - struct dn_flow_queue7 *fq7 = (struct dn_flow_queue7 *)*a->start; - struct dn_flow_queue8 *fq8 = (struct dn_flow_queue8 *)*a->start; - struct dn_flow *ni = (struct dn_flow *)_ni; - int size = 0; - - /* XXX hash slot not set */ - /* No difference between 7.2/8 */ - fq7->len = ni->length; - fq7->len_bytes = ni->len_bytes; - fq7->id = ni->fid; - - if (is7) { - size = sizeof(struct dn_flow_queue7); - fq7->tot_pkts = ni->tot_pkts; - fq7->tot_bytes = ni->tot_bytes; - fq7->drops = ni->drops; - } else { - size = sizeof(struct dn_flow_queue8); - fq8->tot_pkts = ni->tot_pkts; - fq8->tot_bytes = ni->tot_bytes; - fq8->drops = ni->drops; - } - - *a->start += size; - return 0; -} - -int -dn_c_copy_pipe(struct dn_schk *s, struct copy_args *a, int nq) -{ - struct dn_link *l = &s->link; - struct dn_fsk *f = s->fs; - - struct dn_pipe7 *pipe7 = (struct dn_pipe7 *)*a->start; - struct dn_pipe8 *pipe8 = (struct dn_pipe8 *)*a->start; - struct dn_flow_set *fs; - int size = 0; - - if (is7) { - fs = &pipe7->fs; - size = sizeof(struct dn_pipe7); - } else { - fs = &pipe8->fs; - size = sizeof(struct dn_pipe8); - } - - /* These 4 field are the same in pipe7 and pipe8 */ - pipe7->next.sle_next = (struct dn_pipe7 *)DN_IS_PIPE; - pipe7->bandwidth = l->bandwidth; - pipe7->delay = l->delay * 1000 / hz; - pipe7->pipe_nr = l->link_nr - DN_MAX_ID; - - if (!is7) { - if (s->profile) { - struct dn_profile *pf = s->profile; - strncpy(pipe8->name, pf->name, sizeof(pf->name)); - pipe8->loss_level = pf->loss_level; - pipe8->samples_no = pf->samples_no; - } - pipe8->burst = div64(l->burst , 8 * hz); - } - - fs->flow_mask = s->sch.sched_mask; - fs->rq_size = s->sch.buckets ? s->sch.buckets : 1; - - fs->parent_nr = l->link_nr - DN_MAX_ID; - fs->qsize = f->fs.qsize; - fs->plr = f->fs.plr; - fs->w_q = f->fs.w_q; - fs->max_th = f->max_th; - fs->min_th = f->min_th; - fs->max_p = f->fs.max_p; - fs->rq_elements = nq; - - fs->flags_fs = convertflags2old(f->fs.flags); - - *a->start += size; - return 0; -} - -int -dn_compat_copy_pipe(struct copy_args *a, void *_o) -{ - int have = a->end - *a->start; - int need = 0; - int pipe_size = sizeof(struct dn_pipe8); - int queue_size = sizeof(struct dn_flow_queue8); - int n_queue = 0; /* number of queues */ - - struct dn_schk *s = (struct dn_schk *)_o; - /* calculate needed space: - * - struct dn_pipe - * - if there are instances, dn_queue * n_instances - */ - n_queue = (s->sch.flags & DN_HAVE_MASK ? dn_ht_entries(s->siht) : - (s->siht ? 1 : 0)); - need = pipe_size + queue_size * n_queue; - if (have < need) { - D("have %d < need %d", have, need); - return 1; - } - /* copy pipe */ - dn_c_copy_pipe(s, a, n_queue); - - /* copy queues */ - if (s->sch.flags & DN_HAVE_MASK) - dn_ht_scan(s->siht, dn_c_copy_q, a); - else if (s->siht) - dn_c_copy_q(s->siht, a); - return 0; -} - -int -dn_c_copy_fs(struct dn_fsk *f, struct copy_args *a, int nq) -{ - struct dn_flow_set *fs = (struct dn_flow_set *)*a->start; - - fs->next.sle_next = (struct dn_flow_set *)DN_IS_QUEUE; - fs->fs_nr = f->fs.fs_nr; - fs->qsize = f->fs.qsize; - fs->plr = f->fs.plr; - fs->w_q = f->fs.w_q; - fs->max_th = f->max_th; - fs->min_th = f->min_th; - fs->max_p = f->fs.max_p; - fs->flow_mask = f->fs.flow_mask; - fs->rq_elements = nq; - fs->rq_size = (f->fs.buckets ? f->fs.buckets : 1); - fs->parent_nr = f->fs.sched_nr; - fs->weight = f->fs.par[0]; - - fs->flags_fs = convertflags2old(f->fs.flags); - *a->start += sizeof(struct dn_flow_set); - return 0; -} - -int -dn_compat_copy_queue(struct copy_args *a, void *_o) -{ - int have = a->end - *a->start; - int need = 0; - int fs_size = sizeof(struct dn_flow_set); - int queue_size = sizeof(struct dn_flow_queue8); - - struct dn_fsk *fs = (struct dn_fsk *)_o; - int n_queue = 0; /* number of queues */ - - n_queue = (fs->fs.flags & DN_HAVE_MASK ? dn_ht_entries(fs->qht) : - (fs->qht ? 1 : 0)); - - need = fs_size + queue_size * n_queue; - if (have < need) { - D("have < need"); - return 1; - } - - /* copy flowset */ - dn_c_copy_fs(fs, a, n_queue); - - /* copy queues */ - if (fs->fs.flags & DN_HAVE_MASK) - dn_ht_scan(fs->qht, dn_c_copy_q, a); - else if (fs->qht) - dn_c_copy_q(fs->qht, a); - - return 0; -} - -int -copy_data_helper_compat(void *_o, void *_arg) -{ - struct copy_args *a = _arg; - - if (a->type == DN_COMPAT_PIPE) { - struct dn_schk *s = _o; - if (s->sch.oid.subtype != 1 || s->sch.sched_nr <= DN_MAX_ID) { - return 0; /* not old type */ - } - /* copy pipe parameters, and if instance exists, copy - * other parameters and eventually queues. - */ - if(dn_compat_copy_pipe(a, _o)) - return DNHT_SCAN_END; - } else if (a->type == DN_COMPAT_QUEUE) { - struct dn_fsk *fs = _o; - if (fs->fs.fs_nr >= DN_MAX_ID) - return 0; - if (dn_compat_copy_queue(a, _o)) - return DNHT_SCAN_END; - } - return 0; -} - -/* Main function to manage old requests */ -int -ip_dummynet_compat(struct sockopt *sopt) -{ - int error=0; - void *v = NULL; - struct dn_id oid; - - /* Length of data, used to found ipfw version... */ - int len = sopt->sopt_valsize; - - /* len can be 0 if command was dummynet_flush */ - if (len == pipesize7) { - D("setting compatibility with FreeBSD 7.2"); - is7 = 1; - } - else if (len == pipesize8 || len == pipesizemax8) { - D("setting compatibility with FreeBSD 8"); - is7 = 0; - } - - switch (sopt->sopt_name) { - default: - printf("dummynet: -- unknown option %d", sopt->sopt_name); - error = EINVAL; - break; - - case IP_DUMMYNET_FLUSH: - oid_fill(&oid, sizeof(oid), DN_CMD_FLUSH, DN_API_VERSION); - do_config(&oid, oid.len); - break; - - case IP_DUMMYNET_DEL: - v = malloc(len, M_TEMP, M_WAITOK); - error = sooptcopyin(sopt, v, len, len); - if (error) - break; - error = dn_compat_del(v); - free(v, M_TEMP); - break; - - case IP_DUMMYNET_CONFIGURE: - v = malloc(len, M_TEMP, M_NOWAIT); - if (v == NULL) { - error = ENOMEM; - break; - } - error = sooptcopyin(sopt, v, len, len); - if (error) - break; - error = dn_compat_configure(v); - free(v, M_TEMP); - break; - - case IP_DUMMYNET_GET: { - void *buf; - int ret; - int original_size = sopt->sopt_valsize; - int size; - - ret = dummynet_get(sopt, &buf); - if (ret) - return 0;//XXX ? - size = sopt->sopt_valsize; - sopt->sopt_valsize = original_size; - D("size=%d, buf=%p", size, buf); - ret = sooptcopyout(sopt, buf, size); - if (ret) - printf(" %s ERROR sooptcopyout\n", __FUNCTION__); - if (buf) - free(buf, M_DUMMYNET); - } - } - - return error; -} diff --git a/sys/netpfil/ipfw/ip_dn_private.h b/sys/netpfil/ipfw/ip_dn_private.h index ea5b809d8d28..bb5013df124e 100644 --- a/sys/netpfil/ipfw/ip_dn_private.h +++ b/sys/netpfil/ipfw/ip_dn_private.h @@ -428,15 +428,7 @@ struct copy_args { }; struct sockopt; -int ip_dummynet_compat(struct sockopt *sopt); -int dummynet_get(struct sockopt *sopt, void **compat); -int dn_c_copy_q (void *_ni, void *arg); -int dn_c_copy_pipe(struct dn_schk *s, struct copy_args *a, int nq); -int dn_c_copy_fs(struct dn_fsk *f, struct copy_args *a, int nq); -int dn_compat_copy_queue(struct copy_args *a, void *_o); -int dn_compat_copy_pipe(struct copy_args *a, void *_o); -int copy_data_helper_compat(void *_o, void *_arg); -int dn_compat_calc_size(void); +int dummynet_get(struct sockopt *sopt); int do_config(void *p, size_t l); /* function to drain idle object */ diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c index b3f52322425f..9c7ae06db294 100644 --- a/sys/netpfil/ipfw/ip_dummynet.c +++ b/sys/netpfil/ipfw/ip_dummynet.c @@ -2198,9 +2198,6 @@ compute_space(struct dn_id *cmd, struct copy_args *a) case DN_FS: /* queue show */ x = DN_C_FS | DN_C_QUEUE; break; - case DN_GET_COMPAT: /* compatibility mode */ - need = dn_compat_calc_size(); - break; } a->flags = x; if (x & DN_C_SCH) { @@ -2226,11 +2223,9 @@ compute_space(struct dn_id *cmd, struct copy_args *a) } /* - * If compat != NULL dummynet_get is called in compatibility mode. - * *compat will be the pointer to the buffer to pass to ipfw */ int -dummynet_get(struct sockopt *sopt, void **compat) +dummynet_get(struct sockopt *sopt) { int have, i, need, error; char *start = NULL, *buf; @@ -2248,37 +2243,28 @@ dummynet_get(struct sockopt *sopt, void **compat) *** 130 LINES SKIPPED *** From nobody Fri Nov 21 00:00:03 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCFhg5Yqfz6J7pQ for ; Fri, 21 Nov 2025 00:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCFhg514Qz4QLm for ; Fri, 21 Nov 2025 00:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763683203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0lv9UvFUfHKIslAlttbdSQJw19wk6g4ctI/ZcwkcoDI=; b=nc/70xI1/ANQRnzzqurm5N+17cs5Y1qZ9VFCrPhwKy5iG4xKi8ZKcaBANpDixPgeedDRxi M+t7HMUi17OPnCg15TXKSudomObsUPxJZKEm/AkxSQGFu/M1wUNwWrfi+HDl1id/cHlgky 3mpopsZRtjj01NBo5m5He+vOcP68E209vBoBz0xyn66Q5PQ4q5S8Kvd84d8kJW5Kwf50j4 RSjC5RVGjxO0Jz/ivt8XYuuaJiTVanQHDGUcq2K5VEljwZquhMv1y+MyIsl5TYLke4EBZz 76oL3XudfP8vDSpuMO1DPK/nk+1uG/dfM1cS/rwSd7hBGYeQOwAKzD6LZDWGkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763683203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0lv9UvFUfHKIslAlttbdSQJw19wk6g4ctI/ZcwkcoDI=; b=nBaXy6fp+kEUNbmY9hb5Ov3r9GC5tkZ+idY/UcJFMQGZLe2GkySTegvoeRUiCgJXZM2dof g31sXE/35IExM2T/98RWEINMGfHsSwvXtvzvrysSfbQdO88H+9rGImQ3SNo78o3X/pW7R8 3f0atzL+lQtjONrzP2wRKtOe8gAGRqWHUN/MT8SvP1gA0woey0rowunYZuXuT9578K8h3S fRRkgCzsFTKMcpi6XiK+uO5vcCly9YxYHuI2erCDlsu9GiQ2ONdA/G6ZqbJ2gli0hR+JTC DR4vxboRt79N61jDNOmJ7vN14l3Ex/rkcfIpGwzk+ycuZAV+b0LPet9hLL5cig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763683203; a=rsa-sha256; cv=none; b=MIPI68qu7E5LF2HJqnWTfJp89bD09F1W0UkZ+ms7jqNTU3jIGFu2GI/+u/6zfg20nT7D4u ZZuwJbxu+te7+r8wrL8MtLf6LBYzOhI8sMmfUHytXcTK+QmVoq04VxdjoU/4YvgwdfJbsM RzJ1At0rU3F0XiO5L5eg6WP8zNw7OGcB0LyU0pgvbSnPSxv2nJSU/EpNdWhxBMcxC/wikd qkMgAexIbfWuW7nzeilyLov0Og+IoI4V5cp4tXqZSKDcQYpIHxH9HiWkxsKUbBFTJFalXG G2dRtxZtRBh06q7ub9wJV508gAk1jtm1yzOUySWxLzD0SpB/gKqmNk1CA44zgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCFhg4cbPzpQB for ; Fri, 21 Nov 2025 00:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9c61 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 00:00:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 4579378a950f - releng/15.0 - 15.0: Update to RC3 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 4579378a950faa193f2607af55a2b5538e773cb4 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 00:00:03 +0000 Message-Id: <691fab83.9c61.57b989c5@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4579378a950faa193f2607af55a2b5538e773cb4 commit 4579378a950faa193f2607af55a2b5538e773cb4 Author: Colin Percival AuthorDate: 2025-11-21 00:00:00 +0000 Commit: Colin Percival CommitDate: 2025-11-21 00:00:00 +0000 15.0: Update to RC3 Approved by: re (implicit) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d04589d00eb3..e5095a8b04bc 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -51,7 +51,7 @@ TYPE="FreeBSD" REVISION="15.0" -BRANCH="RC2" +BRANCH="RC3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Nov 21 08:41:34 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCTGQ59HQz6Gqbc for ; Fri, 21 Nov 2025 08:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCTGQ3YVdz42wH for ; Fri, 21 Nov 2025 08:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763714494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yZcOEsfF1zyxkiTDJdNUcLMHrE2ovZlYjkrN1FTNoh8=; b=vpJVyCme4up1h/M73BRqrAv7OfLcKvru3T+QKqPjUqoWQcHBN025pXxY1uNH+fD718cdTV yyaYyNh+VBp6e956c9H3qWX+oeTCoKEJu2awBs8CrhAkYT5PoBP4E0ZZ3pue2eLjMGinz4 I3dRJD9FMm6Z8kAZyqpTCDoCRxkmZY0szMmCV2tpLKXsQG+KMpuaEZj2XFyLT7bW67rds9 +FvSPVxilEgAdk6cC3a9lJPQPCbS6pJ1cjKOeHnjL61kpt1lQm68iwpbKirzMCmonU+ack Jj+Q4QRqKO1GG8HvRd6I6hJ13H+Cs8QpwpUFsW9HIuUMzdSo52D9Xxwa3Nnwhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763714494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yZcOEsfF1zyxkiTDJdNUcLMHrE2ovZlYjkrN1FTNoh8=; b=SZ1oBGkiKI8TAiu4mwMT1LmvDU0B1k+wgmpb9o9wPPGIh3PN1sfDb8kLfTlTsYb9jhA5cK QL0DKHFpo42XthJSbQX6JqP3cnGODC3IqLym02R+mseOPbZ5wvRdmF9qVBbAZxfzaCy4r6 +RjwhsfOYzwr+IvXEbdOWkmCU9eKJBpdRwiQ8p63Q8AgNGjcDIM5ic/xDUSNP9kOSFoU0c m8VBeO+zMqt8SYYyZ0bFCCxpdQo6bnjlIZV/eEz851vjbI/BHgC3aVP+aEF/U8zS5SBaCw 8kTrRmUc52xRXPpws/l4hSZ7AyxtRC6goaOO7W+jMX5SOirrJZTZ5wK3xVL2LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763714494; a=rsa-sha256; cv=none; b=HLCWeSS/H//+u99edQy1Cnh2Ihy0/MhOb4Kl9+QT4M9IfZOVI+JV52qUkwNEOyIHAkGIol MuvFpO6pnssCndPnxA8Yn3lI2XsY+YwbGn0zq1XgZWmGUfxVz4I6xebYDGouuL30hCdSD7 yu+bJTvEgug+jQYw6BNcU+fOZRa/WixhjySJxTUIxMop7sPQv3VDOi0ZSGE41SQihCTvFt hKs7Auw5VXKaCWTwtPUGRhxWnSP4aBcXqOzCXDgeOckXRgYRkStc6GW5NrvK7S4ipN3I18 +SvQkTPNWlWmtCTg8jX6yDOsSATjDTO/eHe+c8JTgEbMAFEIfThbcmmssz/hxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCTGQ2hHVz14Hj for ; Fri, 21 Nov 2025 08:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31b1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 08:41:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0d8535e7724a - stable/15 - exterror.9 man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0d8535e7724a5e7e9119b2c46a74b8d7fc7ae87d Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 08:41:34 +0000 Message-Id: <692025be.31b1e.341fc556@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0d8535e7724a5e7e9119b2c46a74b8d7fc7ae87d commit 0d8535e7724a5e7e9119b2c46a74b8d7fc7ae87d Author: Konstantin Belousov AuthorDate: 2025-11-04 21:45:55 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-21 08:41:11 +0000 exterror.9 man page (cherry picked from commit 0eca7fa1c96f779039dd70eeeb0585ac12d153da) --- share/man/man9/Makefile | 1 + share/man/man9/exterror.9 | 137 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 4cea099b6c07..bdf85363c8e1 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -150,6 +150,7 @@ MAN= accept_filter.9 \ EVENTHANDLER.9 \ eventtimers.9 \ extattr.9 \ + exterror.9 \ fail.9 \ fdt_pinctrl.9 \ fetch.9 \ diff --git a/share/man/man9/exterror.9 b/share/man/man9/exterror.9 new file mode 100644 index 000000000000..79197e4a187d --- /dev/null +++ b/share/man/man9/exterror.9 @@ -0,0 +1,137 @@ +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 The FreeBSD Foundation +.\" +.\" This documentation was written by +.\" Konstantin Belousov under sponsorship +.\" from the FreeBSD Foundation. +.\" +.Dd November 5, 2025 +.Dt EXTERROR 9 +.Os +.Sh NAME +.Nm exterror +.Nd provide extended error information to userspace +.Sh SYNOPSIS +.Bd -literal -offset left -compact +#define EXTERR_CATEGORY EXTERR_CAT_MYCATEGORY +.Ed +.In sys/exterrvar.h +.Ft int +.Fn EXTERROR "int error" "const char *msg" ... +.Sh DESCRIPTION +The +.Nm +framework allows the kernel to return additional information about an error +along with the standard +.Xr errno 3 +error code, which is terse and often lacking context. +.Pp +The terseness is especially visible with commonly overloaded error codes like +.Er EINVAL +or +.Er EIO , +which occur at many places for a given syscall, or even +outside the context of the current kernel call. +Identifying the specific cause for the returned error using only the +.Va errno +value requires searching for all instances that the error is returned +in the kernel and trying to guess which is the most likely code path +to have returned the error. +.Nm +attaches additional data to the error itself +and records the error category and +the kernel source code file line number. +The intent of +.Nm +is to make it easier for a user to identify the cause of the error. +.Sh USAGE +Before +.Nm +can be used in the given source .c file, the category of extended errors +should be allocated in the +.In sys/exterr_cat.h +file. +The category is the unique integer, that, together with the source +line number, uniquely identifies the extended error occurrence. +Then, the +.Va EXTERR_CATEGORY +symbol should be defined as an alias for the allocated category, as +shown in the summary. +.Pp +A typical code fragment to report an error is just +.D1 return (EINVAL); +An extended error can augment the error code with additional information: +.D1 return (EXTERROR(EINVAL, \[dq]Invalid length\[dq])); +The error data and metadata is saved in the current thread storage. +The metadata includes the category and the source file line number. +.Pp +Arguments to the +.Fn EXTERROR +macro: +.Bl -dash +.It +The first argument to +.Fn EXTERROR +is the errno error code. +.It +The second argument is a constant string with the unbound lifetime, +which should tersely provide enough human-readable details about +the error. +.It +The +.Fn EXTERROR +macro can take two optional 64-bit integer arguments, +whose meaning is specific to the subsystem. +.El +.Pp +The strings passed as the second argument are only retained +in the kernel text if the +.Cd option EXTERR_STRINGS +was enabled in the kernel config. +Otherwise they are stripped at compile time and are not available +to userspace at runtime. +.Pp +The +.Fn EXTERROR +macro can be used in any context where the current thread is defined. +Specifically, +.Fn EXTERROR +cannot be used in interrupt contexts and context switch code. +Additionally, use of +.Fn EXTERROR +in kernel threads is not sensible as there is no userspace to retrieve +the extended error data. +.Sh USERSPACE ACCESS TO EXTENDED ERROR DATA +There is no syscall overhead for using +.Nm +in the non-error case. +When an error occurs that has supplied extended information, +the kernel copies out that information into the userspace +per-thread area that was registered with the kernel, typically on +image activation, or later at thread startup. +The area is controlled by the +.Xr exterrctl 2 +internal syscall, normally done by the userspace C runtime. +.Pp +Userspace programs do not need to access the extended information +area directly. +There is no field that is stable for the specific error condition. +Instead, the base +.Lb c +functions +.Xr err 3 +and +.Xr warn 3 +were modified to print the extended information if it is available +in addition to the usual +.Va errno +decoding. +.Sh SEE ALSO +.Xr errno 3 , +.Xr err 3 +.Sh HISTORY +The +.Nm +facility was introduced in +.Fx 15.0 . From nobody Fri Nov 21 14:25:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvM3JyFz6HGbM for ; Fri, 21 Nov 2025 14:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCcvM0r78z3fyR for ; Fri, 21 Nov 2025 14:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/RnxGjX/eCyyPq54RJo4H93OOeRDVVpPRK0zIRFOQ/c=; b=BHpoSoV6nxNsAxMm0wYX+NESCuHhuFFLx6F6XO+tOI+TfTONWh1xj8okAICoqqUlgfbWhr hR1CNVtzzd6S/X8wvgXGzxH3xWD0D0c5GgHpAqH8SCSrR4CQzUntMbW69KGG4HKklyVdA9 kWvOldzk9OC/CHzl16TWekEoLd34rFLoMSnJ+lBE8V16qQcHSkNypv/6/lnffHyg4E9N0l gg+0ZwWMrloARDymlYu0w+l91FVYNrDTG52W7vh6EOUAra+KSwJD6LFlJYelhHcJm8Wklp LtaetAVver3p+j/TA12P4t/+ZtD9NM60zoQ7cjBXRcaICT+vb133ZbIDeMtCTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/RnxGjX/eCyyPq54RJo4H93OOeRDVVpPRK0zIRFOQ/c=; b=jLvYU1LeDNyNDMnJbIlde9F8z8BK6Of11eSOhSuMlh/6DP20jQywEQJc0YtInBIjQ9p9X8 u4mT0GW3fsP4Xne5qtbhIw0fFiLw5Oora7ZD8A6RxmE9RYNIeWQd+xWJ0J9APi+XwqVqef 3ZFXssR+HlDUbHZH/Odfth+buIWXXMFw1SJ7i835UzEbKrPgIcTfTJBGO/O3N14PBAo9XV oLOliYA7jSuaKpp9avVN6T89XItZUSJ8oJ46MJh8rg/IhnW6ogIgXaKswTd32pTH4GccSq HRfTXwtrpGfaN6B/4V6HM9F3H1eROkhkj2BkH9ykJ+uVVMZdOeuYktME4NX+iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763735135; a=rsa-sha256; cv=none; b=Vh0P4Ts7X3pQlsyZ8Q0H5iRsQHXVCtVDGuEBZhE+t83qxeKWkfN65CCjW5iJZ+J9FiPisW FsSjiQ+MgKNDbSJzqrtAlmEY663kk7UjXva8VZhPsoxIkpHGt/7R10dT6SVQpohxt8ks/U Pw32V0YviGbtOJ+qVbKPgwaAncoIJ9oguKZfEwRjIfJ/F7+Jw5NfI7G5tNxeXf6H+mmS/Q ttX4e2MD/zjcrXgV/Oaavx95IQvVTGEG4Ha2LBJW9c9qYxZnWLLI9RoykzqKmylqWvDMga sOvdrfXR0uw2dX6VTYi/L5/CtrscXgBfi3/yqI/rthotwQDipXfKER0HwN+WAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvM0RMcz1LP for ; Fri, 21 Nov 2025 14:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c8ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 14:25:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a7d052994e87 - stable/15 - queue.3: Add MLINKs for *_EMPTY_ATOMIC List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a7d052994e87969c0242d9f9e7fedef859be2ef3 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 14:25:35 +0000 Message-Id: <6920765f.2c8ae.2b5c80e7@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a7d052994e87969c0242d9f9e7fedef859be2ef3 commit a7d052994e87969c0242d9f9e7fedef859be2ef3 Author: Mark Johnston AuthorDate: 2025-11-10 15:30:50 +0000 Commit: Mark Johnston CommitDate: 2025-11-21 14:15:46 +0000 queue.3: Add MLINKs for *_EMPTY_ATOMIC MFC after: 1 week Fixes: d2870b8666f2 ("queue: Add atomic variants for *_EMPTY") (cherry picked from commit 1563da200d4d3d56799267f1bbc58933a6c21331) --- share/man/man3/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 18e439491793..bce57291f073 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -203,6 +203,7 @@ MLINKS+= Q_SIGNSHFT.3 Q_SSIGN.3 \ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 LIST_CLASS_HEAD.3 \ queue.3 LIST_EMPTY.3 \ + queue.3 LIST_EMPTY_ATOMIC.3 \ queue.3 LIST_ENTRY.3 \ queue.3 LIST_FIRST.3 \ queue.3 LIST_FOREACH.3 \ @@ -224,6 +225,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 SLIST_CLASS_ENTRY.3 \ queue.3 SLIST_CLASS_HEAD.3 \ queue.3 SLIST_EMPTY.3 \ + queue.3 SLIST_EMPTY_ATOMIC.3 \ queue.3 SLIST_ENTRY.3 \ queue.3 SLIST_FIRST.3 \ queue.3 SLIST_FOREACH.3 \ @@ -246,6 +248,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 STAILQ_CLASS_HEAD.3 \ queue.3 STAILQ_CONCAT.3 \ queue.3 STAILQ_EMPTY.3 \ + queue.3 STAILQ_EMPTY_ATOMIC.3 \ queue.3 STAILQ_ENTRY.3 \ queue.3 STAILQ_FIRST.3 \ queue.3 STAILQ_FOREACH.3 \ @@ -270,6 +273,7 @@ MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 TAILQ_CLASS_HEAD.3 \ queue.3 TAILQ_CONCAT.3 \ queue.3 TAILQ_EMPTY.3 \ + queue.3 TAILQ_EMPTY_ATOMIC.3 \ queue.3 TAILQ_ENTRY.3 \ queue.3 TAILQ_FIRST.3 \ queue.3 TAILQ_FOREACH.3 \ From nobody Fri Nov 21 14:25:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvN3nG3z6HH1P for ; Fri, 21 Nov 2025 14:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCcvN1yJqz3fZJ for ; Fri, 21 Nov 2025 14:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kBMtHBtxGtC8vBo4bcA8vSMhpMcFlZwEHsE5w/WsUQ=; b=BBSlnddKgcgTfRluBJlyIXavOberWgdKRvChjEiA8MZeB8ykQ2ahFQ8twmukrDnDkcUBFY gM03xIO+rVnI+2EzkeLclLs487ODn36nRqtUDDn4X+RJTdR3E+uNlTDbMCjbWMX07rodW8 yXaf6BDfUC3m4pN7pmJaA19Sacm/h7gjgz/w3hTpSXp+BtimhdtmcaUSOhMLxuojFCSH50 4X5+hgFJrdLN9cU6mR+JeBXnxshHla8atxbfVZhSv1LUUyjURggBfYTSuRVKsYAbv+E+UX QVtP/36NEmj1Xf4v/elLcUKl/bnsBg9UdI+vXoCDMisRZHFEcKmy366LjYarww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kBMtHBtxGtC8vBo4bcA8vSMhpMcFlZwEHsE5w/WsUQ=; b=c74CdsKqvpquyjl8iuz3PHpHYVDv/NkpGyMAiAosjg5DOVfXgalyOerPSb+SiSQk62KYoc PusaO42mly49I0jbt5/mHDNHAC2yOL6GMTPqm+9kjbLlUNeyS16HDwpTl/7sArX0WLwZD0 epFnRJdHqqthgkYv1vc6jP1dnFtct1DlBBVLO7ujUOdlDOoELij05NFV4BW7TczdcAcHm6 pGDxfLcsXxevqDyfESOuVa8UFk2BoBlJj08rQRAUYEHT0p3HWLzVTwtZ/pVXxSgdPHKJ2a u5TS0mJBtGs7RixlEG4+8aTmUiPUNJTc8qSp1Jyc6UGULwAO7i7u0Ntd3u/mkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763735136; a=rsa-sha256; cv=none; b=M6WBGL/OSGerQ9mkH6MDbO3/AIllPEvnHWqf9W8tF0QiH4egtigu/Lh9v30xXiWKgA9bWn 85DkA1kIClq5JVvBewzZLOJ5PDZLmvfSHy8dHxMg+Pl7sfSuu2T3yZxRK3iZP6dLp0xbGI I2sQoW3q5K2797qNAX/ChEnb5mlHOsiqORfZ/tkMne/Zkt4YHakilZbi1Qxc/gXZhzRKRq K0F29p6rjXSAQZxlezluRTmkwhCZqIyDdOA4pyM7mvUOnRJi9Dm8Rgxl3KQp7XyagFjbTh IytQ6E5e16VjRYUKQ9vdQEAOpKvd42uJAwjaV5ANQ93oYZc7x4VM3sEGicW+tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvN1YwMzxY for ; Fri, 21 Nov 2025 14:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c863 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 14:25:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7c1579142208 - stable/15 - unix: Remove an always-false null pointer check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7c15791422080eea051a9a2ae47f7923a972922d Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 14:25:36 +0000 Message-Id: <69207660.2c863.bdc9e5c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7c15791422080eea051a9a2ae47f7923a972922d commit 7c15791422080eea051a9a2ae47f7923a972922d Author: Mark Johnston AuthorDate: 2025-11-13 22:57:35 +0000 Commit: Mark Johnston CommitDate: 2025-11-21 14:15:53 +0000 unix: Remove an always-false null pointer check No functional change intended. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53453 (cherry picked from commit ce5692bf009ed5607d3b880eec4055697479c13d) --- sys/kern/uipc_usrreq.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 21c0b388a9ac..1d0e1c4f8db6 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -3212,11 +3212,9 @@ unp_disconnect(struct unpcb *unp, struct unpcb *unp2) #endif LIST_REMOVE(unp, unp_reflink); UNP_REF_LIST_UNLOCK(); - if (so) { - SOCK_LOCK(so); - so->so_state &= ~SS_ISCONNECTED; - SOCK_UNLOCK(so); - } + SOCK_LOCK(so); + so->so_state &= ~SS_ISCONNECTED; + SOCK_UNLOCK(so); break; case SOCK_STREAM: From nobody Fri Nov 21 14:25:37 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvP4Pr6z6HH64 for ; Fri, 21 Nov 2025 14:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCcvP2Xs9z3frG for ; Fri, 21 Nov 2025 14:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjPVH4rU0dCMlso/daGPIL9y9FZ2IGc3/PTYzr9nI+Q=; b=fYKel2fp8f/AK7N/2+xpi/IHigCm4ltvhlhhjKc6b7D4MzA6NmYopIWiiY4V1cqPPu9IhY LRWZZdL6HPi2AXtIZMMNBSb27Joc4a6VR4OA8aYABSQb9R73YooP45eaFGPPrruZuHibi8 490ECVjS2Ay3qFEGLNmPOgAvJLWMnhsjWJlQovKJDusfDfajMiZjecR7gLXcZb4zuyA6gQ G14b9ZS8meZrJuhic69MUjwoDOrGqNMDRf6mooHbG4XmDCbId61qxidjyxAy4SPICiDghl H5acBL83PiLJdqOEDvd0c75FQpZx8RsKs16bI9qDNZkSQe/qNyxvYcsLxLt9qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763735137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjPVH4rU0dCMlso/daGPIL9y9FZ2IGc3/PTYzr9nI+Q=; b=SEWFy1sfFherqZ94sIUonLgatubYdazKq/luEiLv82zXz5CySrn5I9gZyMilo/I1EuL4Ea WVSlfixcmBQbZyqx/XyKKkA5ifEnGdeVLK4S0nkVHEbZ1v4qYT9uEwWmy6C7HwPWiu0zYT 230ZH6GwHjGVCKZz4CDwGHQ31EVJCXBdIoDAS4EAO9bQB12AkLhzMJJgIW2LyO3vi0j3Nn ZD3qmpshJLeZeYtiC/BDz3lI0z47N3WvRR7m1CVNqMhHdNkL61jSddOEp8dDVWyIPQPdMp /bf0Ma5hla/Q53ZkVqrQr0b5bO4SoWsSfESyP222BpaHazJmjydJItmzj8JRTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763735137; a=rsa-sha256; cv=none; b=BH09p/7s4VEOKo+qzw4dquVb4p++VTlkCn97pDS+FNRxqTCQaFoYGuSC50BPXevrKcWone efgbFAvC5ZOGdN3EcTG1efzazdDo49FTDAy6q31zbB86xEsU3tNJlz+x5RbLWha4q3iY/y 5K6QiTM8IIRuRwdZppBqE8OYEen9yX6dkf92UN2bViWfUCiTVNtyyiqEH0+hBysjlIU5cY 3fKpYv6X+im0rtroyy5ZNqwjLkM83M31zpSwZpF6Dt5ZOcrWaBsLxz572BgFAC9vOD7z32 s2HjJiO7D14jx8yNbQABQ5whMPdGJydpYuh6biLraxhK7yXGkjZqU3Xe7dbMiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCcvP23KPzvV for ; Fri, 21 Nov 2025 14:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c12f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 14:25:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f7c3aa281504 - stable/15 - unix: Fix handling of listening sockets during garbage collection List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f7c3aa2815043c6ac22bcbbec970343ab38025c3 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 14:25:37 +0000 Message-Id: <69207661.2c12f.600ec01e@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c3aa2815043c6ac22bcbbec970343ab38025c3 commit f7c3aa2815043c6ac22bcbbec970343ab38025c3 Author: Mark Johnston AuthorDate: 2025-11-13 22:56:15 +0000 Commit: Mark Johnston CommitDate: 2025-11-21 14:16:00 +0000 unix: Fix handling of listening sockets during garbage collection socantrcvmore() and unp_dispose() assume that the socket's socket buffers are initialized, which isn't the case for listening sockets. Reported by: syzbot+a62883292a5c257703be@syzkaller.appspotmail.com MFC after: 1 week Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D53743 (cherry picked from commit 9d9fa9a2c22f67d5f8afec18106c9f0072d6b3d4) --- sys/kern/uipc_usrreq.c | 10 ++++++---- tests/sys/kern/unix_passfd_test.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 1d0e1c4f8db6..05e267b8ae2b 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -4202,10 +4202,12 @@ unp_gc(__unused void *arg, int pending) struct socket *so; so = unref[i]->f_data; - CURVNET_SET(so->so_vnet); - socantrcvmore(so); - unp_dispose(so); - CURVNET_RESTORE(); + if (!SOLISTENING(so)) { + CURVNET_SET(so->so_vnet); + socantrcvmore(so); + unp_dispose(so); + CURVNET_RESTORE(); + } } /* diff --git a/tests/sys/kern/unix_passfd_test.c b/tests/sys/kern/unix_passfd_test.c index 7dc4541ad402..66bb406ea14e 100644 --- a/tests/sys/kern/unix_passfd_test.c +++ b/tests/sys/kern/unix_passfd_test.c @@ -1189,6 +1189,34 @@ ATF_TC_CLEANUP(cross_jail_dirfd, tc) err(1, "jail_remove"); } +ATF_TC_WITHOUT_HEAD(listening_socket); +ATF_TC_BODY(listening_socket, tc) +{ + struct sockaddr_un sun; + int error, ls, s[2]; + + ls = socket(AF_UNIX, SOCK_STREAM, 0); + ATF_REQUIRE(ls != -1); + + memset(&sun, 0, sizeof(sun)); + sun.sun_len = sizeof(sun); + sun.sun_family = AF_UNIX; + snprintf(sun.sun_path, sizeof(sun.sun_path), "listen.sock"); + error = bind(ls, (struct sockaddr *)&sun, sizeof(sun)); + ATF_REQUIRE_MSG(error == 0, "bind failed: %s", strerror(errno)); + error = listen(ls, 0); + + error = socketpair(AF_UNIX, SOCK_STREAM, 0, s); + ATF_REQUIRE_MSG(error == 0, "socketpair failed: %s", strerror(errno)); + + sendfd(s[0], ls); + sendfd(s[0], s[0]); + sendfd(s[0], s[1]); + close(ls); + close(s[0]); + close(s[1]); +} + ATF_TP_ADD_TCS(tp) { @@ -1211,6 +1239,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, empty_rights_message); ATF_TP_ADD_TC(tp, control_creates_records); ATF_TP_ADD_TC(tp, cross_jail_dirfd); + ATF_TP_ADD_TC(tp, listening_socket); return (atf_no_error()); } From nobody Fri Nov 21 15:19:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5Q4whpz6HLZp for ; Fri, 21 Nov 2025 15:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5Q2Vg3z3nsC for ; Fri, 21 Nov 2025 15:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iKXSAXU9qGZTVJqSicaJD61Pg0fad8WAAlzsNt6Dsnk=; b=d4giRkGLNnkitQB5StTwN9EJqVBlROD3dqMQTjBk6KJdphl6ujhjsejSKU4qhsU9iaQVuF lKjGqCEHrgVYhfNM9T3Uy3d6JjlhQMAEgNs6wEby07oB8aAnYYDPA6Lay/hY1/JYDYjClI xSkoO6/Ajb4s7VoBeCvQLjkiRnQH8/mVf8eSY0YCHL7IaxUAkYT5hhkWvh5tvDreHCGc/A 5Nxbaz4PDCxmkyuUAGQsY3zNusCPCMaTSptCqsbCM0Z9bEGtiam/VP057ohGzoweYzt6mH j2J6f0bKXy2KiH47cTHDvUDe2285YufIlNOjJHVxRt6oWUEVsMwBJKOC6eRPYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iKXSAXU9qGZTVJqSicaJD61Pg0fad8WAAlzsNt6Dsnk=; b=P0vDT3oUIFbjqpa60lQJCJE+aVfP9AP+BjY8C7zH1aMkSQwgsNc6MdH6opsTLIKZRj3jO+ sGMjN/LG6QGggA8TF4cZGL3LGruV1LZFRBehqFZP7PI9eQD52YfTvQcifAPWLBUhxmqblF 7BE566qySEmH9RkBEiG4B5H3SqHh0/h/FjbE1Tv/4dQ66qmfCqbPB9J0AEEBRIjLtPLNX0 qRQzLAvCsYK1PKtfD9GdU/1PrBCd4LicX5rgR+1oUbG29DFKo89v8tWrwQCIuNp4XXaiYT w1AV6IX8HuTBUHHu/P1s0kDh80vlfpR6TEJ4b3sXN+H9rqiKSsgwlYAvOSBsbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738362; a=rsa-sha256; cv=none; b=KireFO+Bp53pdpv00oJCWFnnj62Pb4xQOpjWThcrSDOklhXm256clrKrZcy9EzsZJyi1uL Di/j9eCk2JnMI+3kHi1OeAU8Nan7Uw/mg70lq+LrwECn+i+nOt0rsTfUi/p2Y8R5KJIK9M UbseJqV3qhkQgQHn0r4L+Gde6qYx+UbxnLMtEqRagmcd8GlZHr/+fZ1/YhNfVQV9Q4usOU QeDQA1PlMaV49KmXfg/x8bNlJZjucTC02NSO6rYVVJoz88cv9Cuj1mcpVMcZcWBpkSRAWk yB36jKGG+048rtZqSXWTgoFM2gnL3pNKLKsDsJr5Q4auFLMy03+WUQq3chB4UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5Q1Rlfz2g6 for ; Fri, 21 Nov 2025 15:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3142a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Mark Johnston Subject: git: 19b91b15530d - stable/13 - nullfs lookup: cn_flags is 64bit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 19b91b15530d1ed0453ce073fb15d1f790ff85e4 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:22 +0000 Message-Id: <692082fa.3142a.48f26238@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=19b91b15530d1ed0453ce073fb15d1f790ff85e4 commit 19b91b15530d1ed0453ce073fb15d1f790ff85e4 Author: Konstantin Belousov AuthorDate: 2025-05-17 05:37:48 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 nullfs lookup: cn_flags is 64bit Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50390 (cherry picked from commit 89549c2348170921cc4270ac95bfabfd78d42739) --- sys/fs/nullfs/null_vnops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 5daa302bedd1..f2c426d41f61 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -389,7 +389,7 @@ null_lookup(struct vop_lookup_args *ap) { struct componentname *cnp = ap->a_cnp; struct vnode *dvp = ap->a_dvp; - int flags = cnp->cn_flags; + uint64_t flags = cnp->cn_flags; struct vnode *vp, *ldvp, *lvp; struct mount *mp; int error; @@ -415,8 +415,8 @@ null_lookup(struct vop_lookup_args *ap) */ if ((ldvp->v_vflag & VV_ROOT) != 0 && (flags & ISDOTDOT) != 0) { KASSERT((dvp->v_vflag & VV_ROOT) == 0, - ("ldvp %p fl %#x dvp %p fl %#x flags %#x", - ldvp, ldvp->v_vflag, dvp, dvp->v_vflag, flags)); + ("ldvp %p fl %#x dvp %p fl %#x flags %#jx", + ldvp, ldvp->v_vflag, dvp, dvp->v_vflag, (uintmax_t)flags)); return (ENOENT); } From nobody Fri Nov 21 15:19:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5R48lZz6HLlw for ; Fri, 21 Nov 2025 15:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5R2pJMz3nhH for ; Fri, 21 Nov 2025 15:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pvcrkeGgUykL95KZHXJf9Cl+iUCuP4Rk6loSk1jDiO4=; b=fPcTIyYeEvMPEwtMJR7luB4gi9rMmpaHeyFdVRjm6eJ5LmUEd4n3CkkZ5Q2m0JkARba4Ty gEKMTasjWtql1wL5rYVD97UcVhVAqZG9KIc4AE1w0JJZm0hdykz17ODPSJP1Xco4ey68Cf 4TzdelxMrg4YUf+wRDxcL3UyXAbwjIea8in7miR028o5w3+OaYylB3NPVTvqjGlE/U8EwT M5Nyh1CaDjcGExoUORbawloz9P9Cjqd7R1h8KY6mMF9/OS5YJlh1NuLkIcwfkk0FgSXu0u EVM5zUKdqr4NUr0cLu6WAFeAmRjz8BihaQLFKWUcaGBcMBMVRxrNOIzTCLsWWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pvcrkeGgUykL95KZHXJf9Cl+iUCuP4Rk6loSk1jDiO4=; b=wQ/i9cmVMyc2cS+Lk+yZvvuecBQ7ms4e3pwTJSm2jWJn1DibXLFIcLgR9uD0Lhg95uUSme 32k4hKWNc/f9RAO2LM7n5fnLOuac/0VtsXPt6e4nliVkgXuYeXK5+VHFkO5hDhaaUN/uR+ W14qiWgX0VMj4fUCTkDHfn7h2X/6FVSeJ05tphZVxQLGduqD5tp9XT67p0APGL1W5ebQCA awx4BYAQJi6wktTDuMSH1lvOrRZ8dDbcxqJzWpv+zdoZhmjZd1F//vRAmcpDyLWYIkLgVN Nwf0WZ69hdJr968fkrSrOgMVw0EmKl9UXiWDL5Tn2mF2N15oFkvvg5bfB/ipNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738363; a=rsa-sha256; cv=none; b=pEZmva/YXZUUXBVXsaUiOxA2LMDfL5dmbBAcTyIuOeFF4oJvQVfRLN9A3sXE9kbxVwEntR ng9s8drYeXJr6oaw23U5yD3abf9l0sRNvn152xCNkoOXxfFH5Ye5BRLR5DbzNX6ltkdSDr fV97ryAQJ10YE9BEXtd3DyZaM+iFX1oh2hN0Tn8BF4/WsgxRMlX8+wpSTwrFH9Omt8I092 Fy/VcVt3yODcHvxelY2YOIqpZ+22iiERO6W+TLM+FOWWQiGPtgXqUskqnS1nStS96YDLYu 5OhBnztBTPRpiAqAizKUl59G1/YWcedASF5MfoVQgJ7W2pfQslASYKNHAqmszw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5R2JjXz2qw for ; Fri, 21 Nov 2025 15:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31c89 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 592de68e328b - stable/13 - namei: Make stackable filesystems check harder for jail roots List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 592de68e328b4edf8acdb2a0b0b66a813747b440 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:23 +0000 Message-Id: <692082fb.31c89.36c90828@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=592de68e328b4edf8acdb2a0b0b66a813747b440 commit 592de68e328b4edf8acdb2a0b0b66a813747b440 Author: Mark Johnston AuthorDate: 2025-05-23 12:52:24 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 namei: Make stackable filesystems check harder for jail roots Suppose a process has its cwd pointing to a nullfs directory, where the lower directory is also visible in the jail's filesystem namespace. Suppose that the lower directory vnode is moved out from under the nullfs mount. The nullfs vnode still shadows the lower vnode, and dotdot lookups relative to that directory will instantiate new nullfs vnodes outside of the nullfs mountpoint, effectively shadowing the lower filesystem. This phenomenon can be abused to escape a chroot, since the nullfs vnodes instantiated by these dotdot lookups defeat the root vnode check in vfs_lookup(), which uses vnode pointer equality to test for the process root. Fix this by extending nullfs and unionfs to perform the same check, exploiting the fact that the passed componentname is embedded in a nameidata structure to avoid changing the VOP_LOOKUP interface. That is, add a flag to indicate that containerof can be used to get the full nameidata structure, and perform the root vnode check on the lower vnode when performing a dotdot lookup. PR: 262180 Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50418 (cherry picked from commit 7587f6d4840f8d363e457cddc14c184cf1fe7cc1) --- sys/fs/nullfs/null_vnops.c | 28 +++++++++++++++++---------- sys/fs/unionfs/union_vnops.c | 19 ++++++++++++++++++ sys/kern/vfs_cache.c | 11 +---------- sys/kern/vfs_lookup.c | 46 +++++++++++++++++++++++++++++++------------- sys/sys/namei.h | 5 ++++- 5 files changed, 75 insertions(+), 34 deletions(-) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index f2c426d41f61..90fe043f8b33 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -407,17 +407,25 @@ null_lookup(struct vop_lookup_args *ap) /* * Renames in the lower mounts might create an inconsistent - * configuration where lower vnode is moved out of the - * directory tree remounted by our null mount. Do not try to - * handle it fancy, just avoid VOP_LOOKUP() with DOTDOT name - * which cannot be handled by VOP, at least passing over lower - * root. + * configuration where lower vnode is moved out of the directory tree + * remounted by our null mount. + * + * Do not try to handle it fancy, just avoid VOP_LOOKUP() with DOTDOT + * name which cannot be handled by the VOP. */ - if ((ldvp->v_vflag & VV_ROOT) != 0 && (flags & ISDOTDOT) != 0) { - KASSERT((dvp->v_vflag & VV_ROOT) == 0, - ("ldvp %p fl %#x dvp %p fl %#x flags %#jx", - ldvp, ldvp->v_vflag, dvp, dvp->v_vflag, (uintmax_t)flags)); - return (ENOENT); + if ((flags & ISDOTDOT) != 0) { + struct nameidata *ndp; + + if ((ldvp->v_vflag & VV_ROOT) != 0) { + KASSERT((dvp->v_vflag & VV_ROOT) == 0, + ("ldvp %p fl %#x dvp %p fl %#x flags %#jx", + ldvp, ldvp->v_vflag, dvp, dvp->v_vflag, + (uintmax_t)flags)); + return (ENOENT); + } + ndp = lookup_nameidata(cnp); + if (ndp != NULL && lookup_isroot(ndp, ldvp)) + return (ENOENT); } /* diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index cd57a5cae459..153a5db323d9 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -76,6 +76,21 @@ KASSERT(((vp)->v_op == &unionfs_vnodeops), \ ("unionfs: it is not unionfs-vnode")) +static bool +unionfs_lookup_isroot(struct componentname *cnp, struct vnode *dvp) +{ + struct nameidata *ndp; + + if (dvp == NULL) + return (false); + if ((dvp->v_vflag & VV_ROOT) != 0) + return (true); + ndp = lookup_nameidata(cnp); + if (ndp == NULL) + return (false); + return (lookup_isroot(ndp, dvp)); +} + static int unionfs_lookup(struct vop_cachedlookup_args *ap) { @@ -124,6 +139,10 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) if (LOOKUP != nameiop && udvp == NULLVP) return (EROFS); + if (unionfs_lookup_isroot(cnp, udvp) || + unionfs_lookup_isroot(cnp, ldvp)) + return (ENOENT); + if (udvp != NULLVP) { dtmpvp = udvp; if (ldvp != NULLVP) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index aacbd43403e1..7f3a3c9532f1 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5129,7 +5129,6 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) struct componentname *cnp; struct namecache *ncp; struct vnode *dvp; - struct prison *pr; u_char nc_flag; ndp = fpl->ndp; @@ -5141,15 +5140,7 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) /* * XXX this is racy the same way regular lookup is */ - for (pr = cnp->cn_cred->cr_prison; pr != NULL; - pr = pr->pr_parent) - if (dvp == pr->pr_root) - break; - - if (dvp == ndp->ni_rootdir || - dvp == ndp->ni_topdir || - dvp == rootvnode || - pr != NULL) { + if (lookup_isroot(ndp, dvp)) { fpl->tvp = dvp; fpl->tvp_seqc = vn_seqc_read_any(dvp); if (seqc_in_modify(fpl->tvp_seqc)) { diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index cb013eb7ff83..dc8b7b92ccd4 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -530,12 +530,12 @@ namei(struct nameidata *ndp) cnp->cn_origflags = cnp->cn_flags; #endif ndp->ni_cnd.cn_cred = ndp->ni_cnd.cn_thread->td_ucred; - KASSERT(ndp->ni_resflags == 0, ("%s: garbage in ni_resflags: %x\n", + KASSERT(ndp->ni_resflags == 0, ("%s: garbage in ni_resflags: %x", __func__, ndp->ni_resflags)); KASSERT(cnp->cn_cred && td->td_proc, ("namei: bad cred/proc")); KASSERT((cnp->cn_flags & NAMEI_INTERNAL_FLAGS) == 0, - ("namei: unexpected flags: %" PRIx64 "\n", - cnp->cn_flags & NAMEI_INTERNAL_FLAGS)); + ("namei: unexpected flags: %#jx", + (uintmax_t)(cnp->cn_flags & NAMEI_INTERNAL_FLAGS))); if (cnp->cn_flags & NOCACHE) KASSERT(cnp->cn_nameiop != LOOKUP, ("%s: NOCACHE passed with LOOKUP", __func__)); @@ -761,6 +761,31 @@ needs_exclusive_leaf(struct mount *mp, int flags) _Static_assert(MAXNAMLEN == NAME_MAX, "MAXNAMLEN and NAME_MAX have different values"); + +struct nameidata * +lookup_nameidata(struct componentname *cnp) +{ + if ((cnp->cn_flags & NAMEILOOKUP) == 0) + return (NULL); + return (__containerof(cnp, struct nameidata, ni_cnd)); +} + +/* + * Would a dotdot lookup relative to dvp cause this lookup to cross a jail or + * chroot boundary? + */ +bool +lookup_isroot(struct nameidata *ndp, struct vnode *dvp) +{ + for (struct prison *pr = ndp->ni_cnd.cn_cred->cr_prison; pr != NULL; + pr = pr->pr_parent) { + if (dvp == pr->pr_root) + return (true); + } + return (dvp == ndp->ni_rootdir || dvp == ndp->ni_topdir || + dvp == rootvnode); +} + /* * Search a pathname. * This is a very central and rather complicated routine. @@ -808,7 +833,6 @@ lookup(struct nameidata *ndp) struct vnode *dp = NULL; /* the directory we are searching */ struct vnode *tdp; /* saved dp */ struct mount *mp; /* mount table entry */ - struct prison *pr; size_t prev_ni_pathlen; /* saved ndp->ni_pathlen */ int docache; /* == 0 do not cache last component */ int wantparent; /* 1 => wantparent or lockparent flag */ @@ -1008,15 +1032,11 @@ dirloop: goto bad; } for (;;) { - for (pr = cnp->cn_cred->cr_prison; pr != NULL; - pr = pr->pr_parent) - if (dp == pr->pr_root) - break; - bool isroot = dp == ndp->ni_rootdir || - dp == ndp->ni_topdir || dp == rootvnode || - pr != NULL; - if (isroot && (ndp->ni_lcf & - NI_LCF_STRICTRELATIVE) != 0) { + bool isroot; + + isroot = lookup_isroot(ndp, dp); + if (__predict_false(isroot && (ndp->ni_lcf & + NI_LCF_STRICTRELATIVE) != 0)) { error = ENOTCAPABLE; goto capdotdot; } diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 1d0fd1c96449..053a64367ff9 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -154,6 +154,7 @@ int cache_fplookup(struct nameidata *ndp, enum cache_fpl_status *status, #define LOCKSHARED 0x0100 /* Shared lock leaf */ #define NOFOLLOW 0x0000 /* do not follow symbolic links (pseudo) */ #define RBENEATH 0x100000000ULL /* No escape, even tmp, from start dir */ +#define NAMEILOOKUP 0x200000000ULL /* cnp is embedded in nameidata */ #define MODMASK 0xf000001ffULL /* mask of operational modifiers */ /* @@ -254,7 +255,7 @@ do { \ NDINIT_PREFILL(_ndp); \ NDINIT_DBG(_ndp); \ _ndp->ni_cnd.cn_nameiop = op; \ - _ndp->ni_cnd.cn_flags = flags; \ + _ndp->ni_cnd.cn_flags = (flags) | NAMEILOOKUP; \ _ndp->ni_segflg = segflg; \ _ndp->ni_dirp = namep; \ _ndp->ni_dirfd = dirfd; \ @@ -312,6 +313,8 @@ void NDVALIDATE(struct nameidata *); int namei(struct nameidata *ndp); int lookup(struct nameidata *ndp); +bool lookup_isroot(struct nameidata *ndp, struct vnode *dvp); +struct nameidata *lookup_nameidata(struct componentname *cnp); int relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp); #endif From nobody Fri Nov 21 15:19:24 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5T0zpQz6HLnX for ; Fri, 21 Nov 2025 15:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5S4CYyz3nyd for ; Fri, 21 Nov 2025 15:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ar0lbrlctygXlGJv7lfXH8MJrT19mCNHFyeB5L7aYxc=; b=qhGFjaaeSMnUuhFwIQ78HU/FJ/XGARzdw7Jic4rA4rEwsblsdRLaiy8dLqGsMIQnMDG8rk /nHYAwYTus9kV5m808CHU4sM+lcmlHOSZHXD7yxH0InkYcSlb15nD/Gmc6hOcaPgeUBM/x Yeb6VM9vzBTgoVwj8QDH/taE8XI+ktY+XuJbRwS1lG9Ej1u0N1tzyzO7GyM58/IUAyr4/N KvgfqEUb1btWCneP6MIVdjV5unxqjJ6YYBbCFn4k1Z2dmAyxpVPRMeB0TxJHc7o8opW1Ml QUhzpf1t1aSQsSv3ZaXfQ440osTJG8QdfalhZnMCNHSNYW4yypk9p8Xh0V8Mtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ar0lbrlctygXlGJv7lfXH8MJrT19mCNHFyeB5L7aYxc=; b=Y6kORoWitIXJMFUzrIiTYS3USlQ65Luql2uR86prWy6KQw5JFI97+7svxSK2AvKlrsysNW PZLac0u3XZ7mhAZgZCf9/4Uz2VYu/32p53eL8btO5rD0Ro8D3O3FUdC2j29fwBO5se0n3t vVW+YSiIvnrz041N0YpjAV38tueFxixFRF5bIFXpSpDAFB9z0ncgwKffq8oLXy8myoRAaJ dAd0bRmTOnBAk8LSZ1L8Ega6nDVELvPrMSMVUoZRT6UssK7y6KZ6WI6wnEZtfATiRPHpJs DqnAuQqe7QKTq8ruwIbsv/CMJ1cfhbDS57Hhri0TEm10rIKTjtrankmOEHuLhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738364; a=rsa-sha256; cv=none; b=Z0so8o1Mv2g/PE/U7G3OpRbjN44VBBJeD0PnIImWb6MwqosBsfDRTVmhxI8DZAfDV+3uGH kuDplb1013Fl5eh5JPblxeDHTEgGxFxvk1sS6JtbQv8etPMFl4kjRGHH0Xe1Dxl5p4GlMT ZxpqV816ac86koqTKGzgCURqMAwIZcQvn322p8uq/Y+aLTem5c+qP+6h4qZzgvK2jZ1CuH S/MJLc3JpgCirK5JYffSTcYuxopUm3eNo35iOKVcPH+BzIJDWuYlNSMMMZP236JD0iu6M/ N26CY2TzdmvDN503u6hLRRi0Zw0ZiPCqMV01MhGrV2AAYfYvFukrqDHg8o1Ydg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5S2vPWz2p8 for ; Fri, 21 Nov 2025 15:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2fe5c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8c63056ea8a3 - stable/13 - vfs: Don't clobber namei flags in vn_open_cred() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8c63056ea8a34f7ac9cbbfcf6d37c303e1e00a76 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:24 +0000 Message-Id: <692082fc.2fe5c.5d8afaaf@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8c63056ea8a34f7ac9cbbfcf6d37c303e1e00a76 commit 8c63056ea8a34f7ac9cbbfcf6d37c303e1e00a76 Author: Mark Johnston AuthorDate: 2025-05-28 13:35:24 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 vfs: Don't clobber namei flags in vn_open_cred() Otherwise NAMEILOOKUP is cleared. More generally it seems quite surprising that the flags set by vn_open_cred() callers are not automatically preserved. Modify open2nameif() such that it takes already-set namei flags into account. Reviewed by: olce, kib Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") Differential Revision: https://reviews.freebsd.org/D50531 (cherry picked from commit e05e33041c252dc236939683c01ca4b7b083562c) --- sys/kern/vfs_vnops.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 6591b543ddea..e685d581733b 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -195,21 +195,26 @@ vn_open(struct nameidata *ndp, int *flagp, int cmode, struct file *fp) } static uint64_t -open2nameif(int fmode, u_int vn_open_flags) +open2nameif(int fmode, u_int vn_open_flags, uint64_t cn_flags) { uint64_t res; - res = ISOPEN | LOCKLEAF; + res = ISOPEN | LOCKLEAF | cn_flags; if ((fmode & O_RESOLVE_BENEATH) != 0) res |= RBENEATH; if ((fmode & O_EMPTY_PATH) != 0) res |= EMPTYPATH; + if ((fmode & O_NOFOLLOW) != 0) + res &= ~FOLLOW; if ((vn_open_flags & VN_OPEN_NOAUDIT) == 0) res |= AUDITVNODE1; + else + res &= ~AUDITVNODE1; if ((vn_open_flags & VN_OPEN_NOCAPCHECK) != 0) res |= NOCAPCHECK; if ((vn_open_flags & VN_OPEN_WANTIOCTLCAPS) != 0) res |= WANTIOCTLCAPS; + return (res); } @@ -242,7 +247,9 @@ restart: return (EINVAL); else if ((fmode & (O_CREAT | O_DIRECTORY)) == O_CREAT) { ndp->ni_cnd.cn_nameiop = CREATE; - ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags); + ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags, + ndp->ni_cnd.cn_flags); + /* * Set NOCACHE to avoid flushing the cache when * rolling in many files at once. @@ -251,8 +258,8 @@ restart: * exist despite NOCACHE. */ ndp->ni_cnd.cn_flags |= LOCKPARENT | NOCACHE | NC_KEEPPOSENTRY; - if ((fmode & O_EXCL) == 0 && (fmode & O_NOFOLLOW) == 0) - ndp->ni_cnd.cn_flags |= FOLLOW; + if ((fmode & O_EXCL) != 0) + ndp->ni_cnd.cn_flags &= ~FOLLOW; if ((vn_open_flags & VN_OPEN_INVFS) == 0) bwillwrite(); if ((error = namei(ndp)) != 0) @@ -320,9 +327,8 @@ restart: } } else { ndp->ni_cnd.cn_nameiop = LOOKUP; - ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags); - ndp->ni_cnd.cn_flags |= (fmode & O_NOFOLLOW) != 0 ? NOFOLLOW : - FOLLOW; + ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags, + ndp->ni_cnd.cn_flags); if ((fmode & FWRITE) == 0) ndp->ni_cnd.cn_flags |= LOCKSHARED; if ((error = namei(ndp)) != 0) From nobody Fri Nov 21 15:19:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5V04LHz6HLm1 for ; Fri, 21 Nov 2025 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5T52Bqz3nsc for ; Fri, 21 Nov 2025 15:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+yNfA41xPw+RvnMX9IC1To+6iKfSRP4m55aXNATs4kQ=; b=kTNu0H6sRaHnktkfxxIUsm2uTiLGbcO9xrbPcXwLAhioGfV0FGo15vTXYy9KwPxTYI5yHI ItuMdKsoLH8wdOwF+HwNJEer3K8tJFpCG9ftnZoZ/HuJWVySXTlBU3bBKZsdpTvDYOPC80 Fyve5mGfbUqSedwyBhV7L4v9Vg5F5HBQ7+CoM/flPa7yXdpkk4l7LTVojvxG2EZnnR9RLU dcpLo8/MBsO89S1yImxtO/dtBn++vZ7Kfz/IlRMik6wihYZH1Qqzo8q6lp/5WH7wUk/nx2 vkb51JPVuSuTpH7eeasxHOTgDDMunCw8WfGQK3cL28PtMjsdgNw9V5eD+2ioRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+yNfA41xPw+RvnMX9IC1To+6iKfSRP4m55aXNATs4kQ=; b=sR6qkv2vIN4K5CgGljzmc6wYryVO8FC97B51SNyi9/UDvnEk8JVq1H6hcJwUHfRjR3BwKd OI59OEetlJaljvwB9+UkGORMYjegx32QhrxS5lG7WMuZIpsSg8I1amuq0iU4IVYpcLOAkY ukXPR+TNzIPDwwm1Odky8lI4l73wIyk26m9cG4n1LoBM0NiQL0u49WrtLmJOaKKErHAbe1 W3K8z7C2JVulR+4GgB7oxIlkRAwjQWxi3LgyZAr6fSStY8a9/A2bKxBelePSXG+2zAFSyz oG1lDr3Qs6NHmhw25xdmXWrxCXFXxtm+o2INYSBzY5xoVNWHjfrgZO0dYpr8Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738365; a=rsa-sha256; cv=none; b=YNVrOACme9Gbqj/Ua4MdQInExO/6Kd3x5FpQHTA2iIGyKJw927ZuQaX5tCtEWbzvk2lwpq LO+KITJwClYOvtEh9DBR5373e5ZdDN1mxWEWVl8fL0zPYfzSLCZvLuQN1boPegE79Tm9hb aQ8cRBTij5VeDhyQ0+bOZuQlhORGlBfai09+zYdeZwKnNWGjDdbqaqScVyPCg/iXIOERY/ TUkNHAFQrWkhljYwRt8all19cL6PxTNi+26u/BsJ6B7fTLci516q3kpLeKb6wAQL1euBoV 7jhdTyEAG1wuA/XJ+cs+DB73dqpvrRU8rJv5ar4LPzmFdqP0/WRx/cplTY9vPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5T3hVZz2gB for ; Fri, 21 Nov 2025 15:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 322de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b55b92729641 - stable/13 - tests: Add a regression test for commit 7587f6d4840f8 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b55b92729641e05a05cc8526b08bd7ac3dfcb4fc Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:25 +0000 Message-Id: <692082fd.322de.408d2020@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b55b92729641e05a05cc8526b08bd7ac3dfcb4fc commit b55b92729641e05a05cc8526b08bd7ac3dfcb4fc Author: Mark Johnston AuthorDate: 2025-05-28 15:28:36 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 tests: Add a regression test for commit 7587f6d4840f8 Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50533 (cherry picked from commit a5dac34f6e98c47bd7cb1946e39cc45432e167a8) --- tests/sys/kern/Makefile | 5 ++ tests/sys/kern/jail_lookup_root.c | 133 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 74c987e55734..f862e41d1d72 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -13,6 +13,7 @@ ATF_TESTS_C+= basic_signal ATF_TESTS_C+= kern_copyin ATF_TESTS_C+= kern_descrip_test ATF_TESTS_C+= fdgrowtable_test +ATF_TESTS_C+= jail_lookup_root ATF_TESTS_C+= kill_zombie .if ${MK_OPENSSL} != "no" ATF_TESTS_C+= ktls_test @@ -58,6 +59,10 @@ PROGS+= coredump_phnum_helper PROGS+= pdeathsig_helper PROGS+= sendfile_helper +.PATH: ${SRCTOP}/sbin/mount +SRCS.jail_lookup_root+= jail_lookup_root.c getmntopts.c +CFLAGS.jail_lookup_root+= -I${SRCTOP}/sbin/mount +LIBADD.jail_lookup_root+= jail util CFLAGS.sys_getrandom+= -I${SRCTOP}/sys/contrib/zstd/lib LIBADD.sys_getrandom+= zstd LIBADD.sys_getrandom+= c diff --git a/tests/sys/kern/jail_lookup_root.c b/tests/sys/kern/jail_lookup_root.c new file mode 100644 index 000000000000..34e89f4aea2b --- /dev/null +++ b/tests/sys/kern/jail_lookup_root.c @@ -0,0 +1,133 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Mark Johnston + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +static void +mkdir_checked(const char *dir, mode_t mode) +{ + int error; + + error = mkdir(dir, mode); + ATF_REQUIRE_MSG(error == 0 || errno == EEXIST, + "mkdir %s: %s", dir, strerror(errno)); +} + +static void __unused +mount_nullfs(const char *dir, const char *target) +{ + struct iovec *iov; + char errmsg[1024]; + int error, iovlen; + + iov = NULL; + iovlen = 0; + + build_iovec(&iov, &iovlen, __DECONST(char *, "fstype"), + __DECONST(char *, "nullfs"), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "fspath"), + __DECONST(char *, target), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "from"), + __DECONST(char *, dir), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "errmsg"), + errmsg, sizeof(errmsg)); + + errmsg[0] = '\0'; + error = nmount(iov, iovlen, 0); + ATF_REQUIRE_MSG(error == 0, "nmount: %s", + errmsg[0] != '\0' ? errmsg : strerror(errno)); + + free_iovec(&iov, &iovlen); +} + +ATF_TC_WITH_CLEANUP(jail_root); +ATF_TC_HEAD(jail_root, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(jail_root, tc) +{ + int error, fd, jid; + + mkdir_checked("./root", 0755); + mkdir_checked("./root/a", 0755); + mkdir_checked("./root/b", 0755); + mkdir_checked("./root/a/c", 0755); + + jid = jail_setv(JAIL_CREATE | JAIL_ATTACH, + "name", "nullfs_jail_root_test", + "allow.mount", "true", + "allow.mount.nullfs", "true", + "enforce_statfs", "1", + "path", "./root", + "persist", NULL, + NULL); + ATF_REQUIRE_MSG(jid >= 0, "jail_setv: %s", jail_errmsg); + + mount_nullfs("/a", "/b"); + + error = chdir("/b/c"); + ATF_REQUIRE(error == 0); + + error = rename("/a/c", "/c"); + ATF_REQUIRE(error == 0); + + /* Descending to the jail root should be ok. */ + error = chdir(".."); + ATF_REQUIRE(error == 0); + + /* Going beyond the root will trigger an error. */ + error = chdir(".."); + ATF_REQUIRE_ERRNO(ENOENT, error != 0); + fd = open("..", O_RDONLY | O_DIRECTORY); + ATF_REQUIRE_ERRNO(ENOENT, fd < 0); +} +ATF_TC_CLEANUP(jail_root, tc) +{ + struct statfs fs; + fsid_t fsid; + int error, jid; + + error = statfs("./root/b", &fs); + if (error != 0) + err(1, "statfs ./b"); + fsid = fs.f_fsid; + error = statfs("./root", &fs); + if (error != 0) + err(1, "statfs ./root"); + if (fsid.val[0] != fs.f_fsid.val[0] || + fsid.val[1] != fs.f_fsid.val[1]) { + error = unmount("./root/b", 0); + if (error != 0) + err(1, "unmount ./root/b"); + } + + jid = jail_getid("nullfs_jail_root_test"); + if (jid >= 0) { + error = jail_remove(jid); + if (error != 0) + err(1, "jail_remove"); + } +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, jail_root); + return (atf_no_error()); +} From nobody Fri Nov 21 15:19:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5V6Ngsz6HLnY for ; Fri, 21 Nov 2025 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5V4sxFz3nw6 for ; Fri, 21 Nov 2025 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nPODVS1Bj2JovnLnFOGLs2i9zys1GGJl1aMh/HNaBiw=; b=aHQfjd2dFOImhHedNINi9VDNF9J+6sZ/E59To04nGbpK4XseO949Bt+rHgpJclMhwnG+S+ 8+l3nVwAKFhWNH0/rEfntspIxCAXCswjIF3IC/ufkEgS6DDF9o26+Zj31NVt7JffMBGq6Q tIATOFoOUbc3L89HCRhsg5NX6+myA8VzLpgiBe+0HMhR8m+0vRmWTDPckja/IGY7Pb1wVD LaR+tDvcZgJJcNsGZUEja97VMwLffp2009ixiNqwPvekwwgpq2mRQJ1nQlLQjTWbun+GrO XRneiur4NRWyTpEkuJ4NLbFzGMc6hzs18TbrcJ8OBUJpa+ckc7Yz3uTkLXl/Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nPODVS1Bj2JovnLnFOGLs2i9zys1GGJl1aMh/HNaBiw=; b=TWK+xgqvwP3er0aaMmY8YbiCALctPixMdxQzC/3cTDEytSZujrgRsgL9sCZh6jeuNEjx63 hxTGJ+qglMb/MMDLZLnJBE7G0BBRogp7M5HbYvJRTEkmwCPOAorGPbluDGEXXQBNMrVcZs ihxBa6grPl65a7Lr7pbaQlt6wuP1GtvWCYVZmIM5pn7v/jkH662EeUEjqRoA6NwFxUONEZ AXh8buMBwRlwLVWxm8pX1V/9IRDqXKg5P2iNCkUa8fWZUcxEFLZiKweKvuYOk8TG8izsKx s6/CgqV/4uD18z6S7tOW2tj9WW+tELDzVPljpyEVhxvYM+uiOa9s1WuYbZoouQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738366; a=rsa-sha256; cv=none; b=yutOLijsoHRG8/rApMY+5qv05wdBtshCPyYVJNBQKYXtDw5snYP8bcLAgJwenW9KaCDU4x pvQpSXkcdVYmdiJyb51tPybI+7ZOUk8dcnlFqyAnIj8ELWR64QdApcKCOy8C0LoAkUoCQ5 3i4u4rVaWc0lO1Y7U/1Zbe6YR4IC+CAjghjdbvksKZe3VHa/SjcKf84xWYepfTHczPZ65U JXVuRoZHmRs2KWFP3Fo/4lc4z3sYJWLEqDS+TBoqoq21OtnJTDVNvAKdPAsCep/q0kMCZv XkK7oT48voSli7T0kcXZ1lODZTJfXlzZdBXmB3aCpIgmDZrlcNMBke4DmSxIfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5V4QN4z2F7 for ; Fri, 21 Nov 2025 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 322e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4e31059f80d1 - stable/13 - namei: Remove a now-unused variable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4e31059f80d162a1f496f25ef297268d47614dd2 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:26 +0000 Message-Id: <692082fe.322e2.163035c0@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4e31059f80d162a1f496f25ef297268d47614dd2 commit 4e31059f80d162a1f496f25ef297268d47614dd2 Author: Mark Johnston AuthorDate: 2025-05-23 15:35:05 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 namei: Remove a now-unused variable Reported by: bapt Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") (cherry picked from commit 14ec281a09d7818def2083ef0c3e28f8101f4268) --- sys/kern/vfs_cache.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 7f3a3c9532f1..211363bbc43b 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5126,16 +5126,14 @@ static int __noinline cache_fplookup_dotdot(struct cache_fpl *fpl) { struct nameidata *ndp; - struct componentname *cnp; struct namecache *ncp; struct vnode *dvp; u_char nc_flag; ndp = fpl->ndp; - cnp = fpl->cnp; dvp = fpl->dvp; - MPASS(cache_fpl_isdotdot(cnp)); + MPASS(cache_fpl_isdotdot(fpl->cnp)); /* * XXX this is racy the same way regular lookup is From nobody Fri Nov 21 15:19:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5V2csJz6HLm2 for ; Fri, 21 Nov 2025 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5V1L9dz3nqc for ; Fri, 21 Nov 2025 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrJ0KOkCiTnqEOzH48mF3STxjMmNeqa62TeKQFbknzc=; b=gA6sTfaQFA0YVVq4zxupfVkebeu+0tisnnKZKL3mYIh5B3lzE5v3VKvhaHkFgDp8kCCrQU o4vv5ikKEn4mRnZ+Htf4AOtObGuMVyh6clbIiepp6hgjybSMua/Va2KSMu2wYaA9R32Z5x cA33uXyxkQGoanWWt4OI49wSlLA247w8saH4OydX71rTsV7lReaERK4Pme5M7FFreT3Gqn 73nzTCAgYXzBYC4i/iegg0PIy/sTdn1sbNr0cdZTooWyQK7zo9ArVfutrRvFWcdYDFbY+0 JtgwveVjd6a2GLlOKYd6YAWgMz+xqzemOzzP1W8cMfCEuf6DPsWIWDOcg8kT9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rrJ0KOkCiTnqEOzH48mF3STxjMmNeqa62TeKQFbknzc=; b=n11DICMuL8hIl5tLtrVVP4q4qw30qssvP0I2W57y139UidvYL8umuzFiIB/dm+7FAyvdef TxNbzRZOWj7Bw0meJwwz6hbyjtNTXo45aKcJGH62rcb+G/xEEzChZ7de3Uw+N2Yolawc1R bi8PuDdyc4PDeEKmA2loxQZUiuLmCuP5zcPt2NZ3Dy7xS6rakQq5NRB6UhB68RAz+lLl8c hSFodglSBZBMGc6LDv/mbKGCPjAWbJIVkguFrwtXDbGOpWqpzbaEJRPmM41l4+o6Q3tHkw X/ZzPX3Pm6Q1IMDEPHOBu5nHPE9SIP7lowM9NFtyscr/jFd2JQSEB1jK3pcP7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738366; a=rsa-sha256; cv=none; b=EkI6z93fmgljKXPEONzT06q8x5lzTxcEeXVsmw8kDJtv6MF8EapbS5tT1Lwo49s0G25BYx XPIWc1OKfNg72hB8vYHSrT9hDWHFTPAqheZwha5R+8q3/wawpqsGC+YMhzPiGx2h98JPbM dIRrDzvNbFXddJEHN6UyBoZ5EVMDmCu9P53qXCSs2fDWJyV9hRFG0a1cF2uTr90eoGcLy7 n1rUqe+fkSKWQZ9801F5ZDRzGCljZUVHdS2Og/VzIevUr3bT/DtJCwoS7SLhPVv5DErEWq LuNe9/NMQnYgayPYP1zv6DWu6bi1Z+gMAz36F5Yt7waIb3nzBFe1SjUqWMrYNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5V0jNMz2Qk for ; Fri, 21 Nov 2025 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3053c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 90118a35a3ae - stable/13 - src.conf: Add a MK_ZFS_TESTS knob List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 90118a35a3ae469ca91a4c52b3623bf4d0c5212e Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:21 +0000 Message-Id: <692082f9.3053c.536f8829@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=90118a35a3ae469ca91a4c52b3623bf4d0c5212e commit 90118a35a3ae469ca91a4c52b3623bf4d0c5212e Author: Mark Johnston AuthorDate: 2024-09-07 14:36:28 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 src.conf: Add a MK_ZFS_TESTS knob The in-tree ZFS test suite is somewhat outdated and I see a number of failures there. I tend to think that we want to integrate the OpenZFS test suite somehow, replacing the legacy one, though it's also possible to run that as a separate test suite. In any case, if one wants to run the OpenZFS test suite separately, it's useful to be able to disable installation of the legacy ZFS test suite, so let's provide a src.conf option to do that. Reviewed by: asomers MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46476 (cherry picked from commit 24affded3d4ec5fafb6b22f773ec1e20d73b9b03) --- share/mk/src.opts.mk | 6 ++++++ tests/sys/cddl/Makefile | 2 +- tools/build/options/WITHOUT_ZFS_TESTS | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 811b0a493d50..d8872f93bfcd 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -192,6 +192,7 @@ __DEFAULT_YES_OPTIONS = \ WIRELESS \ WPA_SUPPLICANT_EAPOL \ ZFS \ + ZFS_TESTS \ LOADER_ZFS \ ZONEINFO @@ -459,6 +460,11 @@ MK_OFED_EXTRA:= no .if ${MK_TESTS} == "no" MK_DTRACE_TESTS:= no +MK_ZFS_TESTS:= no +.endif + +.if ${MK_ZFS} == "no" +MK_ZFS_TESTS:= no .endif .if ${MK_TESTS_SUPPORT} == "no" diff --git a/tests/sys/cddl/Makefile b/tests/sys/cddl/Makefile index 80c72ea5ec42..377faae73522 100644 --- a/tests/sys/cddl/Makefile +++ b/tests/sys/cddl/Makefile @@ -5,7 +5,7 @@ TESTSDIR= ${TESTSBASE}/sys/cddl TESTS_SUBDIRS+= ${_zfs} -.if ${MK_ZFS} != "no" +.if ${MK_ZFS_TESTS} != "no" _zfs= zfs .endif diff --git a/tools/build/options/WITHOUT_ZFS_TESTS b/tools/build/options/WITHOUT_ZFS_TESTS new file mode 100644 index 000000000000..ae2ac45ca0f3 --- /dev/null +++ b/tools/build/options/WITHOUT_ZFS_TESTS @@ -0,0 +1 @@ +Do not build and install the legacy ZFS test suite. From nobody Fri Nov 21 15:19:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5X11NRz6HLm5 for ; Fri, 21 Nov 2025 15:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5W5PSkz3p0L for ; Fri, 21 Nov 2025 15:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MqNA2L+bFK6j3cHgqhXZYJqlmeN1Q1MPbEx/oHlxGog=; b=gW+qAkUvFaIlIjukofElsDDOISR5nfgnF22n/JqO/hlmpBPlAlgi7l8HV1G1aRgvsjB3/J 0gPG76Fw1d0j0nDmhp/xX+C8Cf9x/DwtJZSK8cvIz10bJD8gFSU12TzXNrQWffxOFeV+d+ yX0XyeQCd3hJv4RO4aGJPvDac8eZrRc7UI+07ngQdyDEE2njBHfhx1B9now0z82Lhn/Zaf JtmnBKQZOqIQeMLwOoSEmE48ndqnsimLWesoQUWW6HGdtgNumHJ/L4NXY+CgnUcFdYBkzW XvaRpOvMffm3H1cviUzPIRZi784FLMVuhTOGzssCkhNmCWGB93aw3Ysu01knvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MqNA2L+bFK6j3cHgqhXZYJqlmeN1Q1MPbEx/oHlxGog=; b=FV06Pl0NJmlIc3wFif724vjqyvrnnwuIm7Xu9Qs1eVGwoPBEoWpDVhYwlPNB43v7RTl5Gr e8QlUl9gMLSzq0SlqyBb5VNUaY/0uIbFhaaqPEl9qrVDWp3hfUzYqADRygwzTAWs3JFmHI vNtZtKAH7dhtO7NlVM/rzgGPc1ADy0IVYGZ8H1EIL8Wm7sRQhAVc4x80s1uvjEHaRTk4FZ /dSvsHdny4b3m+lOMaAJUUPHT3m1rZ6q3fkXn4yoJQIT6PIB8WImSBEVrYhnw6z6LtCPBj lK7DKcyWlPuGlEMNNF693vjFuvNBr/XHfNeE7rtvL0Uaq4Plr6n052rCN/W0FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738367; a=rsa-sha256; cv=none; b=QUmlvQtIJFUzzOXfX8YjYceId15ST/CDGoWP0L5aSYgU1fvJxijU8welheNlLPk5Ookq8E e95bK/RYkb28Pg9No1ZH2ETs4dp5l7QuQSkN7eFrmgFznnzzwp+N0qQLIYaQeMBsasLK3I ALAEOFEyMLvAFBWZ9snqSktK32+D55kAOTCzICZBu3Wh8wpqwEggLVch0ThHz/Bo0HV5tq DrjsGtdjJOydg61FPxadFM9SYy+wEaPj7A68VUZluhYcRZ00OoX+PzzsX9gEAoYNeEg2ZH dGe9aTwz2NAoinPN6auuhLzUC/6XAbfiV5PNhuRAGClSgEgZgIvutCpvf99h2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5W4yG3z2gD for ; Fri, 21 Nov 2025 15:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31c54 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: adb8c1a9d09d - stable/13 - vfs cache: Add NAMEILOOKUP to the whitelist of fastpath lookup flags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: adb8c1a9d09d5a29167b845f423e989bfdba46ab Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:27 +0000 Message-Id: <692082ff.31c54.211dce24@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=adb8c1a9d09d5a29167b845f423e989bfdba46ab commit adb8c1a9d09d5a29167b845f423e989bfdba46ab Author: Mark Johnston AuthorDate: 2025-05-27 13:27:49 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 vfs cache: Add NAMEILOOKUP to the whitelist of fastpath lookup flags Otherwise the lockless name lookup path is inadvertently disabled since NAMEILOOKUP isn't recognized. Reviewed by: olce, kib Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") Differential Revision: https://reviews.freebsd.org/D50532 (cherry picked from commit f4158953007f557061d91f99d2374d48d8376cc6) --- sys/kern/vfs_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 211363bbc43b..cdd882e09075 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4292,7 +4292,7 @@ cache_fpl_terminated(struct cache_fpl *fpl) (NC_NOMAKEENTRY | NC_KEEPPOSENTRY | LOCKLEAF | LOCKPARENT | WANTPARENT | \ FAILIFEXISTS | FOLLOW | EMPTYPATH | LOCKSHARED | SAVENAME | SAVESTART | \ WILLBEDIR | ISOPEN | NOMACCHECK | AUDITVNODE1 | AUDITVNODE2 | NOCAPCHECK | \ - WANTIOCTLCAPS) + WANTIOCTLCAPS | NAMEILOOKUP) #define CACHE_FPL_INTERNAL_CN_FLAGS \ (ISDOTDOT | MAKEENTRY | ISLASTCN) From nobody Fri Nov 21 15:19:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5Y0zlTz6HLmC for ; Fri, 21 Nov 2025 15:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5X6ccVz3ntC for ; Fri, 21 Nov 2025 15:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oTcm4UNTsV7qNDgHDWYqTLWUp45gthHj1YGC1u4zia4=; b=nxSxzjk6B048Ed43p8l7XOKrbc0IZXsZnLbO8emf30O2P4QhzH8+FEe0Wmycr2YhmmOXTg xCEaDz1JRgQ+jgFdWtvC2MM8EOSCCks15kCOhx0xRG1MIZSpA++hp20r3zbDub+7NeOYqo WE9/bHGZRXMYHJqISlVJQF0MkRAZszdjSpNXdcicgb64KPgrw4ZdYAim33pfSWPFOd/4Hw l25fC2esyM8MTqxlRfmqXdqpDdwlGDE2qnO2I8Qnuq0L085fbENsbDfWSVLFB9iiQ/wV3z 3aOPhfHUFYpOKMPxUh31PF/NvTUx7Vd3A6n0mRCZqSp3mUvdtLks9c9hDTyxUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oTcm4UNTsV7qNDgHDWYqTLWUp45gthHj1YGC1u4zia4=; b=rYU1TSuB1eJtokKNUEcJ6OG+7s3/Gqocqmr39eJdIELTLUORUA6zFhao71Jt14UR0VIwNw lQztWXgDIsPcjcUx7suGeM/a+AVCTFJQX6d0RE5GLqAfvls6PVDzu9+OM6V1ipNLXVrq6q wgph6S2HG7Iueb+SR1+WHlJvGc9rMhkdB52hhTdYRSbYR3qujaAU+UZ7d5BZ1poU1sg6xn bSeZN67cNaZgaKkDNWEifUzL1R7VVvkVxbYh9bZnsj1rI/FZpELS0jXwYq/ylk1qBW1Fmf Fez3kxrezviL67S+J3nl1NqrF8zCfNqQvOq/2KnVOKIhLvhWJgOfol46u+nzSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738368; a=rsa-sha256; cv=none; b=n9fJFLo6Y37aQ/q7UdmAMep2vqLzpsnKMq5KtgunFzBy/4Q+bNyAQZzEDgif0aXn8ydXrj /3hVGBlownc29f6z7sRtVKmwQWFBnxO/EBUeb4EtdkTEw5XMCaQeHeF7g+I7KHCkvzN1sC hEfqXhOnoVn+dbqGifYSEESEfr9L/RwAkuHCx7xNq5RfBYlCZAuS7uXlUBvR5Mx/ZXRPyu 0BicaeYdl8++kEfaSbX/VK4F8qITLedjhRBweqLta2ly7HpxA6stPH45ihyGZv49sOoUHp tdI9kxFeinJ85yTZkbzdwc8+WOgSxdy9tDjYGfyTkWf/W9VWBlzE9rEJJx2mIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCf5X5q2mz2Z7 for ; Fri, 21 Nov 2025 15:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31dc0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 503ab844cece - stable/13 - namei: Fix cn_flags width in various places List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 503ab844ceced16c7e8736c0caa586ff0bab5f0e Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:28 +0000 Message-Id: <69208300.31dc0.5c4b1fc4@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=503ab844ceced16c7e8736c0caa586ff0bab5f0e commit 503ab844ceced16c7e8736c0caa586ff0bab5f0e Author: Mark Johnston AuthorDate: 2025-05-27 13:29:14 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 namei: Fix cn_flags width in various places This truncation is mostly harmless today, but fix it anyway to avoid pain later down the road. Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50417 (cherry picked from commit 0d224af399a66f00a5b33e5512fc018062cabf1d) --- sys/fs/cd9660/cd9660_lookup.c | 2 +- sys/fs/fuse/fuse_vnops.c | 11 +++++------ sys/fs/smbfs/smbfs_vnops.c | 2 +- sys/fs/unionfs/union_vnops.c | 3 ++- sys/kern/uipc_mqueue.c | 3 ++- sys/kern/vfs_cache.c | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index 961745f45afc..be594d46cf40 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -134,7 +134,7 @@ cd9660_lookup(ap) char *name; struct vnode **vpp = ap->a_vpp; struct componentname *cnp = ap->a_cnp; - int flags = cnp->cn_flags; + uint64_t flags = cnp->cn_flags; int nameiop = cnp->cn_nameiop; ep2 = ep = NULL; diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 79317e4e4cd2..d5166559fbdc 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -1433,9 +1433,9 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) struct timespec now; int nameiop = cnp->cn_nameiop; - int flags = cnp->cn_flags; - int wantparent = flags & (LOCKPARENT | WANTPARENT); - int islastcn = flags & ISLASTCN; + bool wantparent = cnp->cn_flags & (LOCKPARENT | WANTPARENT); + bool isdotdot = cnp->cn_flags & ISDOTDOT; + bool islastcn = cnp->cn_flags & ISLASTCN; struct mount *mp = vnode_mount(dvp); struct fuse_data *data = fuse_get_mpdata(mp); int default_permissions = data->dataflags & FSESS_DEFAULT_PERMISSIONS; @@ -1468,8 +1468,7 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) return err; is_dot = cnp->cn_namelen == 1 && *(cnp->cn_nameptr) == '.'; - if ((flags & ISDOTDOT) && !(data->dataflags & FSESS_EXPORT_SUPPORT)) - { + if (isdotdot && !(data->dataflags & FSESS_EXPORT_SUPPORT)) { if (!(VTOFUD(dvp)->flag & FN_PARENT_NID)) { /* * Since the file system doesn't support ".." lookups, @@ -1590,7 +1589,7 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) } } else { /* Entry was found */ - if (flags & ISDOTDOT) { + if (isdotdot) { struct fuse_lookup_alloc_arg flaa; flaa.nid = nid; diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index b03d39a65191..3c86b5a6e3f1 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -1044,7 +1044,7 @@ smbfs_lookup(struct vop_lookup_args *ap) struct smbfattr fattr, *fap; struct smb_cred *scred; char *name = cnp->cn_nameptr; - int flags = cnp->cn_flags; + uint64_t flags = cnp->cn_flags; int nameiop = cnp->cn_nameiop; int nmlen = cnp->cn_namelen; int error, islastcn, isdot; diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 153a5db323d9..aaff77dcb13d 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -97,8 +97,9 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) int iswhiteout; int lockflag; int error , uerror, lerror; + uint64_t cnflags; u_long nameiop; - u_long cnflags, cnflagsbk; + u_long cnflagsbk; struct unionfs_node *dunp; struct vnode *dvp, *udvp, *ldvp, *vp, *uvp, *lvp, *dtmpvp; struct vattr va; diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 14fbe9a7f281..926a9d311b67 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -846,7 +846,8 @@ mqfs_lookupx(struct vop_cachedlookup_args *ap) struct mqfs_node *pd; struct mqfs_node *pn; struct mqfs_info *mqfs; - int nameiop, flags, error, namelen; + uint64_t flags; + int nameiop, error, namelen; char *pname; struct thread *td; diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index cdd882e09075..e6cf39c09f19 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4006,7 +4006,7 @@ SYSCTL_PROC(_vfs_cache_param, OID_AUTO, fast_lookup, CTLTYPE_INT|CTLFLAG_RW|CTLF */ struct nameidata_outer { size_t ni_pathlen; - int cn_flags; + uint64_t cn_flags; }; struct nameidata_saved { From nobody Fri Nov 21 16:08:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCg9x6k3Jz6HPhW for ; Fri, 21 Nov 2025 16:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCg9x67Wtz3wrN for ; Fri, 21 Nov 2025 16:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0IaEygiWevzdWqEkE0+iSYb70f64PU2ArDTWGFuurXw=; b=m+7AJ6/HJ0a3p58Aq+8sIw9Oe35SVzU2HlXvKS5jIUe3ckOQ7opjdLjxtuokNZifiKNQa1 kyyBKh/S0NFbuJ8VRbJCz9MQOzdhTDHfono+JNHa+/0fzIQqKSLZnsH8J4TTyyLgFiL+t9 FsvFCRzxer7JNP0jUnCoVyO8cL3IXUBiPsl6JNdzTGYk4GNTTa2PNM5DDHcZi+sNxoJ2vn sBSD6DI7jc3kuNmFPwGNgLOJBoExCLIXki33TJxrSKwj7xYOOCDbW3wW9EzylJzteFVA9J R1MENQFjURsTJ53R+mN6v5rPI7BJ5VYNPvH+eVunBvhqwwIzgDi9iTOFxSkcGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0IaEygiWevzdWqEkE0+iSYb70f64PU2ArDTWGFuurXw=; b=rzHNkZ+X3RKCJkMo+TLPM1udV+C2j4zmJ+GpXiNSMLkmDriiaiS6HecMOLJlWRB06BfyGn N0c1LqdAk4kvjwMsCePMEvImdRKpSAeq+MX+kZzyC9raLp+sY60VdfKDSsJ34GaQdiSvrg Bwq5KmJ9j3No8BNBDrzqx035aPnd7CY4fpIN5h0NB8lHOao9TuZdVLZbsxF+ih5GYh6Acl lGBFIYSnedzhwRDcBXOWfsjKLoiiDGLuCYO5ToHoSj5Sm5E1+OxkovdNPkVzThpX+uL05I O1g1JQzmx2pMxjQvO8J4oV/kCUMGPS+suk/tiV8T5c28W+6UUNJ8jSiv4JltgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741301; a=rsa-sha256; cv=none; b=R5VLCT9zuhsJHRGSqbsl63WL3inkhamgQslkONKccEdFoUtYHmLCXGnECmyTy8YccnLksu RxM68XrUsO/rOi/JCtx+9Yeqe0crY0BOg/DX59lqDITNzh/vgq2+nkN7Mw//jNYS4XtJ2B e9L7pTkcDK1HIdKc8+Y4c6YOt/Ez33yN5gZbRc4mWmp05oQrnqYsoysgy/CTddYO2skV0R jC6mXpONF8pn6aWLbxuHbWgxBo8eaulN23QIOBTC0kP7nHnh7djtIdQuXUhUCeqOxaCzNu ttI6MtFPHnqvnc3kbooaQXWJ5rUVu6bonm50Bkr65u39jOZnbPaF5evgjZyN0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCg9x5fJzz3GN for ; Fri, 21 Nov 2025 16:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34648 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:08:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 1c0668c5b33d - stable/15 - dmesg.8: Index kern.msgbuf_show_timestamp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1c0668c5b33d32724c6596b42bc08d22c63c0ee0 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:08:16 +0000 Message-Id: <69208e70.34648.6077f619@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1c0668c5b33d32724c6596b42bc08d22c63c0ee0 commit 1c0668c5b33d32724c6596b42bc08d22c63c0ee0 Author: Alexander Ziaee AuthorDate: 2025-11-21 15:59:28 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 16:08:14 +0000 dmesg.8: Index kern.msgbuf_show_timestamp This is the only place this important debugging tunable is documented. Mark it up with the Va macro according to style.mdoc(5) so that people can find it via `apropos Va=kern.msg`, the standard syntax to search the FreeBSD manual for sysctls and tunables. Fixes: 6910fee62e77 (dmesg: Document kern.msgbuf_show_timestamp) (cherry picked from commit e13664f6a44b4970ea5e8378b8e1a4879fa5d5a0) --- sbin/dmesg/dmesg.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index 0dca0ff5da89..f9b9fce82ffc 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -73,7 +73,7 @@ The following variables control how the kernel timestamps entries in the message buffer: The default value is shown next to each variable. .Bl -tag -width indent -.It kern.msgbuf_show_timestamp : No 0 +.It Va kern.msgbuf_show_timestamp : No 0 If set to 0, no timestamps are added. If set to 1, then a 1-second granularity timestamp will be added to most lines in the message buffer. From nobody Fri Nov 21 16:12:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgH43l98z6HPd1 for ; Fri, 21 Nov 2025 16:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCgH41ZKyz3xTw for ; Fri, 21 Nov 2025 16:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3dqJQ+ugC2el4HzsZEg7gG9svi+izuIU9TpwJupkyjk=; b=LP6h/raidbw4X7DJJgGNneMgmEJk/Wc2x1I+SLwBsTHwvzRau6hs6brpCSEGHlbU42NOlV 3ImvAdWxB4AZ+yildUln1tDuxnGzYvBs/Cxn/JcKibBz4MqTh9yGLtI97gqya1i4aS9bbN E6k6XW2TmIvC+jdWlLIBZ6RuMDF3siT+JY8gsmxpdJXSlqaJRI3bFFB0ARr8P27Jw2/3Tt hXAF9Okv/9sWvwdguZWi38PO9apBaivEhg8L1XJXPqHMX6o2KIhzqgtleC6CeaS82LLiso S1NyeOsub6Ie8YwwqeEoSKtnr6dsATKU/MBQG+Y+Mb9L7f2sc0dNojvg+FDKqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3dqJQ+ugC2el4HzsZEg7gG9svi+izuIU9TpwJupkyjk=; b=JgxByJjAHLOWCnSMJ/TTpkvCAUZN9JdUW0JqcBxHGdxvsekYkTx1DQpbe1zjUr/xXrWSHw lwL2OVnPMzhrxJHgayIP/H/t4oNnJRD25FS76foNw6j1k07lKAQ8KI+Gofh5VudgXUFdFL PIegV1P5doYfcFPCIxDFUgrlrE9iQ74rj0kf1sIk2J97wxXCeeerHScw1flPAvoe1gOfS6 G23scYLduLPqcrJqQHURVukSX6sNFR/bX53RKog7wSgX+z86PmZGv8KrvHETr++iWDz00p b27cevnL/gQF36Q3QIwhYth0HC7recItnVm7uAcb7w3hxqjxe6n7L3jUFVniPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741568; a=rsa-sha256; cv=none; b=GehxzpkKsETUOMpB3OvdY1JmahzeynPnAUvs3FtXW+RXNMMIGs9TVKMuBrIJAhHzyYEQ4v MWxL0wxQha3dndJp1Z0bPeESi1BqNWEzE7r3ICIhWvtCOw5U1UJIar58gvD/TnZbjJ+OmC VSJT/RAZEgvXhcdq3Iav+YSta0Ejk+TX/8H+EbC+3CpBzgmQ5pifE5BOODj0VWIUDMme0w KWkGM7T9N2eDf7pAaJiMdH/CcJ8G6TITH5nDm6HFIIIkJ0IZIgGUIAh8QwVqqQLU2O6Nww snQUnaX1S36mGweNCb7Q3td7nR3pe5t3hLJLyYWj873M1+ymF5mEW4sVw6SP0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCgH418rQz4QD for ; Fri, 21 Nov 2025 16:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35954 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:12:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 6ceab1c42853 - stable/14 - dmesg.8: Index kern.msgbuf_show_timestamp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6ceab1c42853c42d7a1aca018ffbd58b65c94081 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:12:48 +0000 Message-Id: <69208f80.35954.232e4f88@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=6ceab1c42853c42d7a1aca018ffbd58b65c94081 commit 6ceab1c42853c42d7a1aca018ffbd58b65c94081 Author: Alexander Ziaee AuthorDate: 2025-11-21 15:59:28 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 16:12:35 +0000 dmesg.8: Index kern.msgbuf_show_timestamp This is the only place this important debugging tunable is documented. Mark it up with the Va macro according to style.mdoc(5) so that people can find it via `apropos Va=kern.msg`, the standard syntax to search the FreeBSD manual for sysctls and tunables. Fixes: 6910fee62e77 (dmesg: Document kern.msgbuf_show_timestamp) (cherry picked from commit e13664f6a44b4970ea5e8378b8e1a4879fa5d5a0) --- sbin/dmesg/dmesg.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index cbd7d66f9e98..e4c1fbee1e37 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -75,8 +75,8 @@ The following variables control how the kernel timestamps entries in the message buffer: The default value is shown next to each variable. .Bl -tag -width indent -.It kern.msgbuf_show_timestamp : No 0 -If set to 0, no timetamps are added. +.It Va kern.msgbuf_show_timestamp : No 0 +If set to 0, no timestamps are added. If set to 1, then a 1-second granularity timestamp will be added to most lines in the message buffer. If set to 2, then a microsecond granularity timestamp will be added. From nobody Fri Nov 21 16:52:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCh8X5dkjz6HSnS for ; Fri, 21 Nov 2025 16:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCh8X4vC1z47n4 for ; Fri, 21 Nov 2025 16:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763743932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PCcRxuXWlYhIIZ+7qHyosSAcsUo7q6zgs402wySrjfg=; b=LovgXmo/MEXGCAvVd4ULP+osXgrWpRvh5wnRmaf66Lu7cfzpwpS8RtfsuSoZ850ckrquQA 1ofBPgrHjIeiZEEcjIZoIRZ6/RFr+JOzgWwn4GEEFtqLmdbf2XG6n4WEU91OIIa0RmvB2d gI2Er463LQZtOIifYcOUWC9KICUPKxTjmgA9lW7zsr8/pt8+FyrDpVcGWf8s3oGXncfJAP k/270MCX7QJO5pHl/KYB4PYh6Aka5oL9/pRDvNXpeZ0X+Xhm5OjznLbVJxP082K/P/RbJE FlwYmJjW045q1DjJ2BKz08BexaFkBc6I7qV5pRM01BG+HdnkAojtYfwHpDEogg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763743932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PCcRxuXWlYhIIZ+7qHyosSAcsUo7q6zgs402wySrjfg=; b=yEbsJbmDRX1bLr55t1u01dUSmqPYQ1i4MZXf/F+IM5gHuGLduPXEUCVK1cTJbtMYntFGT6 YsHRI8v94daKlNTZ9jmaZ41RnWUmBOPRlp/PrdRW3Y72ei/0DHxeZgD1j+DT8y82ep8MnC l8L4AtVJ0iRM3aj2po7ldGqb1T+/D6kFrD8UVbQMIEjM+gatoPLWHk5FCUYmk/yFvBeHX8 vm3P57dHT5T2+kckF0DSEHSvrfD1JJURd2kbJlHFYUnoIAqYqYEOz7FP1FeYUir6TSexqQ kVYB0usnT/rxuK0fFfkZqKmE/HJdJOsjJQPRdNop9nmD+7R37eXzLfhWq3PA9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763743932; a=rsa-sha256; cv=none; b=T0COXXoGWHOVBHH7J336j2tNguwOWdEPKxKvyYOBQRkNI2of9Ba6GQdEU/vJr8PaK12BpF jCkB7M8HibEHJrcv/bWrOH4FtZcvZYR1HVbOM3ip8fvmxPvCyaD+2aLm3gKyOKb4xaZJNE B1Qf5bSHzOFnIbg6hrLHJK8bQr3WIMR357Q5cW9VuBvWzyKWeYKOaQ/xWhsmQRJmpm+OoE uDF7gC2sye0OJ6FG4dqP+kWMoyD1oX4a4YVF0/y5NCU/ap6fIn0m0VhcyYyHH/c56Nan/L NfhahYM9cbfkJVuAz5xvmwZh4DLeF6RsxP57k5T6bKMs+DlqiQpvbcVRlUJaOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCh8X46D9z54V for ; Fri, 21 Nov 2025 16:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 996f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:52:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Bruno Silvestre From: Gleb Smirnoff Subject: git: cf95eabb5572 - stable/14 - netlink: in snl_init_writer() don't overwrite error in case of failure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cf95eabb5572368c80d72c151ebebca8cf6b2dbc Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:52:12 +0000 Message-Id: <692098bc.996f.212beb76@gitrepo.freebsd.org> The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=cf95eabb5572368c80d72c151ebebca8cf6b2dbc commit cf95eabb5572368c80d72c151ebebca8cf6b2dbc Author: Bruno Silvestre AuthorDate: 2025-10-07 05:48:28 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-21 16:52:01 +0000 netlink: in snl_init_writer() don't overwrite error in case of failure PR: 290050 (cherry picked from commit 488718ff42346888243496c00cbeb42ba004171e) --- sys/netlink/netlink_snl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 03f2b7dc5c38..1a33a814c611 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -1025,14 +1025,14 @@ snl_init_writer(struct snl_state *ss, struct snl_writer *nw) { nw->size = SNL_WRITER_BUFFER_SIZE; nw->base = (char *)snl_allocz(ss, nw->size); - if (nw->base == NULL) { + if (__predict_false(nw->base == NULL)) { nw->error = true; nw->size = 0; - } + } else + nw->error = false; nw->offset = 0; nw->hdr = NULL; - nw->error = false; nw->ss = ss; } From nobody Fri Nov 21 17:43:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCjHX57WBz6HWWf for ; Fri, 21 Nov 2025 17:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCjHX4Nl6z3K5j for ; Fri, 21 Nov 2025 17:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFaeqg10ApLkSYx3Jh6sRZxbs1fUlNPml0JkyZsV/iY=; b=jAqOQQCG/OejeIGvOUrKLweANyz80D2XFMk5vOimhQsvijve49/n3nuJRimU2aYO2e8rX9 FLh8+N4Mvt5dQyBAO8kXf19MAte0K8DSGQR3I2qsrjCzCWzPsNzFtqt6gU1bauq8YNOFay 4DKv541t3HIt02arsMcyRHYoxfIhfU/hDbt6/F/R+CrpC1E5EJx0zoznSC7s5Zjf3RHo1I tnrZZyOyapmIYVz9A0+Cqi6Q9poZo0Seudlm7wq/6BtXoXTp9FysYByedeKGXgvE5PYGSd R5rqTivdN2HUGEccE5ZjiOgV26CO4RYuvQ5sOX1FHsOc+e7Bt8e4m1n9jP3MKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFaeqg10ApLkSYx3Jh6sRZxbs1fUlNPml0JkyZsV/iY=; b=ugM0a1M+hwekXg6u7EgUX8CVCbj8HgKg2+lfzMIlI5zcD+Y/35HU+BWGie0Eb/32oMqjpX O9+Ow5WqecrSVCfOanwAGRGn6Rssk0C8W6u2EfbtD+8CgeFfQakGnoeQBOd2oguKZG3KXf 5oqzKjzJdD7hIVSJxd2pCx9KKU2rhHbZFzVrfn+CzgL5Cq/ukvvTWhMzKh2n5UHIzL0SZE WYXKwYBC0RWTdaWcy32A3bGYtGEJIsZUfXZEhEvqLD/laDhEvYzAXBVgpG/6jrGF5T+hfe TFDO1T+VxxU5LHs4aeG/0iql7R/+8gn7bpYeKsI+3S77jWOu/EzPqK9YjfockA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763747000; a=rsa-sha256; cv=none; b=uGEneJ/gVS13UAfBcJHrQ7GQA5FmF5829xEMil7ObS55GI1b14QncbKhZK9cj9qP1NFm34 2u9ekh4NTjKjLgkydTDdK1o8OTOuJvX1iWa1lyX1DEJ/dDik4o4nF9/NscYv+h+hzQCIkH CLFQAved9LKoydjq4vaBj0mIW5Ow8y4Vbg046Kei0MebwmULVz466PwP88zaVnS838aMzD QFMulJn9X0xKmJU9oyFpFCB8CCTHMDLL0fge42K5my8kiOpFmX3Oj3wErBKU2f0GbXymhn 86XiNp6vFxKBma22jXk3qBQDqryQPbmio4CdhaolZ8PvjuoBO1FmAfLSpCPH2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCjHX3xH6z6W4 for ; Fri, 21 Nov 2025 17:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id dd74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 17:43:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 2da71ee296ad - stable/15 - vt.4: Document increasing scrollback size List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2da71ee296add6c39e26e8b103dd24a12e8ce320 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 17:43:20 +0000 Message-Id: <6920a4b8.dd74.734857b0@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=2da71ee296add6c39e26e8b103dd24a12e8ce320 commit 2da71ee296add6c39e26e8b103dd24a12e8ce320 Author: Alexander Ziaee AuthorDate: 2025-11-21 17:40:56 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 17:43:10 +0000 vt.4: Document increasing scrollback size MFC: immediately as 2 llms say this is impossible Reviewed by: adrian, emaste Differential Revision: https://reviews.freebsd.org/D53860 (cherry picked from commit a8740ba860bfc35879f886b80b30327d0d3b16bd) --- share/man/man4/vt.4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 21d69bf9d495..6176c8c3093e 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 7, 2024 +.Dd November 21, 2025 .Dt VT 4 .Os .Sh NAME @@ -352,6 +352,12 @@ Notification that the console bell has rung. .It Li hz Ta Tone that was requested in Hz. .El .Sh EXAMPLES +To increase the scrollback buffer size to 22500 lines, +add the following line to +.Pa /etc/rc.conf : +.Pp +.Dl allscreens_flags="-h 22500" +.Pp This example changes the default color of normal text to green on a black background, or black on a green background when reversed. Note that white space cannot be used inside the attribute string @@ -414,6 +420,7 @@ at boot: .Xr getty 8 , .Xr kldload 8 , .Xr moused 8 , +.Xr vidcontrol 8 , .Xr vtfontcvt 8 .Sh HISTORY The From nobody Fri Nov 21 17:57:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbm1F3sz6HX9m for ; Fri, 21 Nov 2025 17:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCjbm076Mz3MDg for ; Fri, 21 Nov 2025 17:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2Z1KW7Ms2hK5LO9dERplIbXsYMvpvsFIL/WGZAoFrs=; b=BukQHIX8mmVyNDphawZCq3w3ts8AH8pb9foXAG0w2vcUy7Y59VEw1F+W6Zq11bS1/UJwHm ecwjXkyLUDPfW/z2gXihs37Os7XEeADG0gk6lNaAoLtGfycoBwx02PhwXCodnkSGugzTUE wCswQMv0iVqXidC7TlQNhjrCI1l9bMHVnSw+WfBoCeFz+ML55iJdl0QTZwyqJvkV+HMSe7 L9A94f8n95HveODyVo2URxyJHcJK0CHbrSvEWZyhsfX8dCNxPhmbfghdqN84Kq4dlIRbP6 FPLlkQBIoMFSB2f+NSy6uTVmpiE/tf44N6pOVsiCZYSR1fRUO1/5BwVpdem5yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R2Z1KW7Ms2hK5LO9dERplIbXsYMvpvsFIL/WGZAoFrs=; b=BkVa4ar6AHis2Ci4ZqmDJzEWkjb8PtFYXh6yzPuBUfbPqnceMLIwf1AlYkX0A5b1MP1rkf KEegKqY+O234cBHog/toYI4/L6CUKEb0Us7k53kG4VoaEmNB0sBj3KAvEDzcrXPWzQDfck i4VFgBuD1GHxBcn+S3mSky4MH4XbMelDznRJ5kv0/qkh/qbD4gX4xH4U96PVuOuVoZ0YHK o0bFrBRY1h6YOUOch9ctMmS6b10ELT91lbgR4qwRHpSGQ7iz4N3Kvv7RdIxqf5wn9hppHn UPjDSa3uiqxjBmT/i1YlCHp3XJXDFa3hPY7wi+7UdZ907kuPuq06Xk9ILEMPXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763747844; a=rsa-sha256; cv=none; b=Ir9fzJAmOMFaM7UZfpwYarPPGfZAVmqGi6CHcITSrPh0kCowNRRUmVBRWM8L5/K/yQ5PFU evNINCiSl2Mq1hyBnD0e1hwobPaTBI1qecINjt5cxtdCr/OkrkhPd4JenAIOpZ4OT3lXTL KjLLDZAH+X0xnJUSmPHFT05aPd6wCMKXuCzolvmTxynCvLawRg7+HK9TdxYnJjGjDj4ROi HmopqeR82WmFEOwM9zoR7Z554pDwX8czjbt0l8rq6u0ywcDLtUVkQwlWBJ18WnTEBiV/9M 0gwvR869pOEaN9yRd7bUQ34yJ8ep4CAamJ5wdnk33HEufP7jYjuwRUa9LGwW3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbl5wVgz70S for ; Fri, 21 Nov 2025 17:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ee54 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 17:57:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 3035855815c2 - stable/15 - loader manuals: Clarify console and boot_serial List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3035855815c2fdbe27b65b9ec0374f4583ceb3f5 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 17:57:23 +0000 Message-Id: <6920a803.ee54.7fa85734@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=3035855815c2fdbe27b65b9ec0374f4583ceb3f5 commit 3035855815c2fdbe27b65b9ec0374f4583ceb3f5 Author: Alexander Ziaee AuthorDate: 2025-11-14 14:41:57 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 17:56:56 +0000 loader manuals: Clarify console and boot_serial console=comconsole is for the loader and boot_serial is for the kernel. I think we should centralize documentation on the loader settings in one manual, such a loader.8. The current proliferation is not obvious where to find the documentation. To the user, these are all set in loader.conf or at the loader prompt. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53695 (cherry picked from commit 09ffaa4e07d749c83cc1db13829505f21b025f29) --- stand/defaults/loader.conf.5 | 3 +++ stand/man/loader_simp.8 | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index b1661e8c1101..8c43bb62a135 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -343,6 +343,9 @@ selects the video console which prevents any input and hides all output replacing it with .Dq spinning character (useful for embedded products and such). +This setting is for the +.Xr loader 8 +only and does not set the kernel output. .It Va screen.font Set font size for framebuffer mode. The default font size is selected based on screen resolution. diff --git a/stand/man/loader_simp.8 b/stand/man/loader_simp.8 index 683ca8b2da5d..52cb598fdd89 100644 --- a/stand/man/loader_simp.8 +++ b/stand/man/loader_simp.8 @@ -358,8 +358,8 @@ in .Xr kenv 1 , not for any particular value. .It Va boot_serial -Force the use of a serial console even when an internal console -is present. +Force the use of a serial console for the kernel +even when an internal console is present. .It Va boot_single Prevents the kernel from initiating a multi-user startup; instead, a single-user mode will be entered when the kernel has finished From nobody Fri Nov 21 17:57:24 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbn2bF7z6HXb8 for ; Fri, 21 Nov 2025 17:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCjbm72zvz3M62 for ; Fri, 21 Nov 2025 17:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GJaVvXHHQ001l1S1MIorQDKRvYg1xwr1XfdGg57TH2c=; b=Tc28w1DQP8Z6ukn/CNAM8k87FzfZq0upysKf0HEf8nK7vNXiDVyLRppHescu3yVIdkIPmI xfVxgcrYCN1k+5Ubs8Z+9mTbrHSqbigEWlNGTeuPijXl9n+T5Or/QZdF9oGaKoYZrOC2Cw wZb7sYKcNN3mriLOBR9aXmDGbas+k1NAsB0kkYl8SDRfQGz0eapSw7T5btX0N0CXsm0TZv I/ql2Jifmuw1YPfGvW4R5aNkk38ZzLCGRv3/81nTnpoVty7hyo4WUDMwySpO/om9MKLwf/ twwFfn3UyDJ2DiKfD9pCX0TftMTqEzGLj5hs3ocSPMQ1fL6DNgcOxSm2k7Q50A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GJaVvXHHQ001l1S1MIorQDKRvYg1xwr1XfdGg57TH2c=; b=aneKXIul/zkyIdGfWEkBo6Ef4LrxEf6irVYx4egncLU4UQCFzZMADxmIZCQNIK8LCcn/37 SqgdaLlhkmB3+XmZ+ul73OPeXDEF8iYZ9Nwb/GU2N3sE8aIvbze1szK7JawzzSVT099W/6 xrq9/tjjbvT8YGO5TUA+lK2UkDTdNByiY56fCZDU7usWXBFLnefA+0QFDqM6gPhcZr8GIK UbjxgZPgH60rBHfIDVPB/2CctR2aue7bDHsYdqjoral914AfcZeCquqyix3t9rPm7YGum3 V5v/csK9qbBDqwWXoJzDD+omYksA5FfwBcEQHdEahbzlbqnNDexx6zNxr/aY9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763747845; a=rsa-sha256; cv=none; b=O7fGIs5Ya9H692VJS2d8z42ulg+bopc7h8bZPVC+W5Ud55ycYkYXeuHSAEDQ34HJ03mCsw xL9YMZrWEFYGkNxn954E5qDnowiNeFPm8gnJLdq5UJImmplgA2ZeUIhHye33QMMrChwj2F usSskL+nfZQlnsDpHaHbgcpRgUl6DgnaQaabcif+1qyw3wZWTbUiYs8FU7DKrleK8bdmNt fLbRfBU4QQfn9e7HyMvN4mVfR48DfQ/22TbTI4zHujgzzTLj+SmEo4jpZ316e5ofGyaFmn ycwACFd92stEyER1PcMFoFPe3MKkNyo5v8LkIJILLo7ija0FY+QubpOIQxYcKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbm6Tq3z6jk for ; Fri, 21 Nov 2025 17:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d4a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 17:57:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 513b9db1a829 - stable/15 - loader.8: Document module commands List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 513b9db1a829b4efba91c86f280ba97b26c82c1f Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 17:57:24 +0000 Message-Id: <6920a804.22d4a.5641d076@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=513b9db1a829b4efba91c86f280ba97b26c82c1f commit 513b9db1a829b4efba91c86f280ba97b26c82c1f Author: Alexander Ziaee AuthorDate: 2025-11-14 14:59:09 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 17:57:22 +0000 loader.8: Document module commands Begin documenting module loader commands in loader(8), where the reader would look for them. Segregate them by their availability in individual loader implementations, like build(7) targets. These details were graciously donated by kevans. MFC after: 3 days Reviewed by: kevans Co-authored-by: Kyle Evans Differential Revision: https://reviews.freebsd.org/D50727 (cherry picked from commit 6fb0d67819f730e8def56e139f780eff3c0cab0f) --- stand/man/loader.8 | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/stand/man/loader.8 b/stand/man/loader.8 index 234eabd571e0..484e0a7b300c 100644 --- a/stand/man/loader.8 +++ b/stand/man/loader.8 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 29, 2021 +.Dd November 14, 2025 .Dt LOADER 8 .Os .Sh NAME @@ -89,6 +89,52 @@ The commands common to all interpreters are described in the .Xr loader_simp 8 .Dq BUILTIN COMMANDS section. +.Pp +The following commands are only available in +.Xr loader_lua 8 +and +.Xr loader_4th 8 : +.Pp +.Bl -tag -width indent -compact +.\" sort the following entries according to the second field +.It Ic boot-conf +Load the +.Nm +config and commence the autoboot sequence. +.Pp +.It Ic read-conf Ar file +Load the specified configuration file. +.Pp +.It Ic reload-conf +Revert any previously applied settings, and reload the configuration. +Set comands that were executed at the command line to override variables +previously +.Cm set +by +.Xr loader.conf 5 +configuration will also be reverted, +along with any module options that were toggled. +.Pp +.It Ic enable-module Ar kmod-name +.It Ic disable-module Ar kmod-name +.It Ic toggle-module Ar kmod-name +Enable, disable, or toggle loading of the kernel module named +.Dq Ar kmod-name . +.Pp +.It Ic show-module-options +Describe all modules the +.Nm +is aware of, and show if they are enabled or not. +.El +.Pp +The following command is only available in +.Xr loader_lua 8 : +.Pp +.Bl -tag -width indent -compact +.It Ic disable-device Ar device +Set a newbus hint to disable the +.Ar device . +.El .Ss BUILTIN ENVIRONMENT VARIABLES The environment variables common to all interpreters are described in the .Xr loader_simp 8 From nobody Fri Nov 21 17:57:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbr1j28z6HXW0 for ; Fri, 21 Nov 2025 17:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCjbq6KJjz3MLR for ; Fri, 21 Nov 2025 17:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rbpvk2ywyVNse/TfQOorMrczL8woOGcNXAXp3+EBSYU=; b=LsMk2fVx/Ls26bhKhYu1Ufyc1T//8Y6GcYcPxY7XY4NNjYcHL/JeSVpQl92C4JyQoeD/79 GuKpoX2CAHHwy1kPaE8+wk/twkaSsdhndqb5nI64v4/hI3p+pRBuXUkYTfEPNeAfu/Z+wo ky2Md33+a0VGv7EyxsYBlIIzQpQspn3xc2PfMofZOhhEjAopXWhWdNY+pocwVowIgXY2pv xG/f2cVcg7cTPT4JBO6eO2aLZjRB/F8c4vUwUJk4iWBZ/E0JADT8eWzOQlTwqADtxZfWgK DnpaPgF62UjuQLjxRKiNdvqSjWmDbNEmX4jxYEOPVM2VaGa5xxOIEFKz5KcgWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763747847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rbpvk2ywyVNse/TfQOorMrczL8woOGcNXAXp3+EBSYU=; b=ymbEL7pvqnifoQLDd9Qk3I8MdS6vic1nXim9CrhWPsC2O0WZB+z8/QByyrW/4anNpDqmpH woX0A6ie8yUVTvo3yEOV63zwJZtTylr+EeXQH8Mq9Gdq2hNy3SkR2CyjW1WsfL/ltntjSl 18E0bJLKoIzQtacbIJrpQB0f/pK1+zKt8AxAZTLsitdCWRmp/b7aVp419/jyZ2CrB+eHHT Er2qlG9KshWF52nwmU2RdV42l0ohSZBqLP6oKhbHKyOPCgEQrQhOcMegqAQj8t3AKtf4f2 qzZxYRdGSsapy25GJiqcJtB08X5cK/VqNfSi8hCoP7hklhQivxVLopIY6in5IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763747847; a=rsa-sha256; cv=none; b=Wv+RVC7bSfrDguOIYxLaIN/KKAEFkL1ZFTTFrgI+y6LhtU6Kawlh7waaZI3BmW9nBkkh0k gxdqJZgxaKoXSdxlHCVJk0pFVXD8oz2B0u/mBKuMIvT8+dRRIkd2b6bkBHEHAgE4rFwhse sGggdBmZPHOF+5TfesCY8B2eMg7eahglEdnwX5e6ekHGLQEgG+Q888gtmoghfM69FOPZUb E9AeWkB1GT5ISu9BPnZgXmDFOTU7kPh/oyors/VI4p2wjhvhROnnPnaKVz6TWf389qj7XV N0eqbAdCbP3wWaiWAUDTlQDRbAcZ8+VaDZfDEviscNbNm42USGWdOuQwbI9DNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCjbq5CZmz6qx for ; Fri, 21 Nov 2025 17:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21e70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 17:57:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: f0bb9d28eb3c - stable/15 - freebsd-tips: Add a shell function for laptops List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f0bb9d28eb3cb29b6e8f2ecd7de4e743dfbebc98 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 17:57:22 +0000 Message-Id: <6920a802.21e70.241caeba@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=f0bb9d28eb3cb29b6e8f2ecd7de4e743dfbebc98 commit f0bb9d28eb3cb29b6e8f2ecd7de4e743dfbebc98 Author: Alexander Ziaee AuthorDate: 2025-11-14 14:40:44 +0000 Commit: Alexander Ziaee CommitDate: 2025-11-21 17:56:44 +0000 freebsd-tips: Add a shell function for laptops MFC after: 3 days Reviewed by: pauamma_gundo.com Differential Revision: https://reviews.freebsd.org/D53748 (cherry picked from commit 42d9ae4945f281d12f3ef96cdbd7356e067f8b18) --- usr.bin/fortune/datfiles/freebsd-tips | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips index 6a2b59ff5fa7..379f772fea88 100644 --- a/usr.bin/fortune/datfiles/freebsd-tips +++ b/usr.bin/fortune/datfiles/freebsd-tips @@ -860,3 +860,11 @@ When netstat reports every 8 seconds, it tells traffic in bits per second: $ netstat -I bge0 8 % +Using vt(4) on a laptop? Try this sh(1) function. It provides an "h" +command that prints the last 22 commands executed, the time, remaining +battery life, and current working directory: + +h() { fc -l -22; printf "%s\n" "`date +%H:%M` -- `apm -l`% -- `pwd`"; } + + -- Alexander Ziaee +% From nobody Sat Nov 22 09:19:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD63g2b0fz6Gjxq for ; Sat, 22 Nov 2025 09:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD63g1h3jz45Zn for ; Sat, 22 Nov 2025 09:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KFU3MDf2Jz40zhoNID1cadliiHeYSIv7jDmZv2an3qA=; b=al0aXON9SFcgbYp9nH1xeg7KHcPZQgVHEiFjMDtq6EC+5nLWSPsvicHgIq2zSbfX8jV2Bc AjmR4sQaAMwq0/djFz7V94KwwrtYCnX6wXQ1W/Wre334A+H8VCK6S6m0r45qPG0d8vCgvF qVcND0rekeYBavZ+kJ0cxfAFw6VkZfKcAdklje74lQI8m7KughZhcpaPYLacP65437X7VR cm9K5DZoYjVOF3TBtRxMrKEmbVXeQPiz1H/e4ByFfypJ3W5QRj2r7ae5E5JZ5gbZ6raHHp i+UAZplcQ743nq9aZOZx5+BVdP+ViGrze2Z/OBXluT05/9L056RvmqvSTgssvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KFU3MDf2Jz40zhoNID1cadliiHeYSIv7jDmZv2an3qA=; b=LXdZ3QNDyELEwk43Z2jItSZpuCS3JmTwlXdW3cD4G104HIzK1mkDKSX05l4+QtMRiI6rps v77k8/anId07L5di57CthaUBm9EXf7LAY5u72zo5Vk0GpMz9TW7w8LJXTW+AjRAOEJW70U z+rFwT24Ix4F29/1s44BmucJT4wdhn9NMfw3t9MSv6knyanxkoC9lciYBarZ+4zci4l3Rx e0NyV4+3U0PnIoBEQTILac5xWqnReO92pCDpRnIPwYh8H0Zd186T0+BqjngYmT0gox4uzx skhMK6V37+AIwFoYSeJNrK1XL8XomBLfSFRiM9EjhCbLUTrayK6uqp6JHXVTzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803167; a=rsa-sha256; cv=none; b=Xjwjm2U5Ynoj0zHX52wb2Gezad9rOq3uPDG3nydty8/BftCvuFWgxM+mXSx3c/o2lDkb2+ lezvfnynG+IHNHVevw8xqiuwmUTy98fXbCR8D2OKGxLAGc0w0Dx9409wJ9vqHaV+e8w/IF S7q9Q6fDipTDu9fIwjxjbCTkBXGgTDQiv6XXf09tG0AuIMdTnItSGWUdh/tfXn0SzxK/o4 QAhw2fp7Dq87dsKzhywEB/OEhNo+p8rXQf7UQPoVl5xDEMsiVAUgxlLz/x7dDwVQLpgG+S 8u/Jmqa5r1Mxrn6IAY3E7s/wM0Hhmz8hoLWw+5t51RzE3Vd7R3qVI2e9DyWK4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD63g0l3SzsMk for ; Sat, 22 Nov 2025 09:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37de0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:19:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 59f13e4da451 - stable/15 - stand/lua: Fix two typos in the manual pages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 59f13e4da451d168041c9f04bfcdd0610ff12a87 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:19:27 +0000 Message-Id: <6921801f.37de0.6fda684@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=59f13e4da451d168041c9f04bfcdd0610ff12a87 commit 59f13e4da451d168041c9f04bfcdd0610ff12a87 Author: Gordon Bergling AuthorDate: 2025-11-19 14:23:07 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:17:34 +0000 stand/lua: Fix two typos in the manual pages - s/Additionnaly/Additionally/ - s/commmand/command/ (cherry picked from commit 6f14b6025a6f6475522697362aaf6c84514b85bf) --- stand/lua/config.lua.8 | 2 +- stand/lua/loader.lua.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/lua/config.lua.8 b/stand/lua/config.lua.8 index 7e8863203446..f918ab7ffbeb 100644 --- a/stand/lua/config.lua.8 +++ b/stand/lua/config.lua.8 @@ -66,7 +66,7 @@ as a configuration file .Pc and then process files listed in the .Ev loader_conf_files -variable. Additionnaly, the top-level call to readConf will process files listed in the +variable. Additionally, the top-level call to readConf will process files listed in the .Ev loader_conf_dirs and .Ev local_loader_conf_files diff --git a/stand/lua/loader.lua.8 b/stand/lua/loader.lua.8 index ffee46526c9f..b750d42e2158 100644 --- a/stand/lua/loader.lua.8 +++ b/stand/lua/loader.lua.8 @@ -90,7 +90,7 @@ Obtains the value of the environment variable returns .Va true if -.Va commmand +.Va command is present in the interpreter as a builtin. Otherwise it returns .Va nil From nobody Sat Nov 22 09:19:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD63h3GpJz6Gk1M for ; Sat, 22 Nov 2025 09:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD63h1PPCz45P5 for ; Sat, 22 Nov 2025 09:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T2BaAnPjEbm6ZfEsD424Ik2OFCD0nZ4pwlE/8gbGCPU=; b=U94hWrKZuLxfrKMwzcIRY6NVduCaKWY55EF1Pt0dSCz0iGr2K5DrgaZzJ92/bayIfGeZnK L6zZQfo0WmY83cwYMbDKAOP543YLL2nGbQLLc6mSTJZ379nO+frmR1WHrtuZPKyWvV0msW 9pRhx7YreUMwZpaQ7HFYFd8pES4L9ZG37MenOIEZGLyCSV/q87ZPe5AHalWPd9zQj98Jmw uH1opV6uVhgE8Ti5nAAIrlLW4hOX7WN7ApiO8zIpZKs2MNU3wHtj5XYpFmFjUGznHWrX/4 JdmcktJ2k0cGCfeYeK5/HGDnUYeGa0BFx08JA1uRSpQF5Tb0vjqa6UfWBiMx/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T2BaAnPjEbm6ZfEsD424Ik2OFCD0nZ4pwlE/8gbGCPU=; b=SOMEH2CRU0RPEq1PfM3xzhAWFcf0QuILRxaPPq7sx40N9L2DpqteFNjsa8aG77J2OIGycw mxJnebbWRVmnldMcQ+CmcKLcJh+czfTxHmttp1z8JpguYTakH8O2TZohso9kQ3Z1+SkFcJ 9u1h23r2JWRdO+8yIqLTPmlAbMRyMYH+uqWsiEpWMX8G6l6cGQtrVd1BNUkFTMsgzU62GZ ZoE2Xqbo1a7bOgsoL3S+iQggh5mA00QETThKd/RSVoDddL4TN5H4r8yM49qEVZpydFjpCK PpPuCJQfcAunYMxwYxpDOV+xJ4y+deHlG5vlofUGcGFGttcYnTmaYNBo4Xn69g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803168; a=rsa-sha256; cv=none; b=du/aVtdHIgITXnpuCbdhG/1U2PgLzQ4vRKAc+wfUKCBIDMj/Z1uaZwi61cILKsVZjySn65 Gr5jUmUkEKlNsN9o+9rTmbt52wIyVa9VxQjGo1OIbv0CKSd1hZCVFzCmC1m7zwRSXt44uQ 5oHt/SfUEu9IcJ9jdP1yqACVG43KMvK1MgbIh6aQG5qfQLz7GjJP/2MlQ69D9wl9ZjSmA9 170XKGsHlrs4HLCHcaapoTH6P6ByyiwFVh69bNk6tlEGD1HAMRd4MbV4eS36NPozP674un E0JjDclsQ11P41urtS/CtwxE/yD4A/YEJ4XbcHkPa28Jyph3RvH5kgpSGk+1Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD63h0hzjzrhM for ; Sat, 22 Nov 2025 09:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37a97 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:19:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: bfb3d518ff8d - stable/15 - exit.3: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bfb3d518ff8dbc95f68d5eaa84200fda1707ffa2 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:19:28 +0000 Message-Id: <69218020.37a97.68a54305@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bfb3d518ff8dbc95f68d5eaa84200fda1707ffa2 commit bfb3d518ff8dbc95f68d5eaa84200fda1707ffa2 Author: Gordon Bergling AuthorDate: 2025-11-19 14:17:40 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:18:19 +0000 exit.3: Fix a typo in the manual page - s/avaliable/available/ (cherry picked from commit 9334fa3ef5e19de7d3dcdbefdaa3f6b6b653475a) --- lib/libc/stdlib/exit.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3 index bfb14c5c9f83..40010e678e5f 100644 --- a/lib/libc/stdlib/exit.3 +++ b/lib/libc/stdlib/exit.3 @@ -104,7 +104,7 @@ may be used to provide more information to the parent process. .Pp The complete .Fa status -value is avaliable as +value is available as .Va si_status member of the .Vt siginfo_t From nobody Sat Nov 22 09:19:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD63j5mNZz6Gjky for ; Sat, 22 Nov 2025 09:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD63j21rtz45PB for ; Sat, 22 Nov 2025 09:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=krfCFVIi3FR2N5/h7w8h3DEnxSrLHm4jlGQf8TA/eyo=; b=fm0eluLioqHL1SX5MnCfAvhdSMajuecUWLr4cy8hldwYO7/8kwgi4mURQOmAYnYJ4Y6e/+ PqeDt8td/5gZJ4kUjFhE+IlKtdkfpPnQB5UznzXGT/35mjqed9dfrnbh787DcJZKrBcm/B MVvm1tJA/EJQNNczrb6WBc19Ct4uTWRqRxpM8ZFRjuxbFucTmoMOp2p+H1TO/uoWg3xL+9 RVSquJfpXOCnEwxaTT5Le68lBHj+ldP4F0IZS4SKUmBPVym2JL8JGGAANZBQ+iUNDwbZ4c OrYvKnm1kh/dkhi+gb5lAKW3rDraZaLkHp72m731IealzjDJ1xUqeKHF0J8CjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=krfCFVIi3FR2N5/h7w8h3DEnxSrLHm4jlGQf8TA/eyo=; b=KM3nc6MrhQJ4CGGmsoExRqcptDkrKYeB6RkdiGNZcEJ4atR8U9rMR+hn1+zphZ+T8zzTwj A9+4YoE/uVxdyT7FDatgUxrSJaQcEFrfrq/JH9XwFizfjgVkJ9DchhzoMT24EriixitnLt lPGF0BoqMVcLtFJotgJyl4jDwH3bWdmJvfh4CjplI5I7+YApVhA5F8VJm7eWikosutB/AD j7QUB0P9Yforpqb1fmSKDD1SOhd2TLtb48RxIhhojcVhV3pbDbLPepY9ypXJeFyLL4pptI kbeAiXvtMvu4sW/F3nU6aPBKMF+O1Y5xzLkiYXypylgvQLG8Zx7fT9n0wwobBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803169; a=rsa-sha256; cv=none; b=fNnz0oKkJ21tkcyNHhF/Pw/d5CfIjh3AfUlKdyb7kyXNXgokIUp+j7s1+qkZRdCDIJd9ZI wEl32Xev/N84fosM5ccNr0wg411Op9zksUyzGBT6CXqqrkZy5+AvzEAyJ1OQFZeJPpaigv eQbqCbi1wBPSrLDHspO7xm821ti5m7lSwOd2KkaubFfOqFNPC+9OYWjhPMl+K7dTvY24+A 9jHwCDr5U4L3cb2s94Cd7v831HpDba/LTysOJJoC07ZkTXe1qJDkyX63uEG8syj9C04gtK TIgUh23LvPHQMv23DoUQGIQVBlnYLSLxDCkNknteE9vzq/CUzpv9YpA9e1FwGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD63j1RZJzrfd for ; Sat, 22 Nov 2025 09:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36e65 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:19:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 734142d4a208 - stable/15 - nuageinit: Fix a typo in an error message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 734142d4a208d215b3d31781bc0a8292b226fe79 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:19:29 +0000 Message-Id: <69218021.36e65.37096c7a@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=734142d4a208d215b3d31781bc0a8292b226fe79 commit 734142d4a208d215b3d31781bc0a8292b226fe79 Author: Gordon Bergling AuthorDate: 2025-11-19 14:28:54 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:18:35 +0000 nuageinit: Fix a typo in an error message - s/outout/output/ (cherry picked from commit 73a026d5e9778ac182be4a5876771eefa2cd6f41) --- libexec/nuageinit/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 29340a3d91ea..f68e45701b6c 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -63,7 +63,7 @@ local function get_ifaces_by_mac() ns:close() local res, err = parser:parse_string(netres) if not res then - nuage.warn("Error parsing netstat -i --libxo json outout: " .. err) + nuage.warn("Error parsing netstat -i --libxo json output: " .. err) return nil end local ifaces = parser:get_object() From nobody Sat Nov 22 09:19:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD63l09gNz6Gjvm for ; Sat, 22 Nov 2025 09:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD63k4ksvz45b1 for ; Sat, 22 Nov 2025 09:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tsL7bjCd657VBxi+JqhfDS9MVvqgAdc1nv2nxAbRqDQ=; b=uW29pqtwD0pzGvFZPmhFQBDheXsd/xISBQo3bh0fm20fLPjp2EwZBo635vq6v+rwDjyPvn Mxw0/xyBawG0by3Agia/kzAsaXz2qk2ABfXBuEIZzr+p2B4BcixYHV5jUgwTMubaoRrBPy hUS8QMj26qZT6IvwjCzdYJzvOHTtu49L4QgTrK3lcr7nromsxdn1aYyYfnsZqYB+ZoY3CD xSk68JfxC1M5SfInl9IP3ZFZ/ksUwnUZ8kHPyXrp1SEIKipV5Jt7KKMhXpYwxDBm6x71NS PiL9eAyiY1xQKhsbieCBeybanGDs35eDgbRgMzRxDMNs397C+BxfWmQi9XLZFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tsL7bjCd657VBxi+JqhfDS9MVvqgAdc1nv2nxAbRqDQ=; b=hk1Eu1pJKHuHMFJcsH9K9vt46aSo1XhPdFvCMeVTJwBKFmUueLTKcDHNaBn/N19a8UKStj /Nl1CmHs2hYmlDHYeqmdQQbT1iOvUgySjxXYfU5l++VOoBhenPbqY6ti4fZ+UDlzhUx6K/ sqdhbaXFMnZ3Ki2DFTn08XhjwxfefjKimX9n0qwaa6rdUvTKtB1ekB72qVd7nEodwd65Ga 4lBQO83Pw73fFJQ1+bqf3b+4hTKiuvTX7BBLKyzj5sDzyHvxC0Kq5CenVe8+5yOe4fzgkx +PCQnUApHIBkv3dZxG0g3Pz2pu6g0Z7lyKcum7zvg/hwj8bJ08ZfaVKiRmo7/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803170; a=rsa-sha256; cv=none; b=o6CZjBlOZMguaX+SrOhzNNmvwULtAXppA5xr6a5sDQu0fl5G0qjFvhT5DJhXIHU/xbw4Pe VGKuN31l7vtE1puLFxg17AVdToC6dZ8F9mWYqQ88qgnpjf98614Cs5QayIpjvgEE24oX9U 6SsEEBw7sekJ8L2Ts/VflbSv6pd2PkHRPYWnhSSO4n0ZzsjhsWCh50oySgb3x7v9qkrr+f UzdgIiQ+TAd4AlrsUdxa2mhhT/kAZDWkkmP+L4mNc00ZVBgN7jZgxrOnmi8LOMnjQALZS5 gXIt46BgBHqwLPVjydrjPZVFh4P7dhZAzHYJvq98HrbMoEsSbN02LYILEYJWog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD63k2FGwzrhN for ; Sat, 22 Nov 2025 09:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37c0e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:19:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d48dc8c0c731 - stable/15 - moused(8): Fix a couple of typos in the manual pages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d48dc8c0c7319b927f9d1ca44e83e5a232ad7642 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:19:30 +0000 Message-Id: <69218022.37c0e.312faaf7@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d48dc8c0c7319b927f9d1ca44e83e5a232ad7642 commit d48dc8c0c7319b927f9d1ca44e83e5a232ad7642 Author: Gordon Bergling AuthorDate: 2025-11-19 14:21:09 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:18:53 +0000 moused(8): Fix a couple of typos in the manual pages - s/compatibiliy/compatibility/ - s/rewriten/rewritten/ - s/derrived/derived/ - s/suppported/supported/ - s/Horisontal/Horizontal/ - s/thesholds/thresholds/ (cherry picked from commit 64bbcff94459153ae6e118d7776e379271bdc0b9) --- usr.sbin/moused/moused/moused.8 | 4 ++-- usr.sbin/moused/moused/moused.conf.5 | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/moused/moused/moused.8 b/usr.sbin/moused/moused/moused.8 index 2483f8a04b2a..b414b2ff787e 100644 --- a/usr.sbin/moused/moused/moused.8 +++ b/usr.sbin/moused/moused/moused.8 @@ -299,7 +299,7 @@ or .Dq Li generic . .It Fl l Ar level Ignored. -Used for compatibiliy with legacy +Used for compatibility with legacy .Nm . .It Fl m Ar N=M Assign the physical button @@ -529,7 +529,7 @@ The .Nm utility first appeared in .Fx 2.2 . -It was rewriten to support multiple input event devices in +It was rewritten to support multiple input event devices in .Fx 15.0 . .Sh AUTHORS .An -nosplit diff --git a/usr.sbin/moused/moused/moused.conf.5 b/usr.sbin/moused/moused/moused.conf.5 index bc62b5d00995..4b3955c8c7d1 100644 --- a/usr.sbin/moused/moused/moused.conf.5 +++ b/usr.sbin/moused/moused/moused.conf.5 @@ -37,7 +37,7 @@ file specifies how the (mouse daemon) should operate. It provides ability to adjust certain mice parameters on per-device basis. .Pp -Configuration file format is derrived from +Configuration file format is derived from .Xr libinput 1 device quirk files. A file may contain multiple section headers ([some identifier]) @@ -72,7 +72,7 @@ glob for the DMI modalias or the DeviceTree compatible string. .It MatchDevType One of touchpad, mouse, pointingstick, keyboard, joystick, tablet, tablet-pad. -Only touchpad and mouse types are suppported. +Only touchpad and mouse types are supported. .El .Ss List of currently available Moused tags. .Bl -tag -width indent @@ -296,10 +296,10 @@ Enable natural scrolling. .It MousedThreeFingerDrag Enable dragging with three fingers. .It MousedSoftButton2X -Horisontal position of 2-nd softbutton left edge in percents. +Horizontal position of 2-nd softbutton left edge in percents. (0-disable) .It MousedSoftButton3X -Horisontal position of 3-rd softbutton left edge in percents. +Horizontal position of 3-rd softbutton left edge in percents. (0-disable) .It MousedSoftButtonsY Vertical size of softbuttons area in percents. @@ -392,7 +392,7 @@ Predefined quirks processed before .Nm . .El .Sh EXAMPLES -Set touch pressure and palm detection thesholds for PS/2 Synaptics +Set touch pressure and palm detection thresholds for PS/2 Synaptics touchpad: .Bd -literal -offset indent [SynPS/2 Synaptics TouchPad] From nobody Sat Nov 22 09:19:31 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD63l63G9z6Gjxw for ; Sat, 22 Nov 2025 09:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD63l3TpSz45f2 for ; Sat, 22 Nov 2025 09:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBIDCFEPDIc4rLwr1d59lNR/3nlflNBTqIHOWRABYfE=; b=MBFHURH6tezbfE93gpUv12MiAUmHHFsi4m8e9ByYIGFg96oMVMtiO2ZP9vqc+S6HBMfA8w LoLpVCRxzhiMjpqKLpm+rU0HAncAHSWyu/WTj86aMfoBtieOTfJA7Ud33XNQ2dGmmeuTep KWUtIwX/q7ibb1ObsvJrnCBCalupLbEhOEPFYUhje2lxQ/PMbG8d5vXJgkDhZ8aIs1ZlLJ vjQfrYLGHsLxjn93kxrxU1hpI2uqN4qggr5Y3NJOb0ihkaE7DOPFzSKTSAZBQ07A2GXtLb rUCZR6Z9z1TMDNm6cWQ1drQbZ+3GGzZZanp+oqWOeW70GkvzLxcC/nlhiFBLEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBIDCFEPDIc4rLwr1d59lNR/3nlflNBTqIHOWRABYfE=; b=ht7vbmRmFXTReRsVl+MXBKKQIxLe865Xj52vNiaPJ+M4PXbiGzQAPvKnduoCoK5VXuDLpN YaLl0ST1wvCkUt/GS+/rOgLY99wtQUiUYR8TyriVJzgbq3ftFOdlCfNhFW0JWH45TFsEmC sJ9B2766nLkefW16z2fE0ejnLEO2OiL9p8liV7mP9auc+SMm89Ug78RBngc6f4D+ZcMcuc 7dynzo4rGnltmkNLwcsqYrXtKG/N9qlWX0OslGRjR+Gfny1gdFVb04UwgXR3gb3aU6D2Cg 3mTGmTbTBrgTmjcxxh1ZIBU+xV7OahaYaz+wk/2pJhC1BqJd2UU24+LEaQ/gOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803171; a=rsa-sha256; cv=none; b=VOTnkF+V7VYtQSfagGCiscM8FJSFn5+D5L6URz86JpmYbmUT3Ku6gRSJkEki2M8Ebmc/TP 2CF9xIfUdCtPWsLaoUlUs9Z4uwTkS+48vusvkmFzDpo1fq/du2K+PQBxxr6Gla0gQkWJaW brOacRB1SgdoYcM23UXbQnN9PznqP1U1o2i6opFZ/aoEpPSnl9prlOrQKW7DAPkbCrbRF4 huswu1zV+h6LmTyM4tE/UK39WPtpK9gyHwQXK/L7W4nPG7ntfUL80omJ/5e0gP51kVBRk6 MpWGkmlDm+pzUNJ3wiOFxzKo08nSMONA62TLc3TO8GcMIc7LL/EnMft9bawS4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD63l31CqzsDH for ; Sat, 22 Nov 2025 09:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 368ce by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:19:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d14a007afb16 - stable/15 - libexec/lua: Fix two typos in the manual pages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d14a007afb166ddd035b0ec8cbd534a2ffbb9bca Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:19:31 +0000 Message-Id: <69218023.368ce.ef45165@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d14a007afb166ddd035b0ec8cbd534a2ffbb9bca commit d14a007afb166ddd035b0ec8cbd534a2ffbb9bca Author: Gordon Bergling AuthorDate: 2025-11-19 14:24:30 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:19:11 +0000 libexec/lua: Fix two typos in the manual pages - s/environnement/environment/ - s/interger/integer/ (cherry picked from commit 58b86e40ce76de649db19d9d1f8571d5c942d44b) --- libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua | 2 +- libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua index d254dd22c91c..242bdb4400fd 100644 --- a/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua +++ b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua @@ -30,7 +30,7 @@ function. List of functions: .Bl -tag -width XXXX .It Dv table = freebsd.kenv.get() -Dump the kernel environnement into a key/value +Dump the kernel environment into a key/value .Fa table . .It Dv value = freebsd.kenv.get(key) Return the diff --git a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua index 34198d20463e..fe189225b239 100644 --- a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua +++ b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua @@ -33,7 +33,7 @@ Load the kernel module named .Fa name and return the identifier .Pq fileid -as an interger. +as an integer. .It Dv ok, err, errno = freebsd.sys.linker.kldunload(fileid|name) Unload the kernel module identifier either by .Fa name From nobody Sat Nov 22 09:20:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD65C4jslz6GkB1 for ; Sat, 22 Nov 2025 09:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD65C2MVtz478d for ; Sat, 22 Nov 2025 09:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1URkjXNvTCEX1ododwTHrotgTKlrxZNOSz/jxOiJeYM=; b=E4iRifXKOEQ9sqXPPCQ2YIK08LpxaAmEkSrXJfmYNuc52dBFJn6jS52tBL1kWcLC1cvQl0 On6kn5fjSiQVMULagnfPVxKSkjnYhcYiGnrkCVGwqT4g3ucGrlGlAklCxMlzsr5FwY2w0y MV8ouIWDqM9tvBC6es+Q5Uyovr5cbuMoM7aA5P+AOIsrp2ALMBTL9oey0OI9jWeLNtCc6+ xiVUWEx7WiLZFDs9ffDMv2T7B7XtN/6uKgid+T0VIdXawhrXC9TrZDRtWfQ5UPgMtW/L30 daSwIijV/LLOBjzw+mruyhCCMwI+xae8tyRgg6UpJeZRzUw+ZZsVbdpc6WFzYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1URkjXNvTCEX1ododwTHrotgTKlrxZNOSz/jxOiJeYM=; b=pPovm3zV8udkVs5fBckox45F7HpxvJ1yBs9YqspJBVXkazA7NgLIvtXoLe7NJvYeyq3G7u 7geiGVVqdA0qqvR9+VpotksNTm1pls8Uai/6i0h7vN6Pb0bTbCTVRgI8F5/izr5ShcYRZC 4S3LtCFnKQX+UL+Wtr8FE+EUcNn6Jw2onKN6aXV45DGJuJ1gsHEytKNfOc0uGnvjsTcNfB KHnH9n7v9v5/Dg0SbS42MJQu8XjDj2zDK8oy7gYy4FPQdLEMwOb5IOr6+hnfPxTdp64F41 9sr5pvjgtFg5dd6nq9VxsrDfKAdxwO1eExE0PTe3JP1vDayEXjEu3c50sO5eLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803247; a=rsa-sha256; cv=none; b=ee0RE9m+FEf0DDUuRt6oeDerwsoQy1NI6DJzTSLEHN1sw5lsYlo57L21WkxYxtNjDOXimZ KV1Vr54iIXZCTD5+ScYKZiCv44lI4VbwwzJ+7FeaHB7k8bn0V1C0vSRAaPSvl7OBf3f0hE f47s0EECfcwAnAilTRWz8R1HvxvMP1iWJm3cmsBS3AeZkMv2hbB/oI8OMZ3lxR6XfmmQ9S pCZOGDQMaQsWBCrjIUUbFiSOpTnyMHtTEWGFO49i/fq3/yJIIKpp9f14QXcqvmrOnuW2ul fNM2qmVJYKIPWATl/FkdJyJiwjbY01Hxs5UkCW6zTaw+OD4CCWFg9McPODNXEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD65C1wJBzsMm for ; Sat, 22 Nov 2025 09:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:20:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 5705569f3c00 - stable/14 - stand/lua: Fix two typos in the manual pages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5705569f3c00fdaedfa7c0ced2d1c51c8d3d2370 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:20:47 +0000 Message-Id: <6921806f.379c7.fa0508b@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5705569f3c00fdaedfa7c0ced2d1c51c8d3d2370 commit 5705569f3c00fdaedfa7c0ced2d1c51c8d3d2370 Author: Gordon Bergling AuthorDate: 2025-11-19 14:23:07 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:19:46 +0000 stand/lua: Fix two typos in the manual pages - s/Additionnaly/Additionally/ - s/commmand/command/ (cherry picked from commit 6f14b6025a6f6475522697362aaf6c84514b85bf) --- stand/lua/config.lua.8 | 2 +- stand/lua/loader.lua.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/lua/config.lua.8 b/stand/lua/config.lua.8 index 7e8863203446..f918ab7ffbeb 100644 --- a/stand/lua/config.lua.8 +++ b/stand/lua/config.lua.8 @@ -66,7 +66,7 @@ as a configuration file .Pc and then process files listed in the .Ev loader_conf_files -variable. Additionnaly, the top-level call to readConf will process files listed in the +variable. Additionally, the top-level call to readConf will process files listed in the .Ev loader_conf_dirs and .Ev local_loader_conf_files diff --git a/stand/lua/loader.lua.8 b/stand/lua/loader.lua.8 index ffee46526c9f..b750d42e2158 100644 --- a/stand/lua/loader.lua.8 +++ b/stand/lua/loader.lua.8 @@ -90,7 +90,7 @@ Obtains the value of the environment variable returns .Va true if -.Va commmand +.Va command is present in the interpreter as a builtin. Otherwise it returns .Va nil From nobody Sat Nov 22 09:20:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD65D6CVVz6GkFP for ; Sat, 22 Nov 2025 09:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD65D362Yz478g for ; Sat, 22 Nov 2025 09:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iS7lOjpN5UZxkAeDrnsol9q0UbaSIaaHJ4o3LZnaSKI=; b=HbMgZS0W4OH6NSjOoRGKvfXtA+97KyaSoMuGZCl93zqXgHXHTKiFTmW2K3JwJ+i4lDHidq 2s9Q+MMKXnUBFo2WmtwYsSBL4tOC01yMrTTfsKZfJWFmqWlxwPEyNy8OFeV6AujVQQNoS2 66TNDL6+zFdjtZjeeH/kDmxq+i6EsuGiOKoEGErKeSdv9s+HdS5i+HiG9Tv9z3Fu+GjJWD T7M69pEl+a9A+0cJU3aJoc6jBI9evo7tsrce0MVvxjr+8Jwiin+EF7+VyNUMeUDtWoXDnN +xNAZbDBdQehQ9/kyN/U7gvIc12VPQo5uY5E1Jk01hEkeCIoPrDNGRf6pnczZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iS7lOjpN5UZxkAeDrnsol9q0UbaSIaaHJ4o3LZnaSKI=; b=IAkNl9rXq6bX4/KSjzC8LO8k20rx4Dni3UwueSLtsWpwgjP2Sxs2k26QlibwPL0mT5YZBx 8Hexo0NgFGCy4r/Ekka4KjMqElUkuprLhFhB26B67jKvN1/cXIkQLHZICwlcjH5wlD1cRg DM9pZPcrCrQLqGmyHZy2eTgTyH8hzFxuFUrEDsv+rx4LZQHDyy+SehKdLbZqfUqUomksOW y258h5yw8Idsgg3COqw65080ufykrl5NTKEMguMXvCPA5p62pLte0ZbTIEsEWJeTmX0SeC xv6icAfDrLabstuardS+CSyjgKyF4qoqHW7/zgHPbeUaQf7jkZRq8HrhZJLnDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803248; a=rsa-sha256; cv=none; b=Kv/xzsNPzjksrxlvgwqEvxbT8BGQiulwZ/eLoRRNUNIP0PuTI+IgNDBYj9XYVwDHCg/u6d zbfLX5kyBXsObvsKxQlI6uP6SmO6XroIm7h/pAesZqGq81HKjkwBuDn3BrqCnuA8kkiyvc kjX0XPXlbtopfBJx1DYYEIe8/w3RvMs3/LtSndHYCeKSmV9f7Q1j2K3dg+U99NCdY9WFAc E1XqNLmT3ic8btK7Z7NzzvXlcXsrX6P32c+onN56n9eBPTrPniDeW9zpy5Rwexn3VoX4L1 Iu7lZtm8zo2rDrd0EYOUodhLcn99wyTN3pZgbxaAWLMbaxXZorOY1t9j2r8ccA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD65D2gJtzsLH for ; Sat, 22 Nov 2025 09:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38bf3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:20:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9437a4d37e57 - stable/14 - exit.3: Fix a typo in the manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9437a4d37e57b3d986af25379b2e171c25564b0e Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:20:48 +0000 Message-Id: <69218070.38bf3.3d272d58@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9437a4d37e57b3d986af25379b2e171c25564b0e commit 9437a4d37e57b3d986af25379b2e171c25564b0e Author: Gordon Bergling AuthorDate: 2025-11-19 14:17:40 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:19:59 +0000 exit.3: Fix a typo in the manual page - s/avaliable/available/ (cherry picked from commit 9334fa3ef5e19de7d3dcdbefdaa3f6b6b653475a) --- lib/libc/stdlib/exit.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3 index 2fb3ab165dae..ed144a6d909c 100644 --- a/lib/libc/stdlib/exit.3 +++ b/lib/libc/stdlib/exit.3 @@ -105,7 +105,7 @@ may be used to provide more information to the parent process. .Pp The complete .Fa status -value is avaliable as +value is available as .Va si_status member of the .Vt siginfo_t From nobody Sat Nov 22 09:20:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD65F66y5z6Gk3D for ; Sat, 22 Nov 2025 09:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD65F40Xjz472t for ; Sat, 22 Nov 2025 09:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxMRIHDY51Se5R9oZtozJqtIwG/G9cM3u3M2Iiu1MAE=; b=pEh8NSdSyRJTfYCQWliC3crtGed0/5WEPoJQAsLeSoX96p4xjRoOEUrzQmJLk8bkD9t5Sn xJbAH4tQrx5x4rXRYTCaN/TqnKf6DzhtScvuErB1aA08bXyjMS+Fizf8/+tbN8pGEmly7P NULwD4aRZ/AhcA3lNyinn531iObrjv0B8dynWU0rd5ojAM3Vt1BMqlj78IQNx5ZfQCLgEo ZVBNVA7hxlnUcrU+Jw6eTfJaLBZHzUfx9gD90QavwkYjcaH6+Hld8/nYl3kLgtrU97PFQH drPxq13pxox7/BTU8lqH5vc3lrVKRpOL6Z2gYBOmajvS0NeAFmD5sKYjBNC+NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxMRIHDY51Se5R9oZtozJqtIwG/G9cM3u3M2Iiu1MAE=; b=rYAoFxMThh6DvPPDVpsXc7SwyUHdYfz2YZmUkfu+lPk7hfPzFxrvFI31RNlYhlIHsMA+5j WJbuSRdSXEA+Pz9plJY40kQp9o7JUmQE9NLgStRva9ZePBHfwSnIRebhOyVmg++/H5zxns MnZG1+buEP0b7qTYkHk0wzFTrFtgj0ieL6Aho7RG5Xe1EJCTZPTyfNELnly7G4Z1Gg+E29 ULaWRcYbFmADsUgcgf18jANd5EZ2O5jezRpQV6QMgmCLCPjkWPJg1/+b5Rg+letfC4U5an zLUQTx9e1VAF1CXd22ZHZoRopQqoqLVWLEAcDaeoJlw4t2CX8UeJ5jtp3IXQfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803249; a=rsa-sha256; cv=none; b=SSCBA0+XuSD39gyO1zbQmEMIyd56D11Thc+cWfbTDbzhOLRQYCL1nwbO9Tvt3Bv38ZEUgk fYideIho286o7w1mkMqvG5Ejy6GdOe9wBkX7tKmWkWY5bs9YDcPAsfqKEm+5gMCG3YR2TI 9WLvfYywvTzfxNHAHIIXAc8xjvjqQHWa/Q1CHYwstBtXWjEKBSmC2RcLKSWz8R5pim0PJF 2ejWjekAGnsQos296iK6mTSpZtb1R72TM2oF56w/UQ+7cONWrAB4dg7aGhTNhZSeKhjoOs wY5VxO/K5cMJ3bz/WlK/Em3WyjiNJqm4fwlCP1KvjZPz//sCyhK2Nv4YUNsG/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD65F3Rzzzs9k for ; Sat, 22 Nov 2025 09:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 375d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:20:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: bc97e62961e6 - stable/14 - nuageinit: Fix a typo in an error message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bc97e62961e6f204582951051fa643e4cb1caddd Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:20:49 +0000 Message-Id: <69218071.375d2.7d39250b@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bc97e62961e6f204582951051fa643e4cb1caddd commit bc97e62961e6f204582951051fa643e4cb1caddd Author: Gordon Bergling AuthorDate: 2025-11-19 14:28:54 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:20:11 +0000 nuageinit: Fix a typo in an error message - s/outout/output/ (cherry picked from commit 73a026d5e9778ac182be4a5876771eefa2cd6f41) --- libexec/nuageinit/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 29340a3d91ea..f68e45701b6c 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -63,7 +63,7 @@ local function get_ifaces_by_mac() ns:close() local res, err = parser:parse_string(netres) if not res then - nuage.warn("Error parsing netstat -i --libxo json outout: " .. err) + nuage.warn("Error parsing netstat -i --libxo json output: " .. err) return nil end local ifaces = parser:get_object() From nobody Sat Nov 22 09:20:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dD65H0XLgz6GkC1 for ; Sat, 22 Nov 2025 09:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD65G4TFgz478m for ; Sat, 22 Nov 2025 09:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HmrSPIHZPXedM6hTKgP550BZkYCbyxngV/kdU4wGRq0=; b=XNNbSHWTYMzCvMh0KC0WDLfgLKQfM2mkywXoQxptUL+C6fEynrfkco6QEnZqft9VrO3V08 TlnnzlI1q44iN4r5KQZJ3LTNjcRI/jlZnZEc/zY0fJEdIa4iW2CbO1eAKsE0kcOhR4niJL 49nKyRs828GzgfKb7YvNoIoMY95l4rzySyTpFqBuHZV4J1ThXxCnLZd52zsuLXCZzA2WUW +6bVr4KCq3XZP8HY6eDDYTNG5jofONxnwRxRPrD2nAFJ0DRaDdOREhtZgDMIB81Cyym/p8 GjMtZMdN6yIkdmIkxTfqoaIFLxD01626LQSagEEilp687Kx4EDE3dBzF/5rC7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763803250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HmrSPIHZPXedM6hTKgP550BZkYCbyxngV/kdU4wGRq0=; b=TCICnTOZOV5gPNEx62UyCFYXouBxtdZVGi2psiySh+z7WU27HXfUClCwa09rZoTE0oFI1W N1AMv3ENcOeuBo/Mm3F8EAlj10BPywRIEVm0WnikhmRh3Uja3Xt/J/fxDwPk6RpeaTWAxx mzsMyu2HzRHwZBbgEXMzr7i6JYKpkYbCmzEN2FYlkZyHJMfKmoymQ2TIbM/yNXtDO3Vrua vl34yjv2/RPn7txaqydzoqAYauw/oQtmq94Ddv3trSuKEUnxBlMRVPK17EyN8yl4FE6EJI CKeUPaT17lMHfFkQBzmzf3CWvIB9genqsNgi4CTM9Ovbx3Yo7A/nemxNPKMfcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763803250; a=rsa-sha256; cv=none; b=Y374M8WeocqszWCL7yAXFd+vuUzTjONypnb8X7QsozN67afam7M0670cAqEqjxassN/Y7j btKXM/hTxv4koF0uT40LKJHABjTm7aTk57yqka8zRfWqjqf7WKJAVMuvDX/ywSMuQHqIz5 cGowKuueGn7ronSazY/1pB0PmFzKw1trOpLazq1g04YrXu3WGHvWUIPSQmn+KrzkUwdPUu 0+GdtQlaDprLEEdV8tWOntLZbty5AVC1ex2DS+X7K5m6kIi3erevyiWsGDwNOQBOQtj/2d k2/ikK2LZ54DKM/TLnzzWxv4yHadLc0b/pOyVLP04AySj+bTFksbZv5liNfrvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dD65G3y8wzsMy for ; Sat, 22 Nov 2025 09:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38ca1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 09:20:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 09e1d6fc41ab - stable/14 - libexec/lua: Fix two typos in the manual pages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 09e1d6fc41ab1e9c820e9d62dda416785bf1bb71 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 09:20:50 +0000 Message-Id: <69218072.38ca1.e67239c@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=09e1d6fc41ab1e9c820e9d62dda416785bf1bb71 commit 09e1d6fc41ab1e9c820e9d62dda416785bf1bb71 Author: Gordon Bergling AuthorDate: 2025-11-19 14:24:30 +0000 Commit: Gordon Bergling CommitDate: 2025-11-22 09:20:37 +0000 libexec/lua: Fix two typos in the manual pages - s/environnement/environment/ - s/interger/integer/ (cherry picked from commit 58b86e40ce76de649db19d9d1f8571d5c942d44b) --- libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua | 2 +- libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua index d254dd22c91c..242bdb4400fd 100644 --- a/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua +++ b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua @@ -30,7 +30,7 @@ function. List of functions: .Bl -tag -width XXXX .It Dv table = freebsd.kenv.get() -Dump the kernel environnement into a key/value +Dump the kernel environment into a key/value .Fa table . .It Dv value = freebsd.kenv.get(key) Return the diff --git a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua index 34198d20463e..fe189225b239 100644 --- a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua +++ b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua @@ -33,7 +33,7 @@ Load the kernel module named .Fa name and return the identifier .Pq fileid -as an interger. +as an integer. .It Dv ok, err, errno = freebsd.sys.linker.kldunload(fileid|name) Unload the kernel module identifier either by .Fa name From nobody Sat Nov 22 14:53:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFT93yqGz6HGHH for ; Sat, 22 Nov 2025 14:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFT92dlNz46f5 for ; Sat, 22 Nov 2025 14:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yq2jv7olUlfoWA01tDHUs4afH2sjXa5K8Snmw9xhs3k=; b=rqw6SGFsYXKWmiIM9H/bZNUC8en46by2NzXIcwJrX9ObZ7ootYi2Ghhta8PKMtV+6ldqbr Vv8x/onwDCF4bNYVqcTv8Tx78IiyEZFW4dGYdYCnjHSlhblFFwX040AAfKUeX85WIoqQOC G8Ky2xUh2rmFSf3LaQWomffXWDaebeOqDaX8E19Re0cmP+38/utCr8iUFZ5Ovy+PvAIRoD CzYkjmfVkCnWd2oh8IFZWaj5a9kFmYCwGPo89l9qvxjsrbW0GvuXJ2ozKvR2tsTM/uIk3R kkaNu2yv4ERryr6mKBg9hPjCpe24mxfxcYk/69ejJ5m2kCqqZtKkRdNGJGqkvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yq2jv7olUlfoWA01tDHUs4afH2sjXa5K8Snmw9xhs3k=; b=cLhuEnR8BHw2kE0NI5PXiWbZr87MxMddx2n/DHcUA7VB+LQ4sg5KLwf5p/fdYliF+28dKo JxKUr6k6ALQhwYOySykBnC8OuZz1knOt+aOucrpiKJPzh0vCJmUElMo5EtuSqvenegbN+7 TMPKGy8FBvGsL3wN7lXghVqZElz9sn99LESP2JitndP0BkgzYNrueEewe7CasCfiXlrVCH iQsXrevJHl8evbfWSGzp1VDtwl60osKO1RoUwtHKJFJ94ifY/Pc4sAfD4McCq73UWIum2q O7Wd5PVRuYeuxbfVfi5Scc2rBeEKa/ff2g2a6+p/ZPwg4C3MKv6SyOkHsz/DyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823213; a=rsa-sha256; cv=none; b=OYgeT7feDr6KZclgfor6rDMCfHsivl4CZnUw0QhPBZ97b6FKdoxbT1km7IweLht7qrmnlG qKtxFP00VzBDEVatSvqANnos6P3+SaQ33w3AlR6qebgS4P61tWaD/u98Ie40kuiZ/MrmJE laKEzyqRPgZT8dtCjTPc3EglTRXHdjfzI7EOmA0DyC2j2aqbA9J4DDcE1PQItfPmfFe/6v o+CkpRqUbRA8XgGyFaRkWf3/ws16pjQjhnKUw1EknYdzH0bQUxRhxXANcnyHIlg7sdbTEx MlL+5jTCdipeK9D0QvcaxhLc3ONvzUI8BejH828MfMmRZdrIBAW3yqMO3S4nHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFT925B7z12B4 for ; Sat, 22 Nov 2025 14:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31444 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:53:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: e53590238a3d - stable/14 - fusefs: fix intermittency in the BadServer.ShortWrite test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e53590238a3dd39c9620100276c4633feb43de01 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:53:33 +0000 Message-Id: <6921ce6d.31444.534743f1@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=e53590238a3dd39c9620100276c4633feb43de01 commit e53590238a3dd39c9620100276c4633feb43de01 Author: Alan Somers AuthorDate: 2025-10-14 02:18:48 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:52:54 +0000 fusefs: fix intermittency in the BadServer.ShortWrite test This test implicitly depended on the order in which two threads completed. If the test thread finished first, the test would pass. But if the mock file system thread did, it would attempt to read from an unmounted file system, and fail. As a result, the test would randomly fail once out of every several thousand executions. Fix it by telling the mock file system's event loop to exit without attempting to read any more events. Reported by: Siva Mahadevan Reviewed by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D53080 (cherry picked from commit d1bd541b385d49d2ae3a8bad9df72779b606e208) --- tests/sys/fs/fusefs/bad_server.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/sys/fs/fusefs/bad_server.cc b/tests/sys/fs/fusefs/bad_server.cc index af2ca146e431..c3d195735446 100644 --- a/tests/sys/fs/fusefs/bad_server.cc +++ b/tests/sys/fs/fusefs/bad_server.cc @@ -65,6 +65,11 @@ TEST_F(BadServer, ShortWrite) out.header.unique = 0; // Asynchronous notification out.expected_errno = EINVAL; m_mock->write_response(out); + /* + * Tell the event loop to quit. The kernel has already disconnected us + * because of the short write. + */ + m_mock->m_quit = true; } /* From nobody Sat Nov 22 14:53:34 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFTB42TYz6HFrR for ; Sat, 22 Nov 2025 14:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFTB30Xxz476f for ; Sat, 22 Nov 2025 14:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zN709DdvDM/kU5Y2qsaExelu8J+HRCZKHCyvQAQ8ZKk=; b=Hc47IiodAIZfamnkbDNGNtSvSuXugahrHuhyMVHrWQ+QNREIpby9hEwVOE1OVWEnu6AzJ2 KisiSKSGYmq3988VJA8d+FprV97O8YJxM3mVcKY1K0uJTtUiZBZHvbrKLuQO2YXaKi7Bsb YYot2e5P+O5pLQEFIozutW1WD1fKoOw4X1BaYuUehcD6YmXfLw4H9oxP5q+/NvmvOxr7iT vYOWMXaXxIYysGEyUIpW616HxZU1PlspVP7SJ21UilikG+EtiTVCGqT6O/F/Zsnf5JMV1C QvCS74ezkNWSrjnD9NggprKhio1SDqp6R9Q/edVoJEwz95JbyPek2sSmH7Kfeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zN709DdvDM/kU5Y2qsaExelu8J+HRCZKHCyvQAQ8ZKk=; b=iE4q6Qdhnb2Ekdv7O5HFnbKI82vrfdYAjP1IkpWM+TdMV9dQO5yipKP1gsph/HOa4SbioW xRPEBn8jRzj7wgyxfvXKcVQrKdRUQd7ugrKNW0OzFZwQNtqMZMLdAqb1064Vi8gqq4Nziz eTQOwVmIR6ZjpEOKLW8O2twTgJx/3yCY8nuwTOlAbkXpyC8NfXZ84YXufzdsYKaQGX0Igx UFHyui2aT+enHte10VVJDc/aqNUflNSVKtpUZ5/wkO4NOJ4432D+PmrNf2ZmpbcLp90DXc xEDGDQNC3QR8DGWjLeK4+bhkgsDteliS8y0apZT5r9/euIDe696LEuc9Ej4lTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823214; a=rsa-sha256; cv=none; b=aXwxJuS5QbTDDywv6eY3H7sSNoPDu7vNXJvsyum8HrNl7Lqz762nTzgIyOEqMEq5kxu00e zNdC9AiBpSiqh3zwslUh2pCIyvU3VfzA65YlvBgKRqbktir4iwAD/osdljXgsYa/Uyv3kN e3LmbGJ2CBK/YT5prbWrEJ0jZB5rG3PfiuQR7FZBatmB32Gc5/rlRlyhGSI6WEg7VDb15B wPdhV82ehFppDPFX5Xe2nsu9JJqy62QAEtd3ra0tfZ6fa3UGrANuyp2YBXPW1gq7J1jwkd ZSQR58JhNnU8NUzTlMLNPfc+L8z4MVpUf19GlyFWLr91ntbgo1FuQ+5TDpcCAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFTB2XrBz12wQ for ; Sat, 22 Nov 2025 14:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33004 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:53:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 3b8ac7895d7b - stable/14 - fusefs: fix page fault triggered by async notification when unmounted List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b8ac7895d7bcb66aaa83d2667b8e3de17f02ede Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:53:34 +0000 Message-Id: <6921ce6e.33004.50bd7f9@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3b8ac7895d7bcb66aaa83d2667b8e3de17f02ede commit 3b8ac7895d7bcb66aaa83d2667b8e3de17f02ede Author: Alan Somers AuthorDate: 2025-10-26 00:37:02 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:53:03 +0000 fusefs: fix page fault triggered by async notification when unmounted A FUSE daemon can send asynchronous notification to the kernel in order to, for example, invalidate an inode's cache. Fix a page fault that can happen if the file system isn't yet mounted, or is already unmounted, when that notification arrives. PR: 290519 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53356 (cherry picked from commit 5d42c8813976af484fd3e9a896c7839ba27ca764) --- sys/fs/fuse/fuse_device.c | 6 +++++ tests/sys/fs/fusefs/mockfs.cc | 4 +++- tests/sys/fs/fusefs/mockfs.hh | 4 +++- tests/sys/fs/fusefs/notify.cc | 56 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 2 deletions(-) diff --git a/sys/fs/fuse/fuse_device.c b/sys/fs/fuse/fuse_device.c index 26f764f1939c..8f557a51e82b 100644 --- a/sys/fs/fuse/fuse_device.c +++ b/sys/fs/fuse/fuse_device.c @@ -542,6 +542,12 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) } else if (ohead.unique == 0){ /* unique == 0 means asynchronous notification */ SDT_PROBE1(fusefs, , device, fuse_device_write_notify, &ohead); + if (data->mp == NULL) { + SDT_PROBE2(fusefs, , device, trace, 1, + "asynchronous notification before mount" + " or after unmount"); + return (ENODEV); + } mp = data->mp; vfs_ref(mp); err = vfs_busy(mp, 0); diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index f48165f6a151..4fa802cd7250 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -828,10 +828,12 @@ void MockFS::loop() { } } -int MockFS::notify_inval_entry(ino_t parent, const char *name, size_t namelen) +int MockFS::notify_inval_entry(ino_t parent, const char *name, size_t namelen, + int expected_errno) { std::unique_ptr out(new mockfs_buf_out); + out->expected_errno = expected_errno; out->header.unique = 0; /* 0 means asynchronous notification */ out->header.error = FUSE_NOTIFY_INVAL_ENTRY; out->body.inval_entry.parent = parent; diff --git a/tests/sys/fs/fusefs/mockfs.hh b/tests/sys/fs/fusefs/mockfs.hh index ba6f7fded9d0..4b0628d34dd7 100644 --- a/tests/sys/fs/fusefs/mockfs.hh +++ b/tests/sys/fs/fusefs/mockfs.hh @@ -390,8 +390,10 @@ class MockFS { * @param parent Parent directory's inode number * @param name name of dirent to invalidate * @param namelen size of name, including the NUL + * @param expected_errno The error that write() should return */ - int notify_inval_entry(ino_t parent, const char *name, size_t namelen); + int notify_inval_entry(ino_t parent, const char *name, size_t namelen, + int expected_errno = 0); /* * Send an asynchronous notification to invalidate an inode's cached diff --git a/tests/sys/fs/fusefs/notify.cc b/tests/sys/fs/fusefs/notify.cc index 1e22bde13db7..d370a1e6e706 100644 --- a/tests/sys/fs/fusefs/notify.cc +++ b/tests/sys/fs/fusefs/notify.cc @@ -385,6 +385,27 @@ TEST_F(Notify, inval_inode_with_clean_cache) leak(fd); } +/* + * Attempting to invalidate an entry or inode after unmounting should fail, but + * nothing bad should happen. + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290519 + */ +TEST_F(Notify, notify_after_unmount) +{ + const static char *name = "foo"; + struct inval_entry_args iea; + + expect_destroy(0); + + m_mock->unmount(); + + iea.mock = m_mock; + iea.parent = FUSE_ROOT_ID; + iea.name = name; + iea.namelen = strlen(name); + iea.mock->notify_inval_entry(iea.parent, iea.name, iea.namelen, ENODEV); +} + /* FUSE_NOTIFY_STORE with a file that's not in the entry cache */ /* disabled because FUSE_NOTIFY_STORE is not yet implemented */ TEST_F(Notify, DISABLED_store_nonexistent) @@ -544,3 +565,38 @@ TEST_F(NotifyWriteback, inval_inode_attrs_only) leak(fd); } + +/* + * Attempting asynchronous invalidation of an Entry before mounting the file + * system should fail, but nothing bad should happen. + * + * Note that invalidating an inode before mount goes through the same path, and + * is not separately tested. + * + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290519 + */ +TEST(PreMount, inval_entry_before_mount) +{ + const static char name[] = "foo"; + size_t namelen = strlen(name); + struct mockfs_buf_out *out; + int r; + int fuse_fd; + + fuse_fd = open("/dev/fuse", O_CLOEXEC | O_RDWR); + ASSERT_GE(fuse_fd, 0) << strerror(errno); + + out = new mockfs_buf_out; + out->header.unique = 0; /* 0 means asynchronous notification */ + out->header.error = FUSE_NOTIFY_INVAL_ENTRY; + out->body.inval_entry.parent = FUSE_ROOT_ID; + out->body.inval_entry.namelen = namelen; + strlcpy((char*)&out->body.bytes + sizeof(out->body.inval_entry), + name, sizeof(out->body.bytes) - sizeof(out->body.inval_entry)); + out->header.len = sizeof(out->header) + sizeof(out->body.inval_entry) + + namelen; + r = write(fuse_fd, out, out->header.len); + EXPECT_EQ(-1, r); + EXPECT_EQ(ENODEV, errno); + delete out; +} From nobody Sat Nov 22 14:53:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFTD0Lltz6HFrV for ; Sat, 22 Nov 2025 14:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFTC3hbfz472P for ; Sat, 22 Nov 2025 14:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IhouENWbwYpLzxvM6vxyfa3W7Nry1GM8jTOiWg/toTY=; b=DpufsKufLP2nVHf4Gz5vxWz6tppmhsGcLMmAP5pVyoMeNNwepn9WqyPR8VFXwMfLnPu0mr QDwJoHQ4z8mMflrDLl9n1i2jh0S/cAYYlUVqLhdJYwT8xvIxRTgK7mkz7gZwNOrpopjjF3 ippH1bVfbZ6ZICv7fBUE5lYWCsgi6g8hYmqL3ti1f+yCG7FtVsOebpGIeiVt9QwirU9/H/ D7pzhlszoZpBhnX5quZYIOEWnKUJIpXHWAgMISbZZ/2Ln+bt8ZBVOuRPDcZ3ZaJwlrVgdb YqgAGy9ABam0dF3iAVrMRJQMu6iNhEaVF5le6B0MQB88aET2x2Hl824BONPxiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IhouENWbwYpLzxvM6vxyfa3W7Nry1GM8jTOiWg/toTY=; b=ZMnoruQnkj04efyoAvp2rzUGCQTCiK1x42pxSTxrBmzggs+ktaCQtp6VDCPAsIf1laQcvF bDavuhTe+C9NOomJWFsFydL5uFP0R1tMieiiuHCXJHY9F8N3cRBeUSmnt3I+N5IQ4gTySZ 0YkIOCucV5qayhwpas3ykxp5P/h5JFK+SryU2hst02m3A3e6OStH1+x8vueYxiDglDqROa BxyS7gxgASqQZl1nSo98H+BcSToL3HJI/QzW8tfeuZbkehIXWiHsKGuJ2dQ8VEMLLyrZ3Z RsZ3ya/dT8LtkQdfa6e9s2fU3CH6T2rEwX7IcGz/HMgT7rFttkDrp0K8NBleIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823215; a=rsa-sha256; cv=none; b=SGof0pUaQ1E1v1OtGVNOa9EyBD4q6z9BQFPYDX8M88fZ3xPQ1mAZ9zXQ3g2XENUiOl8PfW gCoo8M1T7ZhmvouiM5lQRG4WYxCsMm86K8BUwWwcPLlitVbbivBSoJ2PeAW96kxKt2KrfP 7u4KHcBO6Mh715X9hdeml4EoVQI7yBB232R4zFF9w8A8FxDg1/cddWYb4ObBp2Rdd8QHCq JHuOxhf5aJmwg0LO6EseQDtNNF5/+bS754QkWJ/s5YfME2LEq2m5SzhIWRzaLNKwyDC0Ma V1mUBfclQebOhObw1/HFLY9hqH2rxQLuW1azDwsFwVnyTDp0dI78ENpFZYHW6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFTC37wgz136Y for ; Sat, 22 Nov 2025 14:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a17 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:53:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: f6688f9ed5db - stable/14 - fusefs: Fix intermittency in the BadServer.ShortWrite test case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f6688f9ed5db710e0026053f2f6b73051f87bc16 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:53:35 +0000 Message-Id: <6921ce6f.32a17.792a255d@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f6688f9ed5db710e0026053f2f6b73051f87bc16 commit f6688f9ed5db710e0026053f2f6b73051f87bc16 Author: Alan Somers AuthorDate: 2025-10-25 22:38:30 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:53:03 +0000 fusefs: Fix intermittency in the BadServer.ShortWrite test case We were using the m_quit bit for two similar but distinct uses: * To instruct the server to quit * To cope with the kernel forcibly unmounting the fs Fix the intermittent test failure by adding a separate bit, m_expect_unmount, to handle cases like the latter. Reported by: Siva Mahadevan Revied by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D53357 (cherry picked from commit d86025c1d49c84c4dc8c3635c83c078ad56e5a53) --- tests/sys/fs/fusefs/bad_server.cc | 8 ++++---- tests/sys/fs/fusefs/mockfs.cc | 5 +++-- tests/sys/fs/fusefs/mockfs.hh | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/sys/fs/fusefs/bad_server.cc b/tests/sys/fs/fusefs/bad_server.cc index c3d195735446..825523cac2bb 100644 --- a/tests/sys/fs/fusefs/bad_server.cc +++ b/tests/sys/fs/fusefs/bad_server.cc @@ -64,12 +64,12 @@ TEST_F(BadServer, ShortWrite) out.header.error = 0; out.header.unique = 0; // Asynchronous notification out.expected_errno = EINVAL; - m_mock->write_response(out); /* - * Tell the event loop to quit. The kernel has already disconnected us + * Tell the event loop to quit. The kernel will disconnect us * because of the short write. */ - m_mock->m_quit = true; + m_mock->m_expect_unmount = true; + m_mock->write_response(out); } /* @@ -98,7 +98,7 @@ TEST_F(BadServer, ErrorWithPayload) out.push_back(std::move(out1)); // The kernel may disconnect us for bad behavior, so don't try - // to read any more. + // to read or write any more. m_mock->m_quit = true; })); diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 4fa802cd7250..74458d7ca4cd 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -434,7 +434,8 @@ MockFS::MockFS(int max_read, int max_readahead, bool allow_other, m_child_pid(-1), m_maxwrite(MIN(max_write, max_max_write)), m_nready(-1), - m_quit(false) + m_quit(false), + m_expect_unmount(false) { struct sigaction sa; struct iovec *iov = NULL; @@ -980,7 +981,7 @@ void MockFS::read_request(mockfs_buf_in &in, ssize_t &res) { } res = read(m_fuse_fd, &in, sizeof(in)); - if (res < 0 && !m_quit) { + if (res < 0 && errno != EBADF && !m_quit && !m_expect_unmount) { m_quit = true; FAIL() << "read: " << strerror(errno); } diff --git a/tests/sys/fs/fusefs/mockfs.hh b/tests/sys/fs/fusefs/mockfs.hh index 4b0628d34dd7..f98a5337c9d1 100644 --- a/tests/sys/fs/fusefs/mockfs.hh +++ b/tests/sys/fs/fusefs/mockfs.hh @@ -360,6 +360,9 @@ class MockFS { /* Tell the daemon to shut down ASAP */ bool m_quit; + /* Tell the daemon that the server might forcibly unmount us */ + bool m_expect_unmount; + /* Create a new mockfs and mount it to a tempdir */ MockFS(int max_read, int max_readahead, bool allow_other, bool default_permissions, bool push_symlinks_in, bool ro, From nobody Sat Nov 22 14:54:43 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFVW2y3hz6HGSt for ; Sat, 22 Nov 2025 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFVW1s3Xz47pp for ; Sat, 22 Nov 2025 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dJcnAwfHX7oLlzQyFMEVPprXGYfGyXISwHk61wL2KVw=; b=akOYYXA+Z1OYPRzYd8eldb2MEQSCbpwss+y9TXrlU0XB8pStFoDXz/J5x8plRu92T5lGmT lphfAvfnhbPfwibIZes7B+f33vaP/pOITbCneoi5Ma76wF2LBcOj4TB2PpGNB22XDuHImC bZD/93ycjsF7kZyeexcVrVLiU3p7JtfHKPS8HTigZGZl5xpqxi+YBrUd/MNx0XegTBcrY0 pcDyQJ6FmLAJRQYGtJv/ZOhBZlZT0zdPFSK9E/YsnaqCjpmq2CFrMzHzrm7i8ffP0uV5Pc wtfiBRj01jrFvA0vGLfOjbXt75EjE2MmTDWrcRSoE+OGGGpk8IhQYh5f0FPEDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dJcnAwfHX7oLlzQyFMEVPprXGYfGyXISwHk61wL2KVw=; b=kUkEpoxEwlITtLzMzufDy5cjwFU54Kp0z2lWMtwXiXK4Ns47zvVfWg12epS3njmvEfyQOM af6hN9aGvMWEGbw+7utqNBFdxmH4gjlUoXlGZo5xplQSFw17BLrcOKFlSIf9T28RDrbe72 Sa/B8/z10gmrOYsc8tJPUIBtU5FCemT28rf8Tz0DlHFPAkMBPM5fRjEDn3jl+r0fEU0i1M 7amCJCfKq72iqKW6xjXVCaBRn66ZQHblGHayenTcF+IHwQuli7qbtzbEEqn5mq3c554Ed/ 5REwsoKXVDz9g7EacesvsGpNjhwnqNJ5KI2u6UGF+irIYfPZjj0c9yCFbcDXcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823283; a=rsa-sha256; cv=none; b=fxc0reeORxe44yi95Xjj1TAbZfouq+bbL8/NqRpF7WYB1v6bs91eyFTp4DI/R4n/SJxQwm OZp7mwf4I4MvUYM2G/JuSI+f/aKZWSQ+eWAuHod81AXLLv0pQ6VfDAJbscd4TDO5LixD25 iU1X2FG1YRDWfxAv+BMe7nJddUaW9WaQ2HYYE5XlemEtCghILmiNUVcSHrmGwg1NUCnBNX Y26jDjMedw6jDK3fItd+AeWsP718+bBjC31l5eiNytev1L0NntSxqQ10KIDlUE5HuaKN4r bNHGpdSYB6Xa42bWrcbgNzXVvSUlcNNdPi7sby/Y6h7KY+CwTg5DvpS/Yx0tqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFVW1RPRz12WJ for ; Sat, 22 Nov 2025 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3196e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:54:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: cd81f86919c1 - stable/14 - find: fix pathnames printed by the SIGINFO handler List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd81f86919c146fb9da4425a2a424e1447e3b355 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:54:43 +0000 Message-Id: <6921ceb3.3196e.5b41fa5f@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=cd81f86919c146fb9da4425a2a424e1447e3b355 commit cd81f86919c146fb9da4425a2a424e1447e3b355 Author: Alan Somers AuthorDate: 2025-10-19 15:53:50 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:54:07 +0000 find: fix pathnames printed by the SIGINFO handler Don't duplicate the last component. PR: 290362 Reported by: John F. Carr Fixes: d06a00963b7 Reviewed by: jilles, Goran Mekić Pull Request: https://github.com/freebsd/freebsd-src/pull/1878 (cherry picked from commit f6d767fe862964f704baf4eb388a30ed8227bb65) --- usr.bin/find/find.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c index 46f0e9b3c38b..1d91256469dc 100644 --- a/usr.bin/find/find.c +++ b/usr.bin/find/find.c @@ -216,7 +216,7 @@ find_execute(PLAN *plan, char *paths[]) } if (showinfo) { - fprintf(stderr, "Scanning: %s/%s\n", entry->fts_path, entry->fts_name); + fprintf(stderr, "Scanning: %s\n", entry->fts_path); fprintf(stderr, "Scanned: %zu\n\n", counter); showinfo = 0; } From nobody Sat Nov 22 14:56:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFY80XfSz6HGYj for ; Sat, 22 Nov 2025 14:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFY802WMz48nF for ; Sat, 22 Nov 2025 14:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsYPIvJEVfjiCfISKMXwDDjaMNbeuJlwa8iI2Z+frgw=; b=oBsTym/dWA2GPZV/6TatSpbY2OfUr+ZbdQA18lhz0sxLaTW+Q+n/2shG4C1DQAnNICOZkH HEWaGBvXLmQZaK94SMTQiuc599vbJJEj3M8pW/WBuhB94F89EfyTYVakCdk/nMqlSWGNl0 Dyk4lhmUlwOI5PM8LjDvRl2Idb3ZqzWt3sLgnDITSZ6STzgR2vNqnq8m+8AtjoKYCsMjsd mO4mGHr3hmjk4k3KLmwROQVVKVvPj5o5Gi0UrQmMRP2oLS0/qzSYcODjlhkORh5P1LKfVL wTG89x0TzILUy/nqY3L1P7sIYmiGGUiJK45nnTPT9ztvmXLPNr1m6ctAMPoGgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MsYPIvJEVfjiCfISKMXwDDjaMNbeuJlwa8iI2Z+frgw=; b=UNNZ2fQg7o9LdlNxNy89z40JJ96Y7dZjBxgjBvapaH7mhQnGRCJrDAR3poGZoKztJWUKRq 7AmMBE1miqdEoYaVFWUVIxVC44RKr0MmS4sMpSZi46DX9XZfOPPtW5L4MCFz2W5nHeuRH8 1GOV5u/fn/YzHOw90RAZebpEdPnuhMVJfO5SuBpgjXCJCSysfry+1qDL12aunf4P22UOTK ayC/mlsCIFHHeLKB3Og2B9HF1z/JxdT8vtmYLrl/4wzqXAFZBsuFajweEVkZEFtplo5JFC wAgqn9YR8xgzlqBStE8Tp8UBx+xcJPPWttnTPDDs/Zj7uvc6lpFBeH0uht7erA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823420; a=rsa-sha256; cv=none; b=AcQnXmNJmTSDYoKxANwtKZ+YPwpqMBqVtCE8kXEoZ+8/Wi5GEWcqa83ZMmVbwKNTjs5/8O Um/5JchnyL1CnygwT4js/4Ux6orKWjylDw+BegsnZmpAfsuy7bIw+zEfJVFDjsUXfzwLvC KqSSJg189QAh1lKqJpNaqKxOZXkmaee/dYXMsKABcpttuSqIB0ekY0DAJbQ0a4IHEbvB10 XIyXoYb3MH9LXm4NwcPL274bCV6mpVnyKBlcfebQxHR+Tz2PJ70piw2cjKdc0ze3NXNHRw xojWRu+eX517xoz0Ij3zPVYEA239tiJ883AI8jfvfG5oDc66yK7IBNUaU7C+IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFY26fLRz12rg for ; Sat, 22 Nov 2025 14:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31aef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:56:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: dbf10fb83839 - stable/14 - tests/sys/netpfil/pf/sctp: make use of required.kmods List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dbf10fb83839c3aa97b878cdc2f8f0d001b3a63d Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:56:54 +0000 Message-Id: <6921cf36.31aef.1e2745a8@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=dbf10fb83839c3aa97b878cdc2f8f0d001b3a63d commit dbf10fb83839c3aa97b878cdc2f8f0d001b3a63d Author: Alan Somers AuthorDate: 2025-10-20 13:52:41 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:54:57 +0000 tests/sys/netpfil/pf/sctp: make use of required.kmods This greatly speeds up skipping a test that can't be run. Sponsored by: ConnectWise Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D53215 (cherry picked from commit 7648d2ebda22fe21ed385cc7d76813a1a9c17c99) --- tests/sys/netpfil/pf/sctp.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 563103827fac..3f033e63e005 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -29,9 +29,6 @@ sctp_init() { pft_init - if ! kldstat -q -m sctp; then - atf_skip "This test requires SCTP" - fi } atf_test_case "basic_v4" "cleanup" @@ -39,6 +36,7 @@ basic_v4_head() { atf_set descr 'Basic SCTP connection over IPv4 passthrough' atf_set require.user root + atf_set require.kmods sctp } basic_v4_body() @@ -112,6 +110,7 @@ basic_v6_head() { atf_set descr 'Basic SCTP connection over IPv6' atf_set require.user root + atf_set require.kmods sctp } basic_v6_body() @@ -186,6 +185,7 @@ reuse_head() { atf_set descr 'Test handling dumb clients that reuse source ports' atf_set require.user root + atf_set require.kmods sctp } reuse_body() @@ -244,6 +244,7 @@ abort_v4_head() { atf_set descr 'Test sending ABORT messages' atf_set require.user root + atf_set require.kmods sctp } abort_v4_body() @@ -302,6 +303,7 @@ abort_v6_head() { atf_set descr 'Test sending ABORT messages over IPv6' atf_set require.user root + atf_set require.kmods sctp } abort_v6_body() @@ -360,6 +362,7 @@ nat_v4_head() { atf_set descr 'Test NAT-ing SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } nat_v4_body() @@ -412,6 +415,7 @@ nat_v6_head() { atf_set descr 'Test NAT-ing SCTP over IPv6' atf_set require.user root + atf_set require.kmods sctp } nat_v6_body() @@ -464,6 +468,7 @@ rdr_v4_head() { atf_set descr 'Test rdr SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } rdr_v4_body() @@ -531,6 +536,7 @@ pfsync_head() { atf_set descr 'Test pfsync-ing SCTP connections' atf_set require.user root + atf_set require.kmods carp sctp } pfsync_body() @@ -563,10 +569,6 @@ pfsync_body() sctp_init pfsynct_init vnet_init_bridge - if ! kldstat -q -m carp - then - atf_skip "This test requires carp" - fi j="sctp:pfsync" @@ -719,6 +721,7 @@ timeout_head() { atf_set descr 'Test setting and retrieving timeout values' atf_set require.user root + atf_set require.kmods sctp } timeout_body() @@ -750,6 +753,7 @@ related_icmp_head() { atf_set descr 'Verify that ICMP messages related to an SCTP connection are allowed' atf_set require.user root + atf_set require.kmods sctp } related_icmp_body() From nobody Sat Nov 22 15:00:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDFd10H1fz6HGll for ; Sat, 22 Nov 2025 15:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFd06rVWz49RL for ; Sat, 22 Nov 2025 15:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xxeKPpvT3C6bLxFByXD+TEopTEfFGDjWRabNDMmmjvk=; b=AeY03ide27VuAUWdj4nX2vcs+bm+rR0WObXdyvzldZMaZ6hN/hA/5W2UDbhdlSGZ4z3jM0 Fk9orBu9tVOgwzqQiFwqkvpcOpMvhw6Mv2xpGwJG6dF850Z82RD33cnOuJICF1QyQC6nt9 RV2J/dpCchV9EES83QwWHptmviH5e7o8pUi/d2xLyX6Wk9XLos3Y48EMEV8acClB4Ro7M2 I3anXxLYzvpxhFnD546AkDoUApAP9QCdlTOLm7eYfVsmH2XKSmDEBsFBBhxYGB77Zfevdq 99elbdata9nl2rTWt2drgk8slzmvG0VVjW58WC1GoS4khPHzbtgr2aZz/YEBGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763823621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xxeKPpvT3C6bLxFByXD+TEopTEfFGDjWRabNDMmmjvk=; b=vL5xPnmFUpH0jcm1BpPG4s2BV76vtzjkT5sXEmAcsF8HLlJp1Mu1fw7GeqISP25v8fVmpL /a5aLpj3uARWCxtosL6K99cDpUFn2BSs88FMWG0q3/DvuulmNY1oan4WR3iEvZCltsQ3a1 1e2hQh1fwE5KHTFusOGAra5ctvXGh/7XOsGq0IN7jZN3JAtb4IfeRsvf/hDEpyx72Z+j5s J2VbPGmgG5cYCvISZhyWGj4fDbUwwcM9HHaeW9iOnZFfySkbzR6RDxF22ft70nqipsO7G0 iwxOqpEOZMFm+FfFhtH7F4433LY/7ZsDCNx7t1KiNMAdYtzdOhhd3Makoe6Yxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763823621; a=rsa-sha256; cv=none; b=Rp8xSOjsP1S+XHUBi50+KJnn9wkOXEAf31DEJODDDl1DBbPuQQJhE7eS5upISiSOBKM8JI PZ//nkzWPFEQZ7ES0mFmurE297qQn5K3BUqeHOHee+op8HPx6DsCU/3dNXUuGTh8IHlDDQ sJBzmG2id66Xq6oBklOWTNLzYqnR8IUpXKGEqgVuyPu2rWzm/oTFqMzIMWXTwYxG+ZzQyu qZ1zsm8IbflnEwbrDFhDcMyswdzUFTWz7xHggRRlbVPfoQdxI5TRVKWkUqqxX3uV/J9ylE yBtj7zI/wSjfopz/xENf8k/E2mK9TU/m9U3pKEDZWsr2d2zrgm9O1ULF2iIJLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDFd05q8Sz12Pw for ; Sat, 22 Nov 2025 15:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33221 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 15:00:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 465c30c4f202 - stable/14 - nvme: add support for DIOCGIDENT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 465c30c4f202b02cd9cb12f12d9ea856c84c5203 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 15:00:20 +0000 Message-Id: <6921d004.33221.6c2c3e53@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=465c30c4f202b02cd9cb12f12d9ea856c84c5203 commit 465c30c4f202b02cd9cb12f12d9ea856c84c5203 Author: Alan Somers AuthorDate: 2025-10-16 22:00:14 +0000 Commit: Alan Somers CommitDate: 2025-11-22 14:59:24 +0000 nvme: add support for DIOCGIDENT Add support for the DIOCGIDENT ioctl to both nvme controller device nodes and namespace device nodes. This information was already available via the nda(4) device node. However, mapping /dev/nvmeX to /dev/ndaY device nodes is not straightforward, so it's better to get it directly from the /dev/nvme device node. PR: 290259 Sponsored by: ConnectWise Submitted by: imp (mostly) Pull Request: https://github.com/freebsd/freebsd-src/pull/1875 (cherry picked from commit 6d0001d44490becdd20d627ce663c72a30b9aac3) --- sys/dev/nvme/nvme_ctrlr.c | 24 ++++++++++++++++++++++++ sys/dev/nvme/nvme_ns.c | 5 +++++ sys/dev/nvme/nvme_private.h | 1 + 3 files changed, 30 insertions(+) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index ce203e2869fd..19fd4e70666e 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -1229,6 +1230,24 @@ nvme_ctrlr_poll(struct nvme_controller *ctrlr) nvme_qpair_process_completions(&ctrlr->ioq[i]); } +/* + * Copy the NVME device's serial number to the provided buffer, which must be + * at least DISK_IDENT_SIZE bytes large. + */ +void +nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn) +{ + _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, + "NVME serial number too big for disk ident"); + + memmove(sn, ctrlr->cdata.sn, NVME_SERIAL_NUMBER_LENGTH); + sn[NVME_SERIAL_NUMBER_LENGTH] = '\0'; + for (int i = 0; sn[i] != '\0'; i++) { + if (sn[i] < 0x20 || sn[i] >= 0x80) + sn[i] = ' '; + } +} + /* * Poll the single-vector interrupt case: num_io_queues will be 1 and * there's only a single vector. While we're polling, we mask further @@ -1367,6 +1386,11 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, case NVME_GET_MAX_XFER_SIZE: *(uint64_t *)arg = ctrlr->max_xfer_size; break; + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } default: return (ENOTTY); } diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 9eb808f81a48..1e9c5360f15c 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -89,6 +89,11 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, gnsid->nsid = ns->id; break; } + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } case DIOCGMEDIASIZE: *(off_t *)arg = (off_t)nvme_ns_get_size(ns); break; diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 93833672674a..3039dcf40373 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -561,6 +561,7 @@ void nvme_notify_new_controller(struct nvme_controller *ctrlr); void nvme_notify_ns(struct nvme_controller *ctrlr, int nsid); void nvme_ctrlr_shared_handler(void *arg); +void nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn); void nvme_ctrlr_poll(struct nvme_controller *ctrlr); int nvme_ctrlr_suspend(struct nvme_controller *ctrlr); From nobody Sat Nov 22 17:54:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDKTt34J8z6HXN5 for ; Sat, 22 Nov 2025 17:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDKTt2Kv1z3gBs for ; Sat, 22 Nov 2025 17:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763834066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UkJiEE2uBu9bWkoqsxabkQu3ZEIOMQfQd5aFjNCSXdA=; b=XeiJDb7nYLPib84hfO0k/H6FiBNafBUE/VOk+55xkwPSqrKBi+w7OtvhVrj+8GfQqS4zDf 2mh3zf8gv0SPm4GiJJzyr69pmbb4vamdacj0syOlkmdWI5+jAsz4ZJxeSkbj08OKDGwpWS 50X4upQ3izb5A+LcwaBtAS/47Aaj05xY6nLi4V0crpqqQluYHKUXf/4jqLK2vKTCmVFpPf IdVswnpLWqkEav8A57W2QNqJPgD5+7ujpLR7ZNLzrVkbR8KASO6ukWGozRSCXbxJZCaA9X WNZsNgESzwz6Y5zCVL1dtBkFpAVw1vu0bJq6j0JhUl8D0KK6Uwb3IcBTYqw0fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763834066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UkJiEE2uBu9bWkoqsxabkQu3ZEIOMQfQd5aFjNCSXdA=; b=DTBbbM1kvukz6H68i2thC7lpDpNOPH6iAVbA68aeiT4/DlV7Md83eivnkEDbmCGX7lsl3l 6OjnXfHgbpCyEV0fv4b75Zp+kP5DzZXPa3FRxOKRYf8/SJ4DK94CxFKAo0yrfHkJ5sa8Ri k5bXUQs+FyuHx5FRUKl35JHUerAlsywowfsj2fMm79KzCrQYTNXaK+LOCSK8sEWmd20S1i OAL8AFjWG8qhhg9vCJ/Hifg0+cqqeZsHgf/AxDLyGH5Nb12/l/qlaXIRkMmzAAB3Nzwe2V qdyMtDXmoL1KgsuXCg5Cpz8S8DQRDRGxyNmO6FDSGIWXf+d5CC5FswZ/vAqROw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763834066; a=rsa-sha256; cv=none; b=O7BDxyvYNt0fb1KT5RTzjTz9dK1loaGbdp/o0SPp9mlrJ02b/C8MCSG8Q23LtLS0oisH+J tzHfsxFR478p2u1Qj/yjQEHz0x1ZjWX5WPV9gg+ZyhjErXP1vwAeYi1lZLB5V6MtkM2+0S iu7iPFV0K18isFn9h1+u+zBVNxGlIO/9Juk87qelxANYruVTxLaqRWHptA5f+YYK/PZE8t Jcbf1d+ZRU8l56i6O6njpL1TzLAzt4B3dHv4oTUDDlM5rY46A48IIr/nNDqqCZnYZpPQ2g mLC00m+9USulhoNXNJD1ZLQTWzkEoGnReQdb1fFCwqUUEPwlcIIauhK3GphNFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDKTt1wptz17fQ for ; Sat, 22 Nov 2025 17:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bc8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 17:54:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 35bff2138b17 - stable/15 - tests/sys/netpfil/pf/sctp: make use of required.kmods List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 35bff2138b173c695b2b5baab9b75e64a7b42758 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 17:54:26 +0000 Message-Id: <6921f8d2.bc8c.226047c9@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=35bff2138b173c695b2b5baab9b75e64a7b42758 commit 35bff2138b173c695b2b5baab9b75e64a7b42758 Author: Alan Somers AuthorDate: 2025-10-20 13:52:41 +0000 Commit: Alan Somers CommitDate: 2025-11-22 16:58:34 +0000 tests/sys/netpfil/pf/sctp: make use of required.kmods This greatly speeds up skipping a test that can't be run. Sponsored by: ConnectWise Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D53215 (cherry picked from commit 7648d2ebda22fe21ed385cc7d76813a1a9c17c99) --- tests/sys/netpfil/pf/sctp.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 78055f5a9dd2..47bf40181b1b 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -29,9 +29,6 @@ sctp_init() { pft_init - if ! kldstat -q -m sctp; then - atf_skip "This test requires SCTP" - fi } atf_test_case "basic_v4" "cleanup" @@ -39,6 +36,7 @@ basic_v4_head() { atf_set descr 'Basic SCTP connection over IPv4 passthrough' atf_set require.user root + atf_set require.kmods sctp } basic_v4_body() @@ -112,6 +110,7 @@ basic_v6_head() { atf_set descr 'Basic SCTP connection over IPv6' atf_set require.user root + atf_set require.kmods sctp } basic_v6_body() @@ -186,6 +185,7 @@ reuse_head() { atf_set descr 'Test handling dumb clients that reuse source ports' atf_set require.user root + atf_set require.kmods sctp } reuse_body() @@ -244,6 +244,7 @@ abort_v4_head() { atf_set descr 'Test sending ABORT messages' atf_set require.user root + atf_set require.kmods sctp } abort_v4_body() @@ -302,6 +303,7 @@ abort_v6_head() { atf_set descr 'Test sending ABORT messages over IPv6' atf_set require.user root + atf_set require.kmods sctp } abort_v6_body() @@ -360,6 +362,7 @@ nat_v4_head() { atf_set descr 'Test NAT-ing SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } nat_v4_body() @@ -412,6 +415,7 @@ nat_v6_head() { atf_set descr 'Test NAT-ing SCTP over IPv6' atf_set require.user root + atf_set require.kmods sctp } nat_v6_body() @@ -464,6 +468,7 @@ rdr_v4_head() { atf_set descr 'Test rdr SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } rdr_v4_body() @@ -531,6 +536,7 @@ pfsync_head() { atf_set descr 'Test pfsync-ing SCTP connections' atf_set require.user root + atf_set require.kmods carp sctp } pfsync_body() @@ -563,10 +569,6 @@ pfsync_body() sctp_init pfsynct_init vnet_init_bridge - if ! kldstat -q -m carp - then - atf_skip "This test requires carp" - fi j="sctp:pfsync" @@ -722,6 +724,7 @@ timeout_head() { atf_set descr 'Test setting and retrieving timeout values' atf_set require.user root + atf_set require.kmods sctp } timeout_body() @@ -753,6 +756,7 @@ related_icmp_head() { atf_set descr 'Verify that ICMP messages related to an SCTP connection are allowed' atf_set require.user root + atf_set require.kmods sctp } related_icmp_body() From nobody Sat Nov 22 17:58:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDKZv39cZz6HY5G for ; Sat, 22 Nov 2025 17:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDKZv2VSLz3gxp for ; Sat, 22 Nov 2025 17:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763834327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WG3iL7CHYlM6vUCQRy9bwPHAErd3A+p00sZ8dBoLslw=; b=GLQsoPwb+8aBSXo9IPnw4UZhsq8lniHmjgv4wAdsVk/fRNS6YwtYlH/fTM/Rikx4lOO/Cm 1jn7gyL4Ns7P7/53GSvVhVG5Ch0GdWpGXb+rewYG/obW5tNCr3abygj27WKVext6vBlJKk VLtaq8e7jVmiY/O4CCJIljgAgpioYwg6jVRKfDgQKZVMRktYskuqjuLI9zi7B08GCar1Ek j/mCuMftXP7VsDk29slu/2gCEfNU4RV198N6rXemhKlnro5/CnmrKQdOkpm/RxniEJyFHS EMJcaTUQIZ0Qf65PYmGj9YZY04FCxGfliyzss7EK8TlpJ1bD9kqFXIJjhUpjJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763834327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WG3iL7CHYlM6vUCQRy9bwPHAErd3A+p00sZ8dBoLslw=; b=WLGo4oE5Nsr/n6/DNXjn+beZrUmusaBx9YQa4LlTwu/DcD4bwsyYB89V3Pz1A5qZ+tjI4n PBCOVM7jxcbpPgPrvk+crkIT/4be74/Hp3pcCrG2lu7p7fulBJfzP/QWyRru8tdUmC+x2L 3entHn6RNV4MACdwzFli6Dk9/8ie3XQEOikBeBTJZxzkW5nbK104kSPimtc+5f0GRVYeR5 FYGzulYD1M2OJbyDKoAo7c/zE1xj1PWCnhVDFzGcu9nBaZ2uo/OOPuI1VOH2VWkOvuH/OO mg5HgyLb/LKiZyCjLSDDIlAhzuPAJqYx0/KG4Ctav/GYGdnXIFxs4Szwk6VeFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763834327; a=rsa-sha256; cv=none; b=w3BQy5yUmofpx05tRMWhq66REG9xDQiU+jO+dPWX4JJBqX+0FCZ9K8+TBl4l9P3VaJc6VR v4Ts+OdW2ccQaZi1Gdnp1w96kjOFmykeNeOAHa96loAlXCULMstjQDm23tkRHR/2W9sEAB IsLgHMuvec16QyOgXhrPVjMtaHVhb8H97oia4NNYk9cWdXNHRfHP9kqbO3GP5arnWZCBHe wUrP5+cqzgbnPmf6lHNcEUSI0EcvR0eMqPJ8bow578ZpxHloA+lt89uWVKTE/AX0w1ejuj MFO6qMtdOjDYx8hc1FC5SNXutnVC8SjJIrNaQbxLs9EULAhWyCzTCpGvqfeelw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDKZv1Xc3z17r2 for ; Sat, 22 Nov 2025 17:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c111 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 17:58:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1b5cc3c48cb8 - stable/15 - nvme: add support for DIOCGIDENT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1b5cc3c48cb8ff80f0b6a75981d5f85e87cf7e8e Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 17:58:47 +0000 Message-Id: <6921f9d7.c111.6272f36@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1b5cc3c48cb8ff80f0b6a75981d5f85e87cf7e8e commit 1b5cc3c48cb8ff80f0b6a75981d5f85e87cf7e8e Author: Alan Somers AuthorDate: 2025-10-16 22:00:14 +0000 Commit: Alan Somers CommitDate: 2025-11-22 17:54:42 +0000 nvme: add support for DIOCGIDENT Add support for the DIOCGIDENT ioctl to both nvme controller device nodes and namespace device nodes. This information was already available via the nda(4) device node. However, mapping /dev/nvmeX to /dev/ndaY device nodes is not straightforward, so it's better to get it directly from the /dev/nvme device node. PR: 290259 Sponsored by: ConnectWise Submitted by: imp (mostly) Pull Request: https://github.com/freebsd/freebsd-src/pull/1875 (cherry picked from commit 6d0001d44490becdd20d627ce663c72a30b9aac3) --- sys/dev/nvme/nvme_ctrlr.c | 24 ++++++++++++++++++++++++ sys/dev/nvme/nvme_ns.c | 5 +++++ sys/dev/nvme/nvme_private.h | 1 + 3 files changed, 30 insertions(+) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 63b8643d97d7..12b39ce3b3ac 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -1263,6 +1264,24 @@ nvme_ctrlr_poll(struct nvme_controller *ctrlr) nvme_qpair_process_completions(&ctrlr->ioq[i]); } +/* + * Copy the NVME device's serial number to the provided buffer, which must be + * at least DISK_IDENT_SIZE bytes large. + */ +void +nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn) +{ + _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, + "NVME serial number too big for disk ident"); + + memmove(sn, ctrlr->cdata.sn, NVME_SERIAL_NUMBER_LENGTH); + sn[NVME_SERIAL_NUMBER_LENGTH] = '\0'; + for (int i = 0; sn[i] != '\0'; i++) { + if (sn[i] < 0x20 || sn[i] >= 0x80) + sn[i] = ' '; + } +} + /* * Poll the single-vector interrupt case: num_io_queues will be 1 and * there's only a single vector. While we're polling, we mask further @@ -1513,6 +1532,11 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, case NVME_GET_CONTROLLER_DATA: memcpy(arg, &ctrlr->cdata, sizeof(ctrlr->cdata)); break; + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } /* Linux Compatible (see nvme_linux.h) */ case NVME_IOCTL_ID: td->td_retval[0] = 0xfffffffful; diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 21d7965bf7a6..17f6c205752b 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -88,6 +88,11 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, gnsid->nsid = ns->id; break; } + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } case DIOCGMEDIASIZE: *(off_t *)arg = (off_t)nvme_ns_get_size(ns); break; diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index a425a6a5ad62..dd45e1acd0aa 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -565,6 +565,7 @@ void nvme_notify_new_controller(struct nvme_controller *ctrlr); void nvme_notify_ns(struct nvme_controller *ctrlr, int nsid); void nvme_ctrlr_shared_handler(void *arg); +void nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn); void nvme_ctrlr_poll(struct nvme_controller *ctrlr); int nvme_ctrlr_suspend(struct nvme_controller *ctrlr); From nobody Sat Nov 22 18:42:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDLYq52Sxz6HbgT for ; Sat, 22 Nov 2025 18:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDLYq48Pxz3nZv for ; Sat, 22 Nov 2025 18:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763836975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVMHG59SqCKjW8e5GQa7AeqFaRAWi9f4gDuCIveV/dE=; b=pWWoIaVJHYzeJhaY/fa7GmZgqgzXItCvcwfaW2PYoCOefgzr29zksoLxclOhDGTl3DGTq9 6dS4mnLRU7Hh3pDM7EwJ5UYrZgzvcw4nBZxCNq28s8C0lSYpPrKraGTJqgEVt5ee29vjfC EZCG9a8PtBqQZ8/GAOpoULdMM51aGqPHibx0yBVmHlDlCmFEwWYEFz4iaU01TJLloRKThL dxe9Dq3/rrlFS2f0Gv29autkjQa8p4B5hgoRXAEziU9UG3PqeEWn5VGI6Yfemm5pxS93Ci E9ssCpHnQvUhx2S6mh+RUALRCEUA5fu2UE0Ml6C8HM1Z2EIurzx0VNYhlVL8iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763836975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVMHG59SqCKjW8e5GQa7AeqFaRAWi9f4gDuCIveV/dE=; b=eg0Qd3vFC2/BQAmmknXLHZgfgsqqgGjY365rZW5xsTzmvpF8tTzcvMwU33jE/4uO0htqBB m/bxU6aUOWLOiz5J7iE58deIsSvvhtC5HOu5+4b+qAXYVsc9aDtGBjfgiv2gG1Ggu1IgFh 4lqd7QywnDKv5K3X2oU5sfXnYzOyHgQwcMA+JH9bIRFsGAdslAOzDMBaAEsiP93/SNh4SA VmJQYX23pb3eZGOOnRoTkAg/d4BbuuWiAH2+KcERBhbqYBokB6a1XTkBoXmJ80bxw5e+xC hxmVR+Fq8rsF0HqMgbKnUr2sJYht7wbYhzpTnGcAqtuzlirHx5GPM0pO8/D6Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763836975; a=rsa-sha256; cv=none; b=wgbDiyOCV2F6ViFxvHJOJu1kFsAFza8TIELHKcwSV28oV2XIRZPWCPDZdpihJMKnAm+tQF 8Hcnr/fBHBOLecgBO8HwNNNWhiyHkWs042OjWXvMtLA7KM8PRHaWTXjSiUWA9i+NoMXOm/ qOjETOBehuxIqrBbK7sTL0mpiPlQhklbD0xN4m6wfggIs2IgCpfi0jlrBQKYvB1nC+NAvQ rzqCOP8hDRX7s3BMwBQ/3CCJZJKIoLUKMKYPQq5zcUY5xAgR7rO/6qF0XtC3FEdTroMGlo Z//uhQ9kW7GcPkSGCUr5aQv/yNPqY5mImgqRuUlOFh7I2F15YoCn3+4iSo52Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDLYq3ZYYz197B for ; Sat, 22 Nov 2025 18:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 219e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 18:42:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c4843e5805de - stable/15 - cp: Fix copying the root directory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c4843e5805dec10ee552d21f19c8da7707c1fcbc Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 18:42:55 +0000 Message-Id: <6922042f.219e5.6a6171d1@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c4843e5805dec10ee552d21f19c8da7707c1fcbc commit c4843e5805dec10ee552d21f19c8da7707c1fcbc Author: Dag-Erling Smørgrav AuthorDate: 2025-11-22 12:11:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-22 18:42:43 +0000 cp: Fix copying the root directory When the source of the copy operation is the root directory, we should neither append it to the destination path on FTS_D nor trim it back off on FTS_DP. PR: 291132 MFC after: 3 days Fixes: 82fc0d09e862 ("cp: Partly restore symlink folllowing.") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53863 (cherry picked from commit fe836c50120daed3e4084f43c27d8d650d36dee8) --- bin/cp/cp.c | 7 ++++++- bin/cp/tests/cp_test.sh | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 38fe65399d06..7ac1e5f6a4c4 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -433,6 +433,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) sep = strchr(to.base, '\0'); sep[0] = '/'; sep[1] = '\0'; + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { /* entering a directory; append its name to to.path */ len = snprintf(to.end, END(to.path) - to.end, "%s%s", @@ -520,6 +522,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) if (type == DIR_TO_DNE && curr->fts_level == FTS_ROOTLEVEL) { /* this is actually our created root */ + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { while (to.end > to.path && *to.end != '/') to.end--; @@ -551,7 +555,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) /* Not an error but need to remember it happened. */ if (to.path[0] == '\0') { /* - * This can happen in two cases: + * This can happen in three cases: + * - The source path is the root directory. * - DIR_TO_DNE; we created the directory and * populated root_stat earlier. * - FILE_TO_DIR if a source has a trailing slash; diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index b637f862b7d3..af309ca7ea80 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -747,9 +747,23 @@ dstmode_body() atf_check cmp dir/file dst/file } +atf_test_case root +root_head() +{ + atf_set "descr" "Test copying the root directory" +} +root_body() +{ + atf_check mkdir dst + atf_check -s exit:1 \ + -e inline:"cp: / is a directory (not copied).\n" \ + cp / dst +} + atf_test_case to_root cleanup to_root_head() { + atf_set "descr" "Test copying to the root directory" atf_set "require.user" "unprivileged" } to_root_body() @@ -893,6 +907,7 @@ atf_init_test_cases() atf_add_test_case to_deaddirlink atf_add_test_case to_link_outside atf_add_test_case dstmode + atf_add_test_case root atf_add_test_case to_root atf_add_test_case dirloop atf_add_test_case unrdir From nobody Sat Nov 22 19:16:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDMJH3sF8z6HQXc for ; Sat, 22 Nov 2025 19:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDMJH3J5mz3tp0 for ; Sat, 22 Nov 2025 19:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763838975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OuWn9Q6qtwrjkw/FCXMldDQjBXmr0Ai/yo/zlKE/SOE=; b=Z+UIyiwLd1ljB6RcR/ECuOnB7rq8ZztGObf3sdzFHkaQfLC1uPlciJFB67Nhiu/PuPggt/ 6Zqk4HGbVeIp2vc7CA66V+pfWBtehHVF2OKiXYMnWhjrm58YVDS3hSLrwHD0TxkVfGr0NR JVlHrBtHISs/ZcB5DkQD+rPiIbjZFt6LMplfyP8yuV+0RdjBlJZ+Q8J4JPSmFT7HwQLsNo o2euFbGH73/zEqZ48MwxW8+ZHQUx4H/bhcto1rnvvwiI7NrHbKKVZ5ihnrs1c9aO6IUtY8 IFEevFJeZtSFRXXFL0aRVUbNEEe3p3c/qNpbdqY0g/KamRZMzEX6jhl4PU/C6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763838975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OuWn9Q6qtwrjkw/FCXMldDQjBXmr0Ai/yo/zlKE/SOE=; b=bj3fns/mOsf4YPrJ+wd4wCZj5oux2yp0jcFCjBorV5WmCDg8X5Ow0sh3sYK2/mPfAuTC4l 5kLX6yU+fbJAQyOryqueD5E3KPx3+TJjHVU12NxAo2JTwr2yPVX+b41LiuDmiMAx8L2C5d mrFCr8sOnJ/X5nx87kFea8BsDiEpZv6VfTbvwp5tsTyNtXmFrD+xVBkTH7/x4ttkkR5bZw 2OOpIc9ZzXm9fAVbkEF+Wqbg8F3AiI8XEbUgTCI5UYXfO48wvRUMseIxgAGAScBDhh9nqc SBaK7lL6j3omjuH5BG/A/B3EI7JcHbux3uYoi8TyEYHZKTGiQPozBju5S/ayVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763838975; a=rsa-sha256; cv=none; b=TKlRUnPX4dDOZcfvuMHW0C6OA8ACASbrpWY2dl9amAcE3xuVSTcc8cyWyQcTrBBijNB4FF 8Jlfu1jWLUdeDmEpOJXdcYxpI7Ra0tL+nSIsDfpjpAskhe2MljnOYTkWim6hmyicEwmJ1G E0y++Q7U3d0R5H3e4jcpaPTY7GFzqoYgQTU0TF3hinQL97yA13QRtTMA30fdynrMNvcz9R aYmpFdwwYK2UEtzI1vy/BA6bl+qvldCs2CVOsvdN9MbCZ5kQJKeQWdlWHMyHwszdWcUm7B FLKLWmtY4nP2j+lobVzTwGozewLYnsB+T4pRqjRY7QUU8/mBEgXl2ysnTYfsQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDMJH2njgz19S7 for ; Sat, 22 Nov 2025 19:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 258fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 19:16:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 696b0e2209ee - stable/15 - Add backup pkgbase signing key held by security-officer. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 696b0e2209ee81c5a0b27c327cf66eb3c9cfc584 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 19:16:15 +0000 Message-Id: <69220bff.258fe.51b56df8@gitrepo.freebsd.org> The branch stable/15 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=696b0e2209ee81c5a0b27c327cf66eb3c9cfc584 commit 696b0e2209ee81c5a0b27c327cf66eb3c9cfc584 Author: Gordon Tetlow AuthorDate: 2025-11-22 08:35:52 +0000 Commit: Gordon Tetlow CommitDate: 2025-11-22 19:15:42 +0000 Add backup pkgbase signing key held by security-officer. This key was generated by gordon@ (aka security-officer@) on an offline system as a backup key should anything happen to the AWS Key Management Service that is currently in use for signing pkgbase repositories for FreeBSD 15.x. Reviewed by: cperciva With hat: so (cherry picked from commit 12ec49d8fac2eacd40ad235bf73cc585736ee77a) --- share/keys/pkgbase-15/trusted/Makefile | 3 ++- share/keys/pkgbase-15/trusted/backup-signing-15 | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/share/keys/pkgbase-15/trusted/Makefile b/share/keys/pkgbase-15/trusted/Makefile index e6205999b12f..32db72ae368a 100644 --- a/share/keys/pkgbase-15/trusted/Makefile +++ b/share/keys/pkgbase-15/trusted/Makefile @@ -1,6 +1,7 @@ PACKAGE= pkg-bootstrap -FILES= awskms-15 +FILES= awskms-15 \ + backup-signing-15 FILESDIR= ${SHAREDIR}/keys/pkgbase-15/trusted FILESMODE= 644 diff --git a/share/keys/pkgbase-15/trusted/backup-signing-15 b/share/keys/pkgbase-15/trusted/backup-signing-15 new file mode 100644 index 000000000000..a147d6788cf2 --- /dev/null +++ b/share/keys/pkgbase-15/trusted/backup-signing-15 @@ -0,0 +1,2 @@ +function: "sha256" +fingerprint: "56a77bdcb6c3cf7984729c6138bd5617c24aa0d466b3b604c96205b2c5629f3c" From nobody Sat Nov 22 23:54:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDTTC40zTz6HqJt for ; Sat, 22 Nov 2025 23:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDTTC3T3Jz3H5T for ; Sat, 22 Nov 2025 23:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763855663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yxm59ObC/Vf8+FX/4xD7LRsSfce2KAM6LxdHPtkj2Gg=; b=NlZ1hdKmr51SibFfazPsjLxI/rsmBneEGIwNeYGXoFv2OWPerJ7RFBi0nTlvY/VTa38nPb Eipw/3zfrY0dq8VXyBqeY/o/r8jsNw18jKXf3EDdQ2bnvxWNbWu96bkJJ8vIaJRs3xHLO0 fFDzxkf942jQeG2IKqFsM34rVHR5RtuFz3So/ujKffnr+SL4dVd84PKevkLamTcVXgsJoT 9rpOeCI0mpBWJl8z1rpja6TDN66L6bkZn6g9WwSt4vSwdbgEwnJWsjI68jLQyFPxVBdE+D pCgszPHAYKady+0aAS1AXFBRpU4Gmidz9QB2dlW07cGee8PeKdxmVKZSpFWA3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763855663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yxm59ObC/Vf8+FX/4xD7LRsSfce2KAM6LxdHPtkj2Gg=; b=M9VionyFFBY3ch2j4XnOMolAVNAxayqYgQ3/+C+cVVGYgKhNDUEJ9TobXFSVcT2POSj4yE xeDRdEhPNy5ZZvUJTMMIN0WWsoth8AlmSFpGnQT4v6qk52Xy4t5gb7oDuyxWwWk/6BuXp3 n6/4W4GsGwM7qxSlN2BkrhcGw4I+ppJTV1IgsFaVwreytz2VaYWFrf9ik9atFJ7akHNjuy d2oBcijx4RTUSNvGmXKiNg9rCU1JuYMxA2bFbKdg3yseEF9FByT9AWq7W4BA9dV0QoS57b HQJFK8bh7hsLXnrAfXBWOaB8NMhBX4LPa/zxs1v0eErqvG4FueuNeCejQieVog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763855663; a=rsa-sha256; cv=none; b=dV2FZrRIJRGgaA+LNm3KyLk5+XrSsQcRwIWI+XyafoU8Ondoi893mCdHZ6XB7DSX1iVQ/1 WdJgu8w4ioG6icKiAf8d9bvzmMcnY7/c+VYSp05hSqPR5i6D+8i3YtqVJVQqgCYXd9qWqF xy8yvT7vSr+H255WS9hEuhSRJEbrDeZLSqMHVogiVWakgE9Aq5ziSKnlvNT4elL94CRFMv tMJEQXzcRieFwKgPu0ceP2hto3L2rwABc10Wng8YhLwmyUIxxAhHpCiSC+343zIb2PusaA SvV4PMRLnsbkNIQZ6HlW7YbzFnDIFhX81bqXYbP3bYQ+DDRWWuyc7MuW0z3tCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDTTC338mz1Jjv for ; Sat, 22 Nov 2025 23:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 222a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 23:54:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: a36c71acb6e9 - stable/15 - nfs_commonsubs.c: Get rid of variable used as a constant List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a36c71acb6e960c56516612fbf5e7fc1f269e845 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 23:54:23 +0000 Message-Id: <69224d2f.222a4.19f28453@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a36c71acb6e960c56516612fbf5e7fc1f269e845 commit a36c71acb6e960c56516612fbf5e7fc1f269e845 Author: Rick Macklem AuthorDate: 2025-10-29 00:28:04 +0000 Commit: Rick Macklem CommitDate: 2025-11-22 23:53:01 +0000 nfs_commonsubs.c: Get rid of variable used as a constant The variable ncl_mbuf_mhlen is set to MHLEN and only used in one place. This patch simply deletes it and replaces it with MHLEN. This patch should not affect semantics. Spotted while fixing cases that could do large NFSM_DISSECT() sizes. (cherry picked from commit 73551cd6eac29a6707c802c7d7fafcb560bf5e2b) --- sys/fs/nfs/nfs_commonsubs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 8e1a26eef354..f580a394a735 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -194,7 +194,6 @@ struct nfsv4_opflag nfsv4_opflag[NFSV42_NOPS] = { { 0, 1, 1, 1, LK_EXCLUSIVE, 1, 1 }, /* Removexattr */ }; -static int ncl_mbuf_mhlen = MHLEN; struct nfsrv_lughash { struct mtx mtx; struct nfsuserhashhead lughead; @@ -770,7 +769,7 @@ nfsm_dissct(struct nfsrv_descript *nd, int siz, int how) nd->nd_dpos += siz; } else if (nd->nd_md->m_next == NULL) { return (retp); - } else if (siz > ncl_mbuf_mhlen) { + } else if (siz > MHLEN) { panic("nfs S too big"); } else { MGET(mp2, how, MT_DATA); From nobody Sun Nov 23 09:44:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZT4LrKz6Gcq8 for ; Sun, 23 Nov 2025 09:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDkZT3X1xz3GMG for ; Sun, 23 Nov 2025 09:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3iu/4DNMR2mJ4wopjJSc0+tgKK+6awly0OA0uK3USM=; b=kmlTDURmyVTVaSxCQsUo80TRPHqluXPOAtJOvQZsLgQiIi1d1v1PM3XXT8w7DzAosd5ZP9 F+Z2mLxnmYrCdOgMo3wec/0iCu8tzz09Ct+7K1ILWVTH6EeznOIKnKwA5/61RjCOOrWarS h7dtS6YTvVRZwrE8767/INjpGCSoSEOSx8Ig6Q/geBY8aT4baiUvxowLFxfh4MSw8ImMRq LmwDe2CeZeEGB/fwqLMY4LwC6bLj/QVCPXNRtPepJDduZV9cwOtYMjCCIgQR1eFYS24Pz7 f+4m+KbnWW5hTWzI/7fGjDNmJGI33fn06JnvHy6k4a2dugHA+ZeFCHdZYHyZ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3iu/4DNMR2mJ4wopjJSc0+tgKK+6awly0OA0uK3USM=; b=UfZVPw1mIS5oPJK5rohy1OnDNEwyG7ha8UAICcb9r3pNm+e4ES+7tE3hlyGqwsngGM9K+e yovVd22tbcYBH34YwoNl6c1CrpiL5aU/3ZEckqchtk/vzRMtS22k604ZgXqvJokVxck2kE 1T9oSyMFkDm5HL+XWXf4rH8Ju1Mc7ZKXwUW+ooK/HupbKQ4iO0JBYWfAXDb5TsWhbY74rI mc276Je0toyEbDc6S1lqClO/jfUPlYtq1qjmXuM6+mYgt3vVY3/FTbQbcQn/CstfkETD6I MfSS9WjDPafplERR/oOoKjQJNfj+5+koViusDZxQ2SaZat9MQCQsD9kODctwvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763891089; a=rsa-sha256; cv=none; b=rOyv48yuqfHkLPC/bySAK0UKVbJLIVG2ipOTmQCZgpw4vhaYfi/AeXKovN7UM/dyh1i/jj 6JxLSg2US8YtxKqTUFCZwCUROXy26XRpDtGn9DJXAAW42W2xGJAbUx8Oh356LeglkTUckS gCGd2+VjN4BAlInyJvF4wZe/wy2Ur5gmoHIqt2Z//I6ZO/3/ttOWXrUmo8GiS1i4o0mI9Q 4rsR5XzRSMLRo8u1wVwjESsIE/yU3MxhGDgusMsrXrieEUeGc/aEI7w4ym+U2pUbuNbO+J ORVMxoB7Iu2adsMEVUTVDtygT5HXdvx6TWbG7q3N6stiHyLEgIC1da8IWZZRLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZT2sQDz7Xx for ; Sun, 23 Nov 2025 09:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36588 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 09:44:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 5a566616e662 - stable/15 - sys: move sys/kern/md[45].c to sys/crypto List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5a566616e66244ea69b8f3d034430ca7ea6fc1c7 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 09:44:49 +0000 Message-Id: <6922d791.36588.753a2557@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5a566616e66244ea69b8f3d034430ca7ea6fc1c7 commit 5a566616e66244ea69b8f3d034430ca7ea6fc1c7 Author: Robert Clausecker AuthorDate: 2025-10-04 21:40:33 +0000 Commit: Robert Clausecker CommitDate: 2025-11-23 01:12:34 +0000 sys: move sys/kern/md[45].c to sys/crypto Both files are used by kernel and userspace. Move them to sys/crypto where they belong. No functional changes intended. In preparation of D45670. Reviewed by: markj Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D52909 (cherry picked from commit 73a9b273d3d315716304c2cc237fef3141a93f2a) --- lib/libmd/Makefile | 2 +- stand/libsa/Makefile | 3 +-- sys/conf/files | 4 ++-- sys/{kern => crypto}/md4c.c | 0 sys/{kern => crypto}/md5c.c | 0 sys/modules/smbfs/Makefile | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 547a134fc440..59a519a882af 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -108,7 +108,7 @@ CFLAGS+= -DWEAK_REFS CFLAGS.skein_block.c+= -DSKEIN_LOOP=995 .PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2 .PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} -.PATH: ${SRCTOP}/sys/kern +.PATH: ${SRCTOP}/sys/crypto USE_ASM_SOURCES?=1 .if defined(BOOTSTRAPPING) || ${MK_MACHDEP_OPTIMIZATIONS} == no diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index f5a1acea843e..c1e03c7a5789 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -189,8 +189,7 @@ SRCS+= g_eli_hmac.c pkcs5v2.c .PATH: ${SYSDIR}/crypto/sha2 SRCS+= sha256c.c sha512c.c -# md5 from the kernel -.PATH: ${SYSDIR}/kern +.PATH: ${SYSDIR}/crypto SRCS+= md5c.c .if ${DO32:U0} == 0 diff --git a/sys/conf/files b/sys/conf/files index da5e22e0669b..297698fd7489 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -681,6 +681,8 @@ crypto/curve25519.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" crypto/des/des_ecb.c optional netsmb crypto/des/des_setkey.c optional netsmb +crypto/md4c.c optional netsmb +crypto/md5c.c standard crypto/openssl/ossl.c optional ossl crypto/openssl/ossl_aes.c optional ossl crypto/openssl/ossl_chacha20.c optional ossl @@ -3900,8 +3902,6 @@ kern/kern_vnodedumper.c standard kern/kern_xxx.c standard kern/link_elf.c standard kern/linker_if.m standard -kern/md4c.c optional netsmb -kern/md5c.c standard kern/p1003_1b.c standard kern/posix4_mib.c standard kern/sched_4bsd.c optional sched_4bsd diff --git a/sys/kern/md4c.c b/sys/crypto/md4c.c similarity index 100% rename from sys/kern/md4c.c rename to sys/crypto/md4c.c diff --git a/sys/kern/md5c.c b/sys/crypto/md5c.c similarity index 100% rename from sys/kern/md5c.c rename to sys/crypto/md5c.c diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile index c796fb0701c5..5ef13757e621 100644 --- a/sys/modules/smbfs/Makefile +++ b/sys/modules/smbfs/Makefile @@ -1,6 +1,6 @@ -.PATH: ${SRCTOP}/sys/crypto/des \ +.PATH: ${SRCTOP}/sys/crypto \ + ${SRCTOP}/sys/crypto/des \ ${SRCTOP}/sys/crypto/des/arch/${MACHINE_CPUARCH} \ - ${SRCTOP}/sys/kern \ ${SRCTOP}/sys/libkern \ ${SRCTOP}/sys/netsmb \ ${SRCTOP}/sys/fs/smbfs From nobody Sun Nov 23 09:44:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZV6Kgjz6Gd4h for ; Sun, 23 Nov 2025 09:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDkZV3X8Gz3GD5 for ; Sun, 23 Nov 2025 09:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFDa1iuSrkMMVOvXcBagXacibDLgu7PMenL2XHHrm9c=; b=VoLgAwOSXW54TMDSBCTsg0sxPoW8aFv0nmqSuanHxVUVJzgL36Lbbf9vB4TnhzkNEZgUjd oiG058rAFJTPjPouw2h3ikxp/B2TS22Ziv8mD6VAdVANPvO4Xi7H9ykL1IZgipMQUHCBrW UkbyKmzaxPAI/OjhrnIejAIhAdYC+b67gwNDc6Nlqd9fac0zdP4iyamsChLLTQczy+Rv3H qae2k7VLdP3EWu5X3qQvkJvBCslA1s/p/Wac0re6gx0C1USp0JgCD5+oL1F2mUXxQ9tRO/ SSQ5KPEYgTBKC0fkFFNtmkuP4zJGjwIYqN1rZzDM66b3rHNt5FnerfhBwAQpZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFDa1iuSrkMMVOvXcBagXacibDLgu7PMenL2XHHrm9c=; b=kgVtQGF9M1X24DOStxEMkInWEKPuwq6DEVdpV7hahhDB3TqoNjfA/ew/zDxDv6hrzfmAT6 q9Uflv4IXivsgd02YysLlzK5qYwRBR45FvdhzsB3pdMKSL+1YhvXcxW4cBhyxt4x8q5lLL FfpUY6uS1P49V0Sk3l3EJ9PMmyR4+pfbTTY29uP1mT4no0SwVKmgUUYUq2lQmLkMw3hSE8 yKt8JDh5aI1lKHxPGjA8deBBDVPAfCLCnJFinHrFrhoMTYNXq7sb5lLdn0us2WEeZJhfXw B2hURhp9Jp5eBFMwrOx1El2p8zTUQ443kx94lzrYDU2GT3WLqYeR9LMXafOfJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763891090; a=rsa-sha256; cv=none; b=nSS6zap0NYZlxqkrJN12huXjEF7SQO2hhwBWgU+uaGEMYAAgmY9r0I0+n9nA+/oJLDhZWM 2YScVogUFB+tm7l8Jn5Wgcyd3G0Ko6d800oXSghORupUWrw3rJ4XlZ7uaoHqz/VM/Ju8gt z1sEndPYxQDRgn/HS7zPmW7TH1hIfkODdFBwQp2mCbFCpveA5SvzkvOsbEWxne+B6/SSuH JKVDp7x3mlwHibIHojuMCH4xHAuQe5gXRK8YIr4JPg5M21dE67A8uL+cu9wUdjEEgbNE7f M8YhAEx8UbMFlog3KdYFFd+f35D5cj4keGPXrdTlk2i7rOMR2JYEV0OgGYBlBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZV342zz7Xy for ; Sun, 23 Nov 2025 09:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35a06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 09:44:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: f0b9cf9dd798 - stable/15 - sys/crypto: import md5c.c C rewrite List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f0b9cf9dd7984e391adf20c18d561eb404b3ddc2 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 09:44:50 +0000 Message-Id: <6922d792.35a06.201b9356@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f0b9cf9dd7984e391adf20c18d561eb404b3ddc2 commit f0b9cf9dd7984e391adf20c18d561eb404b3ddc2 Author: Robert Clausecker AuthorDate: 2025-10-04 21:59:56 +0000 Commit: Robert Clausecker CommitDate: 2025-11-23 01:12:35 +0000 sys/crypto: import md5c.c C rewrite The reimplementation is a bit cleaner than the original code, although it is also slightly slower. This shouldn't matter too much as we will have asm code for the major platforms. The code is unrolled when built in the kernel or user space, but not when in libsa, as to reduce the code size. Differential Revision: https://reviews.freebsd.org/D45670 Reviewed by: jrtc27, imp Approved by: markj (mentor) MFC after: 1 month (cherry picked from commit 90fa789cfab54294d4c3a0ac74e01747ce074386) --- stand/libsa/Makefile | 1 + sys/crypto/md5c.c | 542 ++++++++++++++++++++++++--------------------------- 2 files changed, 260 insertions(+), 283 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index c1e03c7a5789..470c03032f61 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -191,6 +191,7 @@ SRCS+= sha256c.c sha512c.c .PATH: ${SYSDIR}/crypto SRCS+= md5c.c +CFLAGS.md5c.c+= -DSTANDALONE_SMALL .if ${DO32:U0} == 0 MAN=libsa.3 diff --git a/sys/crypto/md5c.c b/sys/crypto/md5c.c index 0922d0f8cc61..f9ffb602afdb 100644 --- a/sys/crypto/md5c.c +++ b/sys/crypto/md5c.c @@ -1,331 +1,307 @@ /*- - * SPDX-License-Identifier: RSA-MD + * Copyright (c) 2024, 2025 Robert Clausecker * - * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm - * - * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - * rights reserved. - * - * License to copy and use this software is granted provided that it - * is identified as the "RSA Data Security, Inc. MD5 Message-Digest - * Algorithm" in all material mentioning or referencing this software - * or this function. - * - * License is also granted to make and use derivative works provided - * that such works are identified as "derived from the RSA Data - * Security, Inc. MD5 Message-Digest Algorithm" in all material - * mentioning or referencing the derived work. - * - * RSA Data Security, Inc. makes no representations concerning either - * the merchantability of this software or the suitability of this - * software for any particular purpose. It is provided "as is" - * without express or implied warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. - * - * This code is the same as the code published by RSA Inc. It has been - * edited for clarity and style only. + * SPDX-License-Identifier: BSD-2-Clause */ +#include #include +#include #ifdef _KERNEL +#include +#include #include +#define assert(expr) MPASS(expr) #else +#include +#include #include -#endif - -#include -#include -#include - -static void MD5Transform(uint32_t [4], const unsigned char [64]); - -#if (BYTE_ORDER == LITTLE_ENDIAN) -#define Encode memcpy -#define Decode memcpy -#else - -/* - * Encodes input (uint32_t) into output (unsigned char). Assumes len is - * a multiple of 4. - */ - -static void -Encode (unsigned char *output, uint32_t *input, unsigned int len) -{ - unsigned int i; - uint32_t ip; - - for (i = 0; i < len / 4; i++) { - ip = input[i]; - *output++ = ip; - *output++ = ip >> 8; - *output++ = ip >> 16; - *output++ = ip >> 24; - } -} - -/* - * Decodes input (unsigned char) into output (uint32_t). Assumes len is - * a multiple of 4. - */ +#include +#endif /* defined(_KERNEL) */ -static void -Decode (uint32_t *output, const unsigned char *input, unsigned int len) -{ - unsigned int i; - - for (i = 0; i < len; i += 4) { - *output++ = input[i] | (input[i+1] << 8) | (input[i+2] << 16) | - (input[i+3] << 24); - } -} +#define md5block _libmd_md5block +#ifdef MD5_ASM +extern void md5block(MD5_CTX *, const void *, size_t); +#else +static void md5block(MD5_CTX *, const void *, size_t); #endif -static unsigned char PADDING[64] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/* F, G, H and I are basic MD5 functions. */ -#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) -#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) -#define I(x, y, z) ((y) ^ ((x) | (~z))) - -/* ROTATE_LEFT rotates x left n bits. */ -#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) - -/* - * FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. - * Rotation is separate from addition to prevent recomputation. - */ -#define FF(a, b, c, d, x, s, ac) { \ - (a) += F ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define GG(a, b, c, d, x, s, ac) { \ - (a) += G ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define HH(a, b, c, d, x, s, ac) { \ - (a) += H ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define II(a, b, c, d, x, s, ac) { \ - (a) += I ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } - -/* MD5 initialization. Begins an MD5 operation, writing a new context. */ +/* don't unroll in bootloader */ +#ifdef STANDALONE_SMALL +#define UNROLL +#else +#define UNROLL _Pragma("unroll") +#endif void -MD5Init(MD5_CTX *context) +MD5Init(MD5_CTX *ctx) { + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xefcdab89; + ctx->state[2] = 0x98badcfe; + ctx->state[3] = 0x10325476; - context->count[0] = context->count[1] = 0; - - /* Load magic initialization constants. */ - context->state[0] = 0x67452301; - context->state[1] = 0xefcdab89; - context->state[2] = 0x98badcfe; - context->state[3] = 0x10325476; + ctx->count[0] = 0; + ctx->count[1] = 0; } -/* - * MD5 block update operation. Continues an MD5 message-digest - * operation, processing another message block, and updating the - * context. - */ - void -MD5Update(MD5_CTX *context, const void *in, unsigned int inputLen) +MD5Update(MD5_CTX *ctx, const void *data, unsigned int len) { - unsigned int i, index, partLen; - const unsigned char *input = in; + uint64_t nn; + const char *p = data; + unsigned num; - /* Compute number of bytes mod 64 */ - index = (unsigned int)((context->count[0] >> 3) & 0x3F); + num = ctx->count[0] % MD5_BLOCK_LENGTH; + nn = (uint64_t)ctx->count[0] | (uint64_t)ctx->count[1] << 32; + nn += len; + ctx->count[0] = (uint32_t)nn; + ctx->count[1] = (uint32_t)(nn >> 32); - /* Update number of bits */ - if ((context->count[0] += ((uint32_t)inputLen << 3)) - < ((uint32_t)inputLen << 3)) - context->count[1]++; - context->count[1] += ((uint32_t)inputLen >> 29); + if (num > 0) { + unsigned int n = MD5_BLOCK_LENGTH - num; - partLen = 64 - index; + if (n > len) + n = len; - /* Transform as many times as possible. */ - if (inputLen >= partLen) { - memcpy((void *)&context->buffer[index], (const void *)input, - partLen); - MD5Transform (context->state, context->buffer); + memcpy((char *)ctx->buffer + num, p, n); + num += n; + if (num == MD5_BLOCK_LENGTH) + md5block(ctx, (void *)ctx->buffer, MD5_BLOCK_LENGTH); - for (i = partLen; i + 63 < inputLen; i += 64) - MD5Transform (context->state, &input[i]); + p += n; + len -= n; + } - index = 0; + if (len >= MD5_BLOCK_LENGTH) { + unsigned n = len & ~(unsigned)(MD5_BLOCK_LENGTH - 1); + + md5block(ctx, p, n); + p += n; + len -= n; } - else - i = 0; - /* Buffer remaining input */ - memcpy ((void *)&context->buffer[index], (const void *)&input[i], - inputLen-i); + if (len > 0) + memcpy((void *)ctx->buffer, p, len); } -/* - * MD5 padding. Adds padding followed by original length. - */ - static void -MD5Pad(MD5_CTX *context) +MD5Pad(MD5_CTX *ctx) { - unsigned char bits[8]; - unsigned int index, padLen; - - /* Save number of bits */ - Encode (bits, context->count, 8); - - /* Pad out to 56 mod 64. */ - index = (unsigned int)((context->count[0] >> 3) & 0x3f); - padLen = (index < 56) ? (56 - index) : (120 - index); - MD5Update (context, PADDING, padLen); - - /* Append length (before padding) */ - MD5Update (context, bits, 8); + uint64_t len; + unsigned t; + unsigned char tmp[MD5_BLOCK_LENGTH + sizeof(uint64_t)] = {0x80, 0}; + + len = (uint64_t)ctx->count[0] | (uint64_t)ctx->count[1] << 32; + t = 64 + 56 - ctx->count[0] % 64; + if (t > 64) + t -= 64; + + /* length in bits */ + len <<= 3; + le64enc(tmp + t, len); + MD5Update(ctx, tmp, t + 8); + assert(ctx->count[0] % MD5_BLOCK_LENGTH == 0); } -/* - * MD5 finalization. Ends an MD5 message-digest operation, writing the - * the message digest and zeroizing the context. - */ - void -MD5Final(unsigned char digest[static MD5_DIGEST_LENGTH], MD5_CTX *context) +MD5Final(unsigned char md[16], MD5_CTX *ctx) { - /* Do padding. */ - MD5Pad (context); + MD5Pad(ctx); - /* Store state in digest */ - Encode (digest, context->state, MD5_DIGEST_LENGTH); + le32enc(md + 0, ctx->state[0]); + le32enc(md + 4, ctx->state[1]); + le32enc(md + 8, ctx->state[2]); + le32enc(md + 12, ctx->state[3]); - /* Zeroize sensitive information. */ - explicit_bzero (context, sizeof (*context)); + explicit_bzero(ctx, sizeof(ctx)); } -/* MD5 basic transformation. Transforms state based on block. */ +#ifndef MD5_ASM +static const uint32_t K[64] = { + 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, + 0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, + 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, + 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, + 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, + 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, + 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, + 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, + 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, + 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, + 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, + 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, + 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, + 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, + 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, + 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391, +}; + +static inline uint32_t +rol32(uint32_t a, int b) +{ + return (a << b | a >> (32 - b)); +} static void -MD5Transform(uint32_t state[4], const unsigned char block[64]) +md5block(MD5_CTX *ctx, const void *data, size_t len) { - uint32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16]; - - Decode (x, block, 64); - - /* Round 1 */ -#define S11 7 -#define S12 12 -#define S13 17 -#define S14 22 - FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */ - FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */ - FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */ - FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */ - FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */ - FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */ - FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */ - FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */ - FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */ - FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */ - FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */ - FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */ - FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */ - FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */ - FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */ - FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */ - - /* Round 2 */ -#define S21 5 -#define S22 9 -#define S23 14 -#define S24 20 - GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */ - GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */ - GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */ - GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */ - GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */ - GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ - GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */ - GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */ - GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */ - GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */ - GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */ - GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */ - GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */ - GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */ - GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */ - GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */ - - /* Round 3 */ -#define S31 4 -#define S32 11 -#define S33 16 -#define S34 23 - HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */ - HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */ - HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */ - HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */ - HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */ - HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */ - HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */ - HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */ - HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */ - HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */ - HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */ - HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ - HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */ - HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */ - HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */ - HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */ - - /* Round 4 */ -#define S41 6 -#define S42 10 -#define S43 15 -#define S44 21 - II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */ - II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */ - II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */ - II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */ - II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */ - II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */ - II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */ - II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */ - II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */ - II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */ - II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */ - II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */ - II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */ - II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */ - II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */ - II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */ - - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - - /* Zeroize sensitive information. */ - memset ((void *)x, 0, sizeof (x)); + uint32_t m[16], a0, b0, c0, d0; + const char *p = data; + + a0 = ctx->state[0]; + b0 = ctx->state[1]; + c0 = ctx->state[2]; + d0 = ctx->state[3]; + + while (len >= MD5_BLOCK_LENGTH) { + size_t i; + uint32_t a = a0, b = b0, c = c0, d = d0, f, tmp; + + UNROLL + for (i = 0; i < 16; i++) + m[i] = le32dec(p + 4*i); + + UNROLL + for (i = 0; i < 16; i += 4) { + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[i], 7); + a = tmp; + + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[i + 1], 12); + a = tmp; + + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[i + 2], 17); + a = tmp; + + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[i + 3], 22); + a = tmp; + } + + UNROLL + for (; i < 32; i += 4) { + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[(5*i + 1) % 16], 5); + a = tmp; + + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[(5*i + 6) % 16], 9); + a = tmp; + + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[(5*i + 11) % 16], 14); + a = tmp; + + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[5*i % 16], 20); + a = tmp; + } + + UNROLL + for (; i < 48; i += 4) { + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[(3*i + 5) % 16], 4); + a = tmp; + + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[(3*i + 8) % 16], 11); + a = tmp; + + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[(3*i + 11) % 16], 16); + a = tmp; + + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[(3*i + 14) % 16], 23); + a = tmp; + } + + UNROLL + for (; i < 64; i += 4) { + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[7*i % 16], 6); + a = tmp; + + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[(7*i + 7) % 16], 10); + a = tmp; + + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[(7*i + 14) % 16], 15); + a = tmp; + + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[(7*i + 5) % 16], 21); + a = tmp; + } + + a0 += a; + b0 += b; + c0 += c; + d0 += d; + + p += MD5_BLOCK_LENGTH; + len -= MD5_BLOCK_LENGTH; + } + + ctx->state[0] = a0; + ctx->state[1] = b0; + ctx->state[2] = c0; + ctx->state[3] = d0; } +#endif /* !defined(MD5_ASM) */ #ifdef WEAK_REFS /* When building libmd, provide weak references. Note: this is not From nobody Sun Nov 23 09:44:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZW5xB3z6Gd7k for ; Sun, 23 Nov 2025 09:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDkZW4llrz3Fx1 for ; Sun, 23 Nov 2025 09:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hz46Ey6bG1pe7RfoAdldb5fgX6FQjiHfRLRkdMPeyuM=; b=xchvFt2DarOeJ9dQRlvgmsQpGUqB4pHCg4EBx7tMYp3BAlxAGiS/ob1lLr0VfYeup8I9aA m0Yt8qYOtY4lB/KafZdQM5ftb/QuPaiiN2L0zr7lZQrk/peqb+zoBOFZM+334ZJ9XzJe0y SZTnfObZYeOM57NkINJsPB2T2PL8LvvapWrcxgUhAQwjU+4cSLMjgAWQcCvhaVf1dtocmR nuGxvF4FLUAM2eqa/mUfcQLg92qu77OSNhE5cvmT2VI5DtvEiZrOu6XCDaF5Qq3ykKQHwB 99+1oYggabu7VlHSZx9DiV2iduFIFP4vV2UuBW++XWp88vF/m7FL2Ads+B9zhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hz46Ey6bG1pe7RfoAdldb5fgX6FQjiHfRLRkdMPeyuM=; b=sUhwsx2NrLDbwlwTiERYXkx7PFIV3IcReSl+Sxa9r1cbM0DZ5ZUd58OF8Jl4FEbRvN8uRe k0y/EXMAVjcvEK7cUiYTet0UA/xtUe0vOs7Nj5IdcwGDal9Pi7dZNbxSscjH4oh8fcFFjt Y9IjuNLshIp4wV2rA6GvC79J2EHxden4E6d7ZrZS8CwU/r8bJ7reg/pjjXjmOzhkqhiAYp 0p9phIbYiF9qRYu5cdEeodn2b6OT/sPRxKJaqMjmHkY7XJ2UmT9a0EPhkmFuixfqpH4x6p 1JekPEIUUS8QFR5Bj02FRH3HJdypLRxxwb22O7BrfRTP0bzZ6iP8b5J7Os78dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763891091; a=rsa-sha256; cv=none; b=iles/Mx1GtDnwsRkPhhcTBPOOTjwgTp5SXcB/BRWj6D0SVXE7jmdyyuOvUjQxjEynbFCsP 3PxfQXvu0k4lSBJVhxlMF8zayls0LnVp8rnmlJvF9QoFrRQA3HCdhgu2AFXTbSvwTK/N5R vg2+H2MvDygKsKiyXJXQY00GGVCEfpaCJghvdGpQS3xgx3jywGv1H1/P1/RAfELEw6wyeW 6EASBFhT3zberpUUATVWGsSvcrALMlMzGWfj8MY3S1GIMkolUWt/jC/HD+Lm6whHfCw5c/ rMNExQ2Odmi6keNIhmaSsQCMUVMLP0wBg92qT232luA3pNI2cWjk5agRlzBb9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZW3tHJz7jK for ; Sun, 23 Nov 2025 09:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 360b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 09:44:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 28a0f0c845d1 - stable/15 - lib/libmd: import md5 amd64 kernels List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 28a0f0c845d1d54e0f785d101828d53a5938e3ec Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 09:44:51 +0000 Message-Id: <6922d793.360b6.586ea0e9@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=28a0f0c845d1d54e0f785d101828d53a5938e3ec commit 28a0f0c845d1d54e0f785d101828d53a5938e3ec Author: Robert Clausecker AuthorDate: 2025-10-10 17:40:49 +0000 Commit: Robert Clausecker CommitDate: 2025-11-23 01:12:35 +0000 lib/libmd: import md5 amd64 kernels Differential Revision: https://reviews.freebsd.org/D45670 Reviewed by: imp Approved by: markj (mentor) MFC after: 1 month (cherry picked from commit d92e987421001c365216b039f8c3303939c195f7) --- lib/libmd/Makefile | 7 + lib/libmd/amd64/md5block.S | 363 ++++++++++++++++++++++++++++++++++++++++++ lib/libmd/amd64/md5dispatch.c | 41 +++++ 3 files changed, 411 insertions(+) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 59a519a882af..c4ab767c8b2f 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -117,6 +117,13 @@ USE_ASM_SOURCES:=0 .endif .if ${USE_ASM_SOURCES} != 0 +.if exists(${MACHINE_ARCH}/md5block.S) +SRCS+= md5block.S +CFLAGS+= -DMD5_ASM +.if exists(${MACHINE_ARCH}/md5dispatch.c) +SRCS+= md5dispatch.c +.endif +.endif .if exists(${MACHINE_ARCH}/sha1block.S) SRCS+= sha1block.S CFLAGS+= -DSHA1_ASM diff --git a/lib/libmd/amd64/md5block.S b/lib/libmd/amd64/md5block.S new file mode 100644 index 000000000000..0dd594dd5dc2 --- /dev/null +++ b/lib/libmd/amd64/md5block.S @@ -0,0 +1,363 @@ +/*- + * Copyright (c) 2024, 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +/* apply the round keys to the four round functions */ +.macro allrounds rfn0, rfn1, rfn2, rfn3 + \rfn0 0, 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee + \rfn0 4, 0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501 + \rfn0 8, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be + \rfn0 12, 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821 + + \rfn1 16, 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa + \rfn1 20, 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8 + \rfn1 24, 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed + \rfn1 28, 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a + + \rfn2 32, 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c + \rfn2 36, 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70 + \rfn2 40, 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05 + \rfn2 44, 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665 + + \rfn3 48, 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039 + \rfn3 52, 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1 + \rfn3 56, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1 + \rfn3 60, 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391 +.endm + + // md5block(MD5_CTX, buf, len) +ENTRY(_libmd_md5block_baseline) +.macro round a, b, c, d, f, k, m, s + \f %ebp, \b, \c, \d + add $\k, \a // a + k[i] + add ((\m)%16*4)(%rsi), \a // a + k[i] + m[g] + add %ebp, \a // a + k[i] + m[g] + f + rol $\s, \a + add \b, \a +.endm + + // f = b ? c : d +.macro f0 f, b, c, d + mov \c, \f + xor \d, \f + and \b, \f + xor \d, \f +.endm + + // f = d ? b : c +.macro f1 f, b, c, d + mov \c, \f + xor \b, \f + and \d, \f + xor \c, \f +.endm + + // f = b ^ c ^ d +.macro f2 f, b, c, d + mov \c, \f + xor \d, \f + xor \b, \f +.endm + + // f = c ^ (b | ~d) +.macro f3 f, b, c, d + mov $-1, \f + xor \d, \f + or \b, \f + xor \c, \f +.endm + + // do 4 rounds +.macro rounds f, p, q, s0, s1, s2, s3, k0, k1, k2, k3 + round %eax, %ebx, %ecx, %edx, \f, \k0, \p*0+\q, \s0 + round %edx, %eax, %ebx, %ecx, \f, \k1, \p*1+\q, \s1 + round %ecx, %edx, %eax, %ebx, \f, \k2, \p*2+\q, \s2 + round %ebx, %ecx, %edx, %eax, \f, \k3, \p*3+\q, \s3 +.endm + + // do 4 rounds with f0, f1, f2, f3 +.macro rounds0 i, k0, k1, k2, k3 + rounds f0, 1, \i, 7, 12, 17, 22, \k0, \k1, \k2, \k3 +.endm + +.macro rounds1 i, k0, k1, k2, k3 + rounds f1, 5, 5*\i+1, 5, 9, 14, 20, \k0, \k1, \k2, \k3 +.endm + +.macro rounds2 i, k0, k1, k2, k3 + rounds f2, 3, 3*\i+5, 4, 11, 16, 23, \k0, \k1, \k2, \k3 +.endm + +.macro rounds3 i, k0, k1, k2, k3 + rounds f3, 7, 7*\i, 6, 10, 15, 21, \k0, \k1, \k2, \k3 +.endm + + push %rbx + push %rbp + push %r12 + + and $~63, %rdx // length in blocks + lea (%rsi, %rdx, 1), %r12 // end pointer + + mov (%rdi), %eax // a + mov 4(%rdi), %ebx // b + mov 8(%rdi), %ecx // c + mov 12(%rdi), %edx // d + + cmp %rsi, %r12 // any data to process? + je .Lend + + .balign 16 +.Lloop: mov %eax, %r8d + mov %ebx, %r9d + mov %ecx, %r10d + mov %edx, %r11d + + allrounds rounds0, rounds1, rounds2, rounds3 + + add %r8d, %eax + add %r9d, %ebx + add %r10d, %ecx + add %r11d, %edx + + add $64, %rsi + cmp %rsi, %r12 + jne .Lloop + + mov %eax, (%rdi) + mov %ebx, 4(%rdi) + mov %ecx, 8(%rdi) + mov %edx, 12(%rdi) + +.Lend: pop %r12 + pop %rbp + pop %rbx + ret +END(_libmd_md5block_baseline) + + /* + * An implementation leveraging the ANDN instruction + * from BMI1 to shorten some dependency chains. + */ +ENTRY(_libmd_md5block_bmi1) + // special-cased round 1 + // f1 = d ? b : c = (d & b) + (~d & c) +.macro round1 a, b, c, d, k, m, s + andn \c, \d, %edi // ~d & c + add $\k, \a // a + k[i] + mov \d, %ebp + add ((\m)%16*4)(%rsi), \a // a + k[i] + m[g] + and \b, %ebp // d & b + add %edi, \a // a + k[i] + m[g] + (~d & c) + add %ebp, \a // a + k[i] + m[g] + (~d & c) + (d & b) + rol $\s, \a + add \b, \a +.endm + + // special-cased round 3 + // f3 = c ^ (b | ~d) = ~(c ^ ~b & d) = -1 - (c ^ ~b & d) +.macro round3 a, b, c, d, k, m, s + andn \d, \b, %ebp + add $\k - 1, \a // a + k[i] - 1 + add ((\m)%16*4)(%rsi), \a // a + k[i] + m[g] + xor \c, %ebp + sub %ebp, \a // a + k[i] + m[g] + f + rol $\s, \a + add \b, \a +.endm + + .purgem rounds1 +.macro rounds1 i, k0, k1, k2, k3 + round1 %eax, %ebx, %ecx, %edx, \k0, 5*\i+ 1, 5 + round1 %edx, %eax, %ebx, %ecx, \k1, 5*\i+ 6, 9 + round1 %ecx, %edx, %eax, %ebx, \k2, 5*\i+11, 14 + round1 %ebx, %ecx, %edx, %eax, \k3, 5*\i+16, 20 +.endm + + .purgem rounds3 +.macro rounds3 i, k0, k1, k2, k3 + round3 %eax, %ebx, %ecx, %edx, \k0, 7*\i+ 0, 6 + round3 %edx, %eax, %ebx, %ecx, \k1, 7*\i+ 7, 10 + round3 %ecx, %edx, %eax, %ebx, \k2, 7*\i+14, 15 + round3 %ebx, %ecx, %edx, %eax, \k3, 7*\i+21, 21 +.endm + + push %rbx + push %rbp + push %r12 + + and $~63, %rdx // length in blocks + lea (%rsi, %rdx, 1), %r12 // end pointer + + mov (%rdi), %eax // a + mov 4(%rdi), %ebx // b + mov 8(%rdi), %ecx // c + mov 12(%rdi), %edx // d + + cmp %rsi, %r12 // any data to process? + je 0f + + push %rdi + + .balign 16 +1: mov %eax, %r8d + mov %ebx, %r9d + mov %ecx, %r10d + mov %edx, %r11d + + allrounds rounds0, rounds1, rounds2, rounds3 + + add %r8d, %eax + add %r9d, %ebx + add %r10d, %ecx + add %r11d, %edx + + add $64, %rsi + cmp %rsi, %r12 + jne 1b + + pop %rdi + mov %eax, (%rdi) + mov %ebx, 4(%rdi) + mov %ecx, 8(%rdi) + mov %edx, 12(%rdi) + +0: pop %r12 + pop %rbp + pop %rbx + ret +END(_libmd_md5block_bmi1) + +#ifndef _KERNEL + /* + * An implementation leveraging AVX-512 for its VPTERNLOGD + * instruction. We're using only XMM registers here, + * avoiding costly thermal licensing. + */ +ENTRY(_libmd_md5block_avx512) +.macro vround a, b, c, d, f, i, m, mi, s + vmovdqa \b, %xmm4 + vpternlogd $\f, \d, \c, %xmm4 + vpaddd 4*(\i)(%rax){1to4}, \m, %xmm5 // m[g] + k[i] +.if \mi != 0 + vpshufd $0x55 * \mi, %xmm5, %xmm5 // broadcast to each dword +.endif + vpaddd %xmm5, \a, \a // a + k[i] + m[g] + vpaddd %xmm4, \a, \a // a + k[i] + m[g] + f + vprold $\s, \a, \a + vpaddd \b, \a, \a +.endm + +.macro vrounds f, i, m0, i0, m1, i1, m2, i2, m3, i3, s0, s1, s2, s3 + vround %xmm0, %xmm1, %xmm2, %xmm3, \f, \i+0, \m0, \i0, \s0 + vround %xmm3, %xmm0, %xmm1, %xmm2, \f, \i+1, \m1, \i1, \s1 + vround %xmm2, %xmm3, %xmm0, %xmm1, \f, \i+2, \m2, \i2, \s2 + vround %xmm1, %xmm2, %xmm3, %xmm0, \f, \i+3, \m3, \i3, \s3 +.endm + +/* + * d c b f0 f1 f2 f3 + * 0 0 0 0 0 0 1 + * 1 0 0 1 0 1 0 + * 0 1 0 0 1 1 0 + * 1 1 0 1 0 0 1 + * 0 0 1 0 0 1 1 + * 1 0 1 0 1 0 1 + * 0 1 1 1 1 0 0 + * 1 1 1 1 1 1 0 + */ + +.macro vrounds0 i, m + vrounds 0xca, \i, \m, 0, \m, 1, \m, 2, \m, 3, 7, 12, 17, 22 +.endm + +.macro vrounds1 i, m0, i0, m1, i1, m2, i2, m3, i3 + vrounds 0xe4, \i, \m0, \i0, \m1, \i1, \m2, \i2, \m3, \i3, 5, 9, 14, 20 +.endm + +.macro vrounds2 i, m0, i0, m1, i1, m2, i2, m3, i3 + vrounds 0x96, \i, \m0, \i0, \m1, \i1, \m2, \i2, \m3, \i3, 4, 11, 16, 23 +.endm + +.macro vrounds3 i, m0, i0, m1, i1, m2, i2, m3, i3 + vrounds 0x39, \i, \m0, \i0, \m1, \i1, \m2, \i2, \m3, \i3, 6, 10, 15, 21 +.endm + + and $~63, %rdx // length in blocks + add %rsi, %rdx // end pointer + + vmovd (%rdi), %xmm0 // a + vmovd 4(%rdi), %xmm1 // b + vmovd 8(%rdi), %xmm2 // c + vmovd 12(%rdi), %xmm3 // d + + lea keys(%rip), %rax + + cmp %rsi, %rdx // any data to process? + je 0f + + .balign 16 +1: vmovdqu 0*4(%rsi), %xmm8 // message words + vmovdqu 4*4(%rsi), %xmm9 + vmovdqu 8*4(%rsi), %xmm10 + vmovdqu 12*4(%rsi), %xmm11 + + vmovdqa %xmm0, %xmm12 // stash old state variables + vmovdqa %xmm1, %xmm13 + vmovdqa %xmm2, %xmm14 + vmovdqa %xmm3, %xmm15 + + vrounds0 0, %xmm8 + vrounds0 4, %xmm9 + vrounds0 8, %xmm10 + vrounds0 12, %xmm11 + + vrounds1 16, %xmm8, 1, %xmm9, 2, %xmm10, 3, %xmm8, 0 + vrounds1 20, %xmm9, 1, %xmm10, 2, %xmm11, 3, %xmm9, 0 + vrounds1 24, %xmm10, 1, %xmm11, 2, %xmm8, 3, %xmm10, 0 + vrounds1 28, %xmm11, 1, %xmm8, 2, %xmm9, 3, %xmm11, 0 + + vrounds2 32, %xmm9, 1, %xmm10, 0, %xmm10, 3, %xmm11, 2 + vrounds2 36, %xmm8, 1, %xmm9, 0, %xmm9, 3, %xmm10, 2 + vrounds2 40, %xmm11, 1, %xmm8, 0, %xmm8, 3, %xmm9, 2 + vrounds2 44 %xmm10, 1, %xmm11, 0, %xmm11, 3, %xmm8, 2 + + vrounds3 48, %xmm8, 0, %xmm9, 3, %xmm11, 2, %xmm9, 1 + vrounds3 52, %xmm11, 0, %xmm8, 3, %xmm10, 2, %xmm8, 1 + vrounds3 56, %xmm10, 0, %xmm11, 3, %xmm9, 2, %xmm11, 1 + vrounds3 60, %xmm9, 0, %xmm10, 3, %xmm8, 2, %xmm10, 1 + + vpaddd %xmm12, %xmm0, %xmm0 + vpaddd %xmm13, %xmm1, %xmm1 + vpaddd %xmm14, %xmm2, %xmm2 + vpaddd %xmm15, %xmm3, %xmm3 + + add $64, %rsi + cmp %rsi, %rdx + jne 1b + + vmovd %xmm0, (%rdi) + vmovd %xmm1, 4(%rdi) + vmovd %xmm2, 8(%rdi) + vmovd %xmm3, 12(%rdi) + +0: ret +END(_libmd_md5block_avx512) + + // round keys, for use in md5block_avx512 + .section .rodata + .balign 16 + +.macro putkeys i, a, b, c, d + .4byte \a, \b, \c, \d +.endm + +keys: allrounds putkeys, putkeys, putkeys, putkeys + .size keys, .-keys +#endif /* !defined(_KERNEL) */ + + .section .note.GNU-stack,"",%progbits diff --git a/lib/libmd/amd64/md5dispatch.c b/lib/libmd/amd64/md5dispatch.c new file mode 100644 index 000000000000..dd2131c5a57c --- /dev/null +++ b/lib/libmd/amd64/md5dispatch.c @@ -0,0 +1,41 @@ +/*- + * Copyright (c) 2024 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include +#include +#include +#include +#include + +extern void _libmd_md5block_baseline(MD5_CTX *, const void *, size_t); +extern void _libmd_md5block_bmi1(MD5_CTX *, const void *, size_t); +extern void _libmd_md5block_avx512(MD5_CTX *, const void *, size_t); + +DEFINE_UIFUNC(, void, _libmd_md5block, (MD5_CTX *, const void *, size_t)) +{ + if ((cpu_stdext_feature & (CPUID_STDEXT_AVX512F | CPUID_STDEXT_AVX512VL)) + == (CPUID_STDEXT_AVX512F | CPUID_STDEXT_AVX512VL)) { + u_int regs[4]; + char cpu_vendor[12]; + + do_cpuid(0, regs); + ((u_int *)&cpu_vendor)[0] = regs[1]; + ((u_int *)&cpu_vendor)[1] = regs[3]; + ((u_int *)&cpu_vendor)[2] = regs[2]; + + /* the AVX-512 kernel performs poorly on AMD */ + if (memcmp(cpu_vendor, AMD_VENDOR_ID, sizeof(cpu_vendor)) != 0) + return (_libmd_md5block_avx512); + } + + if (cpu_stdext_feature & CPUID_STDEXT_BMI1) + return (_libmd_md5block_bmi1); + else + return (_libmd_md5block_baseline); +} From nobody Sun Nov 23 09:44:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZY0b3Wz6GclM for ; Sun, 23 Nov 2025 09:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDkZX4lrrz3GGF for ; Sun, 23 Nov 2025 09:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9a2KhFfcoQbD9z5m/Q9gJ9DuEmAYH5bEZvX+JCuJwk=; b=n035KxOMErT7tLen5qC0nzgSsB62w9OCVc+lH2yvlouCqUnR5cN9U/ESgsRizlxWm62pAW 1PavwdCvAxe58qNW78pNfZimx2iH01QGXKyjBlksueMElShoy2TLT+18j13hEW09ovM2H/ VkcJtradeH6SqKp2hL59O0FnJNNYbbl/hVRB3woZP4gj4g8UF+a5t/rZZv1aTWzmkWhRRn IspEr3xbnXLWSmubltZjJ4Qi8VojRMmmJ1i7lG21YplmlS5UXxs4VEddNYr8Kdahn19t9k hN+ABQPXEZi66CMQossK4Eq3c7YVL0aXS3YM/h3Bzgc6fAT92wa4UJ61IVwHRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9a2KhFfcoQbD9z5m/Q9gJ9DuEmAYH5bEZvX+JCuJwk=; b=VQ1+BpSdPzKhJMgde5o1Uu4zs9Jv44JOgOZwnUzEWxRfm7DECod9qPGXTh7kOMxoSqY4Ca ri6IDT+6BGc46s9755fb2pLoamajgqpgg/Tuo3cWo/XIa/Y7EXY3abOJ+Y6zP4xlAKoCo8 pshaKqeqNv+e5Fy5FA5oyon2QjUTcVKA/RPQg8qVqN49UFFoIA+cKk+4MHcOzYcCiFIxo/ JQzTX5PXoON4HRjnQgbRiVpUT7huNIW5CDAcrEUlY0lOY6SMdDoJXSZNiZtrij1NeZRNER w+p17bAsmut8OfJTx+iGYiRZSN4JaY7C9TGCkR6Ks0VO0oUXVbzZxgRPPDYAhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763891092; a=rsa-sha256; cv=none; b=EzXeh23u1YDRl9kmBFOzEy5MPDPDalSU1pBjCl0FcYonAN90R5wxT+I/IEcsxm0ma2QWaZ 6vL8C1s+RIFAeKBEltYbvZrfkKNiig2GVPK5NVE7EWwNk3GsOtYff0+GJMIjLawRQijfnc Aumu6wBaSsRETNhJP3JZpeOVBDf+WKlnwRprCuMNZ42TLqpCF+TXnkPfKyv1iXAMZrWBr+ NaIBakbe1XE1meh/r2zL3mQtKBF7xY/KUoNJ2GZmFiSmr3dXcEvARTkH3vRZIwqwlKGabT OhyWjFeo0hm1Dzf9DmWKUzbS0+Kyq//6d3twDUZZFVvsxkDjnlzVufEzlqE4Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDkZX4Kj7z7jL for ; Sun, 23 Nov 2025 09:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34ccf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 09:44:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: f7874faf3c39 - stable/15 - lib/libmd: import aarch64 md5 SIMD implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f7874faf3c39ad0015a28e5877d2fac23beaeba5 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 09:44:52 +0000 Message-Id: <6922d794.34ccf.28a24a2c@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=f7874faf3c39ad0015a28e5877d2fac23beaeba5 commit f7874faf3c39ad0015a28e5877d2fac23beaeba5 Author: Robert Clausecker AuthorDate: 2025-10-10 17:45:45 +0000 Commit: Robert Clausecker CommitDate: 2025-11-23 01:12:35 +0000 lib/libmd: import aarch64 md5 SIMD implementation Reviewed by: andrew, imp Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D45670 MFC after: 1 month (cherry picked from commit c1135b2b54bf46709120d98c90ff4d28a77b896c) --- lib/libmd/aarch64/md5block.S | 206 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/lib/libmd/aarch64/md5block.S b/lib/libmd/aarch64/md5block.S new file mode 100644 index 000000000000..b928c8dd795a --- /dev/null +++ b/lib/libmd/aarch64/md5block.S @@ -0,0 +1,206 @@ +/*- + * Copyright (c) 2024 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +# optimal instruction sequence for k = \key + \m +.macro addkm key, m +.if 0x100000000 - \key > 0x00ffffff + movz k, #\key & 0xffff + movk k, #\key >> 16, lsl #16 + add k, k, \m +.elseif 0x100000000 - \key > 0x0000ffff + sub k, \m, #(0x100000000 - \key) & 0xfff000 + sub k, k, #(0x100000000 - \key) & 0xfff +.else + movz k, #0x100000000 - \key + sub k, \m, k +.endif +.endm + +.macro round a, b, c, d, f, key, m, s + \f f, \b, \c, \d + addkm \key, \m // k[i] + m[g] + add \a, \a, k // k[i] + m[g] + a + add \a, \a, f // k[i] + m[g] + a + f + ror \a, \a, #32-\s + add \a, \a, \b +.endm + + /* f = b ? c : d */ +.macro f0 f, b, c, d + eor \f, \c, \d + and \f, \f, \b + eor \f, \f, \d +.endm + + /* + * special cased round 1 function + * f1 = d ? b : c = (d & b) + (~d & c) + */ +.macro round1 a, b, c, d, key, m, s + bic tmp, \c, \d // ~d & c + addkm \key, \m // k[i] + m[g] + add \a, \a, k // k[i] + m[g] + a + and f, \b, \d // d & b + add \a, \a, tmp // k[i] + m[g] + a + (~d & c) + add \a, \a, f // k[i] + m[g] + a + (~d & c) + (d & b) + ror \a, \a, #32-\s + add \a, \a, \b +.endm + + /* f = b ^ c ^ d */ +.macro f2 f, b, c, d + eor \f, \c, \d + eor \f, \f, \b +.endm + + /* f = c ^ (b | ~d) */ +.macro f3 f, b, c, d + orn \f, \b, \d + eor \f, \f, \c +.endm + + /* do 4 rounds */ +.macro rounds f, m0, m1, m2, m3, s0, s1, s2, s3, k0, k1, k2, k3 + round a, b, c, d, \f, \k0, \m0, \s0 + round d, a, b, c, \f, \k1, \m1, \s1 + round c, d, a, b, \f, \k2, \m2, \s2 + round b, c, d, a, \f, \k3, \m3, \s3 +.endm + + /* do 4 rounds with f0, f1, f2, f3 */ +.macro rounds0 m0, m1, m2, m3, k0, k1, k2, k3 + rounds f0, \m0, \m1, \m2, \m3, 7, 12, 17, 22, \k0, \k1, \k2, \k3 +.endm + +.macro rounds1 m0, m1, m2, m3, k0, k1, k2, k3 + round1 a, b, c, d, \k0, \m0, 5 + round1 d, a, b, c, \k1, \m1, 9 + round1 c, d, a, b, \k2, \m2, 14 + round1 b, c, d, a, \k3, \m3, 20 +.endm + +.macro rounds2 m0, m1, m2, m3, k0, k1, k2, k3 + rounds f2, \m0, \m1, \m2, \m3, 4, 11, 16, 23, \k0, \k1, \k2, \k3 +.endm + +.macro rounds3 m0, m1, m2, m3, k0, k1, k2, k3 + rounds f3, \m0, \m1, \m2, \m3, 6, 10, 15, 21, \k0, \k1, \k2, \k3 +.endm + + /* md5block(MD5_CTX, buf, len) */ +ENTRY(_libmd_md5block) +ctx .req x0 +buf .req x1 +len .req x2 +end .req x2 // aliases len +a .req w3 +b .req w4 +c .req w5 +d .req w6 +f .req w7 +tmp .req w8 +k .req w9 +m0 .req w10 +m1 .req w11 +m2 .req w12 +m3 .req w13 +m4 .req w14 +m5 .req w15 +m6 .req w16 +m7 .req w17 + // x18 is the platform register +m8 .req w19 +m9 .req w20 +m10 .req w21 +m11 .req w22 +m12 .req w23 +m13 .req w24 +m14 .req w25 +m15 .req w26 + +a_ .req m0 +b_ .req m7 +c_ .req m14 +d_ .req m5 + + stp x19, x20, [sp, #-0x40]! + stp x21, x22, [sp, #0x10] + stp x23, x24, [sp, #0x20] + stp x25, x26, [sp, #0x30] + + bics len, len, #63 // length in blocks + add end, buf, len // end pointer + + beq .Lend // was len == 0 after BICS? + + ldp a, b, [ctx, #0] + ldp c, d, [ctx, #8] + + /* first eight rounds interleaved with data loads */ +.Lloop: ldp m0, m1, [buf, #0] + round a, b, c, d, f0, 0xd76aa478, m0, 7 + ldp m2, m3, [buf, #8] + round d, a, b, c, f0, 0xe8c7b756, m1, 12 + ldp m4, m5, [buf, #16] + round c, d, a, b, f0, 0x242070db, m2, 17 + ldp m6, m7, [buf, #24] + round b, c, d, a, f0, 0xc1bdceee, m3, 22 + + ldp m8, m9, [buf, #32] + round a, b, c, d, f0, 0xf57c0faf, m4, 7 + ldp m10, m11, [buf, #40] + round d, a, b, c, f0, 0x4787c62a, m5, 12 + ldp m12, m13, [buf, #48] + round c, d, a, b, f0, 0xa8304613, m6, 17 + ldp m14, m15, [buf, #56] + round b, c, d, a, f0, 0xfd469501, m7, 22 + + /* remaining rounds use the roundsX macros */ + rounds0 m8, m9, m10, m11, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be + rounds0 m12, m13, m14, m15, 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821 + + rounds1 m1, m6, m11, m0, 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa + rounds1 m5, m10, m15, m4, 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8 + rounds1 m9, m14, m3, m8, 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed + rounds1 m13, m2, m7, m12, 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a + + rounds2 m5, m8, m11, m14, 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c + rounds2 m1, m4, m7, m10, 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70 + rounds2 m13, m0, m3, m6, 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05 + rounds2 m9, m12, m15, m2, 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665 + + rounds3 m0, m7, m14, m5, 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039 + rounds3 m12, m3, m10, m1, 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1 + rounds3 m8, m15, m6, m13, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1 + rounds3 m4, m11, m2, m9, 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391 + + ldp a_, b_, [ctx, #0] + ldp c_, d_, [ctx, #8] + add a, a, a_ + add b, b, b_ + add c, c, c_ + add d, d, d_ + stp a, b, [ctx, #0] + stp c, d, [ctx, #8] + + add buf, buf, #64 + cmp buf, end + bne .Lloop + +.Lend: ldp x25, x26, [sp, #0x30] + ldp x23, x24, [sp, #0x20] + ldp x21, x22, [sp, #0x10] + ldp x19, x20, [sp], #0x40 + + ret +END(_libmd_md5block) + +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) + + .section .note.GNU-stack,"",%progbits From nobody Sun Nov 23 13:26:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDqTr1kCHz6GyJG for ; Sun, 23 Nov 2025 13:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDqTr0y2sz3gy0 for ; Sun, 23 Nov 2025 13:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763904368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iS2Qhrytg4OrZNz4NUBvrav+LlxTtTpfekDHOt14EY0=; b=VdlHIEEIJ/MH4PMgHA2L41W5ew5uH+v3q1Wo2b4sReduUhZvlVjIOl58Cfdkt6Roxaschj v11z8jP4W4qbmy2nm4DEI/K/sMfolcM8+dx/aJRIIOpvkNa0IUv7XO/UtZ5Ql5f/wCzoup kEmtgMuekVFizIgMa7eGWOHCMj7yrw7RJK/9BkOjA3rwVlQ1oTzk12SEEENrb89bandrk7 kDFzEUuh2DTTwB5lsh23c8awNfAci1unRjLXDfjuNbQAVSWiW6/imugA3YQkRuCukmUwZp DbISFvQpc1hEd0IBj5l4RKS8bAjxT7YCQWfjO9J1utvvf4ljxEgNWuiF/Uplrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763904368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iS2Qhrytg4OrZNz4NUBvrav+LlxTtTpfekDHOt14EY0=; b=fqx60wYK7In1DbFOVIINKWvQf3o2Atf8C+fuP2JGp6lAH/PVYqCuROnJ08h+pVC48/QL4+ CH0RUNzwN2QWyOMGEmsOozWeh51v8mqKDnA1i/BBGbklvWa34IdL2+0yMhWwjIQ8lXSV47 gp8TR/K8vTDyd9Ng6cEBc1TdPtSTv1q/W+q4PMAszZciEw7qeBdZWj61Wmry1tLC5QVxEn vKpqhJ2R2ST4G0+kh5cnLTu1P4rSjV4YccCXf7/QoB4txZ0lDfCmyeuEQ56GMogYxAxctD MFp0NPRQjY+2af25NSNuWsQWfCSnlWwOR9W40C3GlwBTG30wiOvzXgkUBjcZiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763904368; a=rsa-sha256; cv=none; b=wjKChCPKF7LwudAhVGr5I4IujLQN7ni5TGS0zkhMlV3EfYe/IFe7E8ANH+vtvHUSpwPr6t U+63hKlO77MFWcsHxbzK01P0SGo4IMzlId4xAyI1/yWDBKtweFuJc0axpc567TUNm3iCah /fm4lSMLrHl55tx2k++QCjfJ1iLZTomK8ft5+AUzqpZI9hMKG+J+9jc4GbS+4q1KYP1rvr JjFWcDCMdEkYchZFDV70aP4649XAMBCl0fQCUccEA74F/pBBsPP8pj7FmO0SN526A0fss/ M2ha9HoNCFyrdopEdpki0dyLQsy3DYZDIHyr/PTW04p69Lo4zTJm7TVnqZcJAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDqTr08HJzVWx for ; Sun, 23 Nov 2025 13:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24c46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 13:26:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: d5335bdee715 - stable/15 - nfs_clvfsops.c: Allow long directory mount paths List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d5335bdee7157af3897d0a49834c3493e0d03681 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 13:26:07 +0000 Message-Id: <69230b6f.24c46.3f158e2c@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=d5335bdee7157af3897d0a49834c3493e0d03681 commit d5335bdee7157af3897d0a49834c3493e0d03681 Author: Rick Macklem AuthorDate: 2025-10-29 21:41:12 +0000 Commit: Rick Macklem CommitDate: 2025-11-23 13:24:13 +0000 nfs_clvfsops.c: Allow long directory mount paths Without this patch, the NFS client code for mounts has an arbitrary 100 character limit for the directory path being mounted on the server. Someone reported this quite a while ago, but I cannot find the email or bugzilla PR. This patch fixes the problem by increasing the directory path length limit to MNAMELEN, allocated via malloc() to avoid using too much stack. (cherry picked from commit 8d5a88ac95b23b0a8c4943be0aef1f93e3902bfb) --- sys/fs/nfsclient/nfs_clvfsops.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 5ea7eab07632..212c88f28930 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -927,7 +927,7 @@ nfs_mount(struct mount *mp) struct vnode *vp; struct thread *td; char *hst; - u_char nfh[NFSX_FHMAX], krbname[100], dirpath[100], srvkrbname[100]; + u_char nfh[NFSX_FHMAX], krbname[100], *dirpath, srvkrbname[100]; char *cp, *opt, *name, *secname, *tlscertname; int nametimeo = NFS_DEFAULT_NAMETIMEO; int negnametimeo = NFS_DEFAULT_NEGNAMETIMEO; @@ -943,6 +943,7 @@ nfs_mount(struct mount *mp) newflag = 0; tlscertname = NULL; hst = malloc(MNAMELEN, M_TEMP, M_WAITOK); + dirpath = malloc(MNAMELEN, M_TEMP, M_WAITOK); if (vfs_filteropt(mp->mnt_optnew, nfs_opts)) { error = EINVAL; goto out; @@ -1329,7 +1330,7 @@ nfs_mount(struct mount *mp) goto out; } else if (nfs_mount_parse_from(mp->mnt_optnew, &args.hostname, (struct sockaddr_in **)&nam, dirpath, - sizeof(dirpath), &dirlen) == 0) { + MNAMELEN, &dirlen) == 0) { has_nfs_from_opt = 1; bcopy(args.hostname, hst, MNAMELEN); hst[MNAMELEN - 1] = '\0'; @@ -1387,7 +1388,7 @@ nfs_mount(struct mount *mp) if (has_nfs_from_opt == 0) { if (vfs_getopt(mp->mnt_optnew, "dirpath", (void **)&name, NULL) == 0) - strlcpy(dirpath, name, sizeof (dirpath)); + strlcpy(dirpath, name, MNAMELEN); else dirpath[0] = '\0'; dirlen = strlen(dirpath); @@ -1472,6 +1473,7 @@ out: MNT_IUNLOCK(mp); } free(hst, M_TEMP); + free(dirpath, M_TEMP); return (error); } From nobody Sun Nov 23 16:39:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmT3NS8z6HGfs for ; Sun, 23 Nov 2025 16:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmT10KPz45Pk for ; Sun, 23 Nov 2025 16:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yYp1OpcQqXavYyHPxXKknNSKpGgUS5qhDrfZGyTxsZM=; b=at34YP7xLWWYidca6LfOiPF339LljMI/niunnzJ5ecdPPXnwVYdbHl1JhlvtlcHT/yNs2v djmdY/u5/4Xglro5/IlvDLr8iChSWVADNN8xM5PBAz4dQZmRm+qPA3RSPeChTCUNzX798g KqsrhQmmgbcyz3AxbFxtGrbZZG0AJcEh1zTZ7IRsLFcxNXKfIcQ1x0hhWFjkrfwVJ/bNj5 LowB4kbwEp0YZTEDqibPv/qoytrTFUwtXWhCWutSb3E/90KuUqarBdMC6+44C4/i2L64kU w6V6zzsUWKQLm5MRhxvmdNYrwHZ5moY1DW7vK8bsolgM2jRqfnGh85guQg52pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yYp1OpcQqXavYyHPxXKknNSKpGgUS5qhDrfZGyTxsZM=; b=EkFNrBaiY5ZehWj7lyUO52qsIwmXnP6Qn8A2hl7h5bpawi6+FcQButdlMZEGIKpcR8wQsO juIMZiHjD7xS5hyNl03OVAxaRXJfDSlqImTatPIGoACXMSjKcuT+gJUi+Ay7Fge45/RShn 3XReJUy68ueg5St/I/Ntjq3mIQXSwx0yaLfAp1Xd4mxqGMNWhZ9CYzquqK6PZRT423Eajo Kz52WJj2eUu7rcPlNVuANtJzvRVEItX6Cu9Jogb+cebM1rXwQ+Ln/8YfxfyCY+rtOvulH1 PUfn7VW6cpKyMIOVNAV8f/IhWdbpxSC9umTEvxjUO9wgWMCVBcKjuisOpxTxfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915945; a=rsa-sha256; cv=none; b=oE3UUinfAYCWETllzBIuuRu9UjP309zdyI5DcnJCUcjG2tFFy1A2O9lR+opHzC37xMfVWN vb1CeRWGsuq7wptqEuZdUuiTi0mg5vcpvZFgUs9Uyv2w+fUdFrpv+NkQSxoQkeovmHh9b0 Z7n+unEADV6ufEXsLsPRK/kKTZyIH/59JcSLENoHWpk8+1RhaLnFP68oICsXJorf3Er2dv 4Sy7pbJMwmJlnRIhXS5mp8F9+X5xtxVn772EkT+EqV40CW7K7xa3lRtEApwplYbDukIYbA Z0zRFK/G6OU7ozoLBggaT6SyO0M+z60CoJVFIAz20uKU66z0WhKZjHTb58tocQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmS6vsYzcpr for ; Sun, 23 Nov 2025 16:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: a14c4d0708f5 - releng/15.0 - dmesg.8: Index kern.msgbuf_show_timestamp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: a14c4d0708f5a749dc9342a2efbac28fd419c0e2 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:04 +0000 Message-Id: <692338a8.379b6.5747f123@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a14c4d0708f5a749dc9342a2efbac28fd419c0e2 commit a14c4d0708f5a749dc9342a2efbac28fd419c0e2 Author: Alexander Ziaee AuthorDate: 2025-11-21 15:59:28 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:28 +0000 dmesg.8: Index kern.msgbuf_show_timestamp This is the only place this important debugging tunable is documented. Mark it up with the Va macro according to style.mdoc(5) so that people can find it via `apropos Va=kern.msg`, the standard syntax to search the FreeBSD manual for sysctls and tunables. Approved by: re (cperciva) Fixes: 6910fee62e77 (dmesg: Document kern.msgbuf_show_timestamp) (cherry picked from commit e13664f6a44b4970ea5e8378b8e1a4879fa5d5a0) (cherry picked from commit 1c0668c5b33d32724c6596b42bc08d22c63c0ee0) --- sbin/dmesg/dmesg.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index 0dca0ff5da89..f9b9fce82ffc 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -73,7 +73,7 @@ The following variables control how the kernel timestamps entries in the message buffer: The default value is shown next to each variable. .Bl -tag -width indent -.It kern.msgbuf_show_timestamp : No 0 +.It Va kern.msgbuf_show_timestamp : No 0 If set to 0, no timestamps are added. If set to 1, then a 1-second granularity timestamp will be added to most lines in the message buffer. From nobody Sun Nov 23 16:39:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmV1bQHz6HGbK for ; Sun, 23 Nov 2025 16:39:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmT75Tzz45XD for ; Sun, 23 Nov 2025 16:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u0ERWxUTVIuhtxdyIH+gQ/LmjAGOEHNGTaRjipGfdIo=; b=Ws1+HD4Xg6NM0mdyH8pFJ9+Vof7zyk1CagZ07DxzIIMvHNeRhrkG7k/vZ3pkdpe8WzpTrU /wwgs6x7CNq3J3V/7CY/VBR9GRcqiKkQCi6OZlyydFEzUTVI/TJGzchBFyvvBxvU9sVULy 5gD1AkRClH7KflXTToTIFFsQ4M7xbOYjs5aPBBimdzM8cGPlihJlGaCw1QEL4ZW87y1v/B P8r0kDa8RB0L+o98P4uVJmekw4+KCuMTtR+9RgAwWQftCH1DA4pn4ZzAWnSlf/YyeHrHU9 6fJ7yzvKHfMYS1AAnh7oY8W44TBYWtkIwx6dby/ft3Mw+DBnQzTIUy+NC/hapg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u0ERWxUTVIuhtxdyIH+gQ/LmjAGOEHNGTaRjipGfdIo=; b=hYiNHpLCMqQGL3S5UVp2W59GgF94YtDxtAG9fVfrihWUps2GpA6UF/ANe+neeA9dmJgFIs e3Bc0pZmxc4u3MLP6PHRau4PNVbRBqZ5OJ/Wh7EVVQ9l0yti19iRqsRRVBXTWF16I+sI98 JYqumFZD2lvC5aynV3SN0hijJTNRpaZOfRGJ3uEGX1WxihfefH5b3lf7/P0BBBgfhD+cWW 7XkRvAfGo2VpwdaFpT+A/kqY/Wzwj71+6/xzUDJA5YEcww6B+2u1on8c1dJY09ZI6+r4MX ZGiZ2/12Y31J0tCqfRMuv/KzlfCMtJcY8ByiSE9Jhs75rliOjHuF8Jdw2mQSQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915946; a=rsa-sha256; cv=none; b=pG5stgxN8Atix+TAWuKKESKcl50l9YTtEBcCOgn5Dxy6LkjI5GI0I3TKd5e3upjtpjlxeR Zm+GdqZXvwdzl9x5zCWs5vTboFF422MFfskVvtqGIyJweqr+RUpaNi3VWhvImDzkClmqlj /HFNurypl1RJO2q6UxAwlRmb1hQ+laIM1yEiVqFJ5rQMAYsWotbnPDdAYWQ/sS9ZKR5UBl eTZE99PoxbfFUrC/QhGoCfsY6MhKozAzcH89lqDjWzAh6mxyiSTuMvNNsTpRUU2RUBG4Ja 9+PBUdD86zwYdhHhIekrUHXxlf0pJf6UxdIenwwVLXdZ6hsX+FWKps7bswDnJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmT6cxFzcXQ for ; Sun, 23 Nov 2025 16:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3709c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: 56f49dd3a046 - releng/15.0 - vt.4: Document increasing scrollback size List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 56f49dd3a0465767a54ecee91ba0deb4c7557656 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:05 +0000 Message-Id: <692338a9.3709c.b2b7cf8@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=56f49dd3a0465767a54ecee91ba0deb4c7557656 commit 56f49dd3a0465767a54ecee91ba0deb4c7557656 Author: Alexander Ziaee AuthorDate: 2025-11-21 17:40:56 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:34 +0000 vt.4: Document increasing scrollback size Approved by: re (cperciva) MFC: immediately as 2 llms say this is impossible Reviewed by: adrian, emaste Differential Revision: https://reviews.freebsd.org/D53860 (cherry picked from commit a8740ba860bfc35879f886b80b30327d0d3b16bd) (cherry picked from commit 2da71ee296add6c39e26e8b103dd24a12e8ce320) --- share/man/man4/vt.4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 21d69bf9d495..6176c8c3093e 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 7, 2024 +.Dd November 21, 2025 .Dt VT 4 .Os .Sh NAME @@ -352,6 +352,12 @@ Notification that the console bell has rung. .It Li hz Ta Tone that was requested in Hz. .El .Sh EXAMPLES +To increase the scrollback buffer size to 22500 lines, +add the following line to +.Pa /etc/rc.conf : +.Pp +.Dl allscreens_flags="-h 22500" +.Pp This example changes the default color of normal text to green on a black background, or black on a green background when reversed. Note that white space cannot be used inside the attribute string @@ -414,6 +420,7 @@ at boot: .Xr getty 8 , .Xr kldload 8 , .Xr moused 8 , +.Xr vidcontrol 8 , .Xr vtfontcvt 8 .Sh HISTORY The From nobody Sun Nov 23 16:39:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmW362tz6HGbM for ; Sun, 23 Nov 2025 16:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmW0k52z45RH for ; Sun, 23 Nov 2025 16:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eg2dv1gqt1J90zQ31QeK3UlVYeJ+a8i6XtagWp0NPoM=; b=ZQp4SbHFiTlYdgrR0/crcQpwvesgKYKBEv5yv5o3M+l0HQLQNoRaLTZuoo5SarPztsYzCA +HUCMiZ6f6d+JLyQrEPryW8kohOi1w2GLYzoSFHKejjUQp9nbwgSREOdweaZMEv+kMgQZb F/j7dOXQhkRlkgei9y1DJKE/8osZn/fOj3CNX1qCbG8uh5Rw6PyUZgV9/cSAyMw0xdeF1f CYq412NyxCL2kr7q1TyODm42NrDvdTpDqCwA7vTirNHmFgEG2cxqV6OcpnWSYHbKONChEo DvUZEpE+JNCnDvpbo79Tg/v6lnaMGKJFeInI1DYUZeuyUK1Y0ywrGe36pgDplg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eg2dv1gqt1J90zQ31QeK3UlVYeJ+a8i6XtagWp0NPoM=; b=cZnQb4LLouiK9LJQ+7PwithomFJvU+MSrzsCb+9kysuGzNXmRT/9Nr7qsg9LmDo5AvJV7W jGBKb3S/6t3zXxCtV9/9EcN8CifIGTSPqZ/jxsOYGHFgN//b16909Wb6Ih6F9+DjI7jJiB n2HInpfEReZYgpPh2BCwfd/fAKO5inke5fI0zQ/RJVkG30SaOfyvw3B1NMebeW7Ui0kKDd 7CpNVAVD2QFCXwNGYyB4/o5+AtBhM6kGrbJSddwAheARGV3erfZd2+zbglV5viFJWgHUIn L2DPY6kpWVR9Jbp2zbWqmYxkWRLT8Ur4AUtqrdoPNhnjMAi8/ixZQMcJplcQ3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915947; a=rsa-sha256; cv=none; b=AbbxsYMaxMjPNs/n0QNQjJYiRJlNRK6KQFou0VipFtr50DnvS4W8szkfsACLW+O58OITHS G5Zl1BdKWyebdaF8wdPPtdy3odzN8qiR22LU0LLP7sFz6Ebm/oaGTxXRLwkql02+Rp/ZMi n71FPkhKJWJCQlnJP+08Bs9HAp9+zT7IHaAw571hPF4vbTBKduLrLunGIV1ju4fKLcqjB5 ovkH52HuU2XGXPaBi+JPAuYkRCt4zLXIZn0PiYsovYXgBWvQCGWSE3t+9ueGsz+BV21NQR gj9upMAKh4FtC+fZ92dR3uNy2mVFTdIm+RBZG4rt4dRJAoptM/xiLBNFmCQf6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmW0G7Nzd1B for ; Sun, 23 Nov 2025 16:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 375e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: f7fd040e3ba9 - releng/15.0 - freebsd-tips: Add a shell function for laptops List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f7fd040e3ba995a84b6fb63b97dc7dd6606602b9 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:07 +0000 Message-Id: <692338ab.375e9.25a151fd@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f7fd040e3ba995a84b6fb63b97dc7dd6606602b9 commit f7fd040e3ba995a84b6fb63b97dc7dd6606602b9 Author: Alexander Ziaee AuthorDate: 2025-11-14 14:40:44 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:38 +0000 freebsd-tips: Add a shell function for laptops Approved by: re (cperciva) MFC after: 3 days Reviewed by: pauamma_gundo.com Differential Revision: https://reviews.freebsd.org/D53748 (cherry picked from commit 42d9ae4945f281d12f3ef96cdbd7356e067f8b18) (cherry picked from commit f0bb9d28eb3cb29b6e8f2ecd7de4e743dfbebc98) --- usr.bin/fortune/datfiles/freebsd-tips | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips index 6a2b59ff5fa7..379f772fea88 100644 --- a/usr.bin/fortune/datfiles/freebsd-tips +++ b/usr.bin/fortune/datfiles/freebsd-tips @@ -860,3 +860,11 @@ When netstat reports every 8 seconds, it tells traffic in bits per second: $ netstat -I bge0 8 % +Using vt(4) on a laptop? Try this sh(1) function. It provides an "h" +command that prints the last 22 commands executed, the time, remaining +battery life, and current working directory: + +h() { fc -l -22; printf "%s\n" "`date +%H:%M` -- `apm -l`% -- `pwd`"; } + + -- Alexander Ziaee +% From nobody Sun Nov 23 16:39:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmX6XMpz6HGMF for ; Sun, 23 Nov 2025 16:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmX1mXdz45Tt for ; Sun, 23 Nov 2025 16:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lc+F8ml+JfOMnNrp2g5mvTo1BVNu64srzcMj2F/ZaLs=; b=MIMLPBLZzDaemWGQNRuy1Y/2nCWSGLjS9Cim1Vi1HYwmL59dLtl9nQeSKUW9kckvptf+NR fjxGpaIexQazWopRfyPSD9am/DvcBHndEDOWley0aUC/jIR6KkL9zNRnxxfuIWof3M0luq OD8JRuOtVfZyRtstlnOeMNPRwKrROII1qaXo5m4NL8wK38Lxd+/V/0ugUx4zzXzWfxN3eL YwWHX0Vlzs3k+hxzLHyhfAQ6qwUoVEysLKcsr2rGpV6G4iJtMn4ylyLNobxRDuhi69Hc3D wbGw4qvsfXT7NEuLBIIk/qku+OLD6cUduKtJbde2Xs+sEg3AEdBVTXT0fnDYnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lc+F8ml+JfOMnNrp2g5mvTo1BVNu64srzcMj2F/ZaLs=; b=IGW9lmIAqR+3LJWsVfDLkSex5CN6AwqUcyX++6Gr3rWWyQdniz94yc0OtgUa8jpv98MaPG qAQYGIII0vw76M6cBdFkAeISAH6fVjCYzCOgqtgLLmxE89axQAjNa1ZuG6YMH7fW5Nrj55 yQM34fMQKNw55tOKLUTggAKejXARdMg+RGypjr3EBS5OLVI2cpJFTi5xUN1odJmQ5/ewyu 2rkEYdBUuqy+X3tQBKnWQfkEnla7C2+hdWYxWmJpz5Gx1k1KQ7BKw8tDn/00BOrsCci9uo DQXndcstk+MxS9T2dLYUMa6tMZCAby7UebiuiK/OEHoVphiNYfWt97NyS7yyww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915948; a=rsa-sha256; cv=none; b=S4mJ3QRfjjjfjak2lQNibLA0P9665IIaaiF4Yqju7CZHv0YVy0Ouzi9siYHeovdSAVKhv6 xc9Zvzrt7Jv+Anjb6KpQK+JKLM9Vg9mZIQfyJR+wDylrGf7BUmonVI2ZHT+jsKcliHRZUp SdDNBcxhT67MZXUPHRPTRonhJ6ecd9uy5hW5IbyhbX3OonfmhIUGPps/+0RfjKxseJnIC9 w87Gq38/29SA9+79djcj3gioVOMKridmaTQ/nnbf+2s15CE7JkxbdoxAO8ETBUADyOBRun 8OuStbvSrZ1SY1QX5qBAAUr6nSMqyqms5peav5Q745DUc0aW0/48KdccmI53yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmX0c5HzcvV for ; Sun, 23 Nov 2025 16:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36247 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: bba78121411a - releng/15.0 - loader manuals: Clarify console and boot_serial List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: bba78121411a6ffe04e30960f8e8072a60d788cf Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:08 +0000 Message-Id: <692338ac.36247.10ed00c2@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bba78121411a6ffe04e30960f8e8072a60d788cf commit bba78121411a6ffe04e30960f8e8072a60d788cf Author: Alexander Ziaee AuthorDate: 2025-11-14 14:41:57 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:41 +0000 loader manuals: Clarify console and boot_serial console=comconsole is for the loader and boot_serial is for the kernel. I think we should centralize documentation on the loader settings in one manual, such a loader.8. The current proliferation is not obvious where to find the documentation. To the user, these are all set in loader.conf or at the loader prompt. Approved by: re (cperciva) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53695 (cherry picked from commit 09ffaa4e07d749c83cc1db13829505f21b025f29) (cherry picked from commit 3035855815c2fdbe27b65b9ec0374f4583ceb3f5) --- stand/defaults/loader.conf.5 | 3 +++ stand/man/loader_simp.8 | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index b1661e8c1101..8c43bb62a135 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -343,6 +343,9 @@ selects the video console which prevents any input and hides all output replacing it with .Dq spinning character (useful for embedded products and such). +This setting is for the +.Xr loader 8 +only and does not set the kernel output. .It Va screen.font Set font size for framebuffer mode. The default font size is selected based on screen resolution. diff --git a/stand/man/loader_simp.8 b/stand/man/loader_simp.8 index 683ca8b2da5d..52cb598fdd89 100644 --- a/stand/man/loader_simp.8 +++ b/stand/man/loader_simp.8 @@ -358,8 +358,8 @@ in .Xr kenv 1 , not for any particular value. .It Va boot_serial -Force the use of a serial console even when an internal console -is present. +Force the use of a serial console for the kernel +even when an internal console is present. .It Va boot_single Prevents the kernel from initiating a multi-user startup; instead, a single-user mode will be entered when the kernel has finished From nobody Sun Nov 23 16:39:09 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmZ115Sz6HGGB for ; Sun, 23 Nov 2025 16:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmY1dvGz45Rh for ; Sun, 23 Nov 2025 16:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkRbuS7VkTQL6Cut7HZSbAE/FkLKTcOUUsr8Enew5nU=; b=qnkd8p42GAPfuRiwCeEuaCJNJv7Rm73ysIdApLv+NxRDCf3L6z1mwd0NBj83h5vKCkyWpb QuPuydmS9xZKtVm0g8Znv79mXcWxdtD9pdfe+kjiZCvkm5eFSY5Ya3mH5ggq/9yVQru5vl GZR9FGE2aCRhbszq14BMw9xk8wZPOj03mr2M5VUK9u99PjZxFF++J4jsyNisE2wIShVujC i/XXl9NKTKYXWRcTaCenf0wDKEaugVvpFB150yWc48M9WVSskuXKUqvPvmhY+rNnuYmAnw kkBW60OEK4huC7f+2YRnRfaq+/VrXCh6sixcmM2pHcIOsiUuJOSeNCgPuz0HXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkRbuS7VkTQL6Cut7HZSbAE/FkLKTcOUUsr8Enew5nU=; b=F65vk4DpkFkKd+gDwp+79J47wm8N8oQhjOUaEhdG63Fdw80lbF/bUpPHnL8Ex55AbhaxQK 9xez0n0iRpTtLS/LzfO5LKt3n4/2PjWlC1OtlzxQe4vA3yIvBnDfnczKmkvEd4oqsQWmjn Y9YbRTpT6wfojAu7vy2nawg2S/c0kuMOOAN3W6yESkhG7KlNDszSiktFUpTQuRIDXzLPep YTEMdMJNVT1BWSHmraCYYVQFAxGgBVy2rbMArwph2hMDUBEk+BMvFTgZE83UpzUTMlHNf4 dMbRSI2QBRLZ9AJWnvun2o/rkJo+OlnAO2+13Ll8bUqPSp+t5txenyjneiiBEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915949; a=rsa-sha256; cv=none; b=D/pgKNKIzXiGPHq6F1PORHYESSoTvVEabUFAkZucMLuMJQTEu6OGm0YIj46tpSneev63p/ YB84/8u1BEEGSVx7XxQlaT3FNzYwY2fkoxc5tj38gqG37w2NZ6+pDTMipEbwWETKRh3wPA +1MrmCvU5qxQV9gk4W8LisLs7JF+8LlGzNev6cnWO6gcceW/Kso1ZDFYPYNv1RkDFgijB6 BefGO/4Q/HtuuvKNuXvdKg8UfRoThoeMFNdgmN3em31bf7H+vs7Q9iAufCUQzFOB+o3B4w h0JjJna715t0kCoW1JKifo4ZAdquWcMGcFtDxiR6YhJgW2K6bXYAWlk3oR9r6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmY1685zcHT for ; Sun, 23 Nov 2025 16:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37387 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: d84de55c1501 - releng/15.0 - loader.8: Document module commands List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: d84de55c15016640a03d0ff43898addd5b9323d8 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:09 +0000 Message-Id: <692338ad.37387.6f1e8414@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d84de55c15016640a03d0ff43898addd5b9323d8 commit d84de55c15016640a03d0ff43898addd5b9323d8 Author: Alexander Ziaee AuthorDate: 2025-11-14 14:59:09 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:45 +0000 loader.8: Document module commands Begin documenting module loader commands in loader(8), where the reader would look for them. Segregate them by their availability in individual loader implementations, like build(7) targets. These details were graciously donated by kevans. Approved by: re (cperciva) MFC after: 3 days Reviewed by: kevans Co-authored-by: Kyle Evans Differential Revision: https://reviews.freebsd.org/D50727 (cherry picked from commit 6fb0d67819f730e8def56e139f780eff3c0cab0f) (cherry picked from commit 513b9db1a829b4efba91c86f280ba97b26c82c1f) --- stand/man/loader.8 | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/stand/man/loader.8 b/stand/man/loader.8 index 234eabd571e0..484e0a7b300c 100644 --- a/stand/man/loader.8 +++ b/stand/man/loader.8 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 29, 2021 +.Dd November 14, 2025 .Dt LOADER 8 .Os .Sh NAME @@ -89,6 +89,52 @@ The commands common to all interpreters are described in the .Xr loader_simp 8 .Dq BUILTIN COMMANDS section. +.Pp +The following commands are only available in +.Xr loader_lua 8 +and +.Xr loader_4th 8 : +.Pp +.Bl -tag -width indent -compact +.\" sort the following entries according to the second field +.It Ic boot-conf +Load the +.Nm +config and commence the autoboot sequence. +.Pp +.It Ic read-conf Ar file +Load the specified configuration file. +.Pp +.It Ic reload-conf +Revert any previously applied settings, and reload the configuration. +Set comands that were executed at the command line to override variables +previously +.Cm set +by +.Xr loader.conf 5 +configuration will also be reverted, +along with any module options that were toggled. +.Pp +.It Ic enable-module Ar kmod-name +.It Ic disable-module Ar kmod-name +.It Ic toggle-module Ar kmod-name +Enable, disable, or toggle loading of the kernel module named +.Dq Ar kmod-name . +.Pp +.It Ic show-module-options +Describe all modules the +.Nm +is aware of, and show if they are enabled or not. +.El +.Pp +The following command is only available in +.Xr loader_lua 8 : +.Pp +.Bl -tag -width indent -compact +.It Ic disable-device Ar device +Set a newbus hint to disable the +.Ar device . +.El .Ss BUILTIN ENVIRONMENT VARIABLES The environment variables common to all interpreters are described in the .Xr loader_simp 8 From nobody Sun Nov 23 16:39:10 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmb0jLGz6HGdF for ; Sun, 23 Nov 2025 16:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmZ2bXxz45VB for ; Sun, 23 Nov 2025 16:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fr5zcHLSVWt5pazdDLpn01ENu/syFBcsUhX1TmNdCrc=; b=sP9cHiD/PCX828A5JHLYITtSCswgCkXc51AlT2zOHqnkdQuzVSUpbu/lG9gxGi6groyozn YqTGrSHfZLc20cDNuVzeLSApEZcINk6f9aLGYmKblcBCTtQLQjT4p4pR13A426SPdyW7BT PZhqqNqJJDTXZ2ZlLhkYir93JQfxR4fOuCUizqdBurIzBUo9XLzizyH5JW6WXfKfHJw0Xf z8eFC4nktT5U6yqOQeRA1N6KFVWg3iVX6AvV21fmtrEdgnyf7mpZrgijqeam04Uh1YrUZt yL2ZqS46UErtOiNiTzkYkSwXiGgNqrOOmq9r8CSVK5QxwS3I98YHnM37P6IZEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fr5zcHLSVWt5pazdDLpn01ENu/syFBcsUhX1TmNdCrc=; b=NVE1as0xHRKpZvRUuV5XjWYXWCXFlqIl1OQ/FvWXH01lT09cHH+t0i7AfPXB3/WikqR3iV ywxXyB+0gVYcKs6jx9lT6fdPCrH9ixw6yBLgu23u/ac41cVXDKdzgYpeTSMfiC6dVw1pGr fdB1MRSb2meZjc/03wY4LOHxt5N+vTtSfPn76WsDtG52auCDSIoaQzL0v+NjmltyE4SqHl 4tgrGYYTr9SUh4hOw8AY/2pnxgvDTZAGdJDGjo3rg65StwKmLtuA6VfKwH39GBNFgSSZX3 rFSz/ZPBZlFKAJayBcEhppNyRmB2Ybx8OqW97c2B6cEGRBe3hJI1zfXAtXRAEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915950; a=rsa-sha256; cv=none; b=NVIv9q6NW11+suvQnWJbxNlOvYxA3zThIT3Lyqsh72+amiqZPC5UHMxJdmmRWVXg52nV4G NmqJgkAaFfiB901x7M45LOy9KKl8YkC6b+PJDNq/uWCinXaZ+fFNTASV+SQsF8gMC3gtz4 Plv2Fy8mPIpHlq+JM1SjG7V+OXBNnkW5DmzkZJUatadBBnTeN6JGzmV3TBmtAtPHMJjQUL DnrYAWhLblIWI7s57xX8E9D5/1FMBS2KDwYiPvZUAvrmXC6QN0XG8FLb40N8sYvtGgnYFA /bVpYk7fESvWSvewcjXB+KMz7/4pP/NtNzljowpIRWhhS5hMWcTFrvkz/xNHDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmZ1m3szcvY for ; Sun, 23 Nov 2025 16:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36fa8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 54808d50412a - releng/15.0 - cp: Fix copying the root directory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 54808d50412aee31692f0041b4f78ddaf43bac8f Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:10 +0000 Message-Id: <692338ae.36fa8.2b5de0db@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=54808d50412aee31692f0041b4f78ddaf43bac8f commit 54808d50412aee31692f0041b4f78ddaf43bac8f Author: Dag-Erling Smørgrav AuthorDate: 2025-11-22 12:11:59 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:48 +0000 cp: Fix copying the root directory When the source of the copy operation is the root directory, we should neither append it to the destination path on FTS_D nor trim it back off on FTS_DP. Approved by: re (cperciva) PR: 291132 MFC after: 3 days Fixes: 82fc0d09e862 ("cp: Partly restore symlink folllowing.") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53863 (cherry picked from commit fe836c50120daed3e4084f43c27d8d650d36dee8) (cherry picked from commit c4843e5805dec10ee552d21f19c8da7707c1fcbc) --- bin/cp/cp.c | 7 ++++++- bin/cp/tests/cp_test.sh | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 38fe65399d06..7ac1e5f6a4c4 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -433,6 +433,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) sep = strchr(to.base, '\0'); sep[0] = '/'; sep[1] = '\0'; + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { /* entering a directory; append its name to to.path */ len = snprintf(to.end, END(to.path) - to.end, "%s%s", @@ -520,6 +522,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) if (type == DIR_TO_DNE && curr->fts_level == FTS_ROOTLEVEL) { /* this is actually our created root */ + } else if (strcmp(curr->fts_name, "/") == 0) { + /* special case when source is the root directory */ } else { while (to.end > to.path && *to.end != '/') to.end--; @@ -551,7 +555,8 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) /* Not an error but need to remember it happened. */ if (to.path[0] == '\0') { /* - * This can happen in two cases: + * This can happen in three cases: + * - The source path is the root directory. * - DIR_TO_DNE; we created the directory and * populated root_stat earlier. * - FILE_TO_DIR if a source has a trailing slash; diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index b637f862b7d3..af309ca7ea80 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -747,9 +747,23 @@ dstmode_body() atf_check cmp dir/file dst/file } +atf_test_case root +root_head() +{ + atf_set "descr" "Test copying the root directory" +} +root_body() +{ + atf_check mkdir dst + atf_check -s exit:1 \ + -e inline:"cp: / is a directory (not copied).\n" \ + cp / dst +} + atf_test_case to_root cleanup to_root_head() { + atf_set "descr" "Test copying to the root directory" atf_set "require.user" "unprivileged" } to_root_body() @@ -893,6 +907,7 @@ atf_init_test_cases() atf_add_test_case to_deaddirlink atf_add_test_case to_link_outside atf_add_test_case dstmode + atf_add_test_case root atf_add_test_case to_root atf_add_test_case dirloop atf_add_test_case unrdir From nobody Sun Nov 23 16:39:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmb51Y2z6HGJM for ; Sun, 23 Nov 2025 16:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDvmb2nX4z45QW for ; Sun, 23 Nov 2025 16:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ILe3QuaYo6T33g0CrA7cxQ0xe+m60m8wgyLq0iTYc0Q=; b=LkN+8QU1gd71qKUIg7H7sJjo69LdVHrzxDUI2KeE3SOhbxQOPV7e3ekJOHsN/jAYL9/69K 3CjShvCXimZcR4j39A0gxafqiO67mxVyC9U/G/GNWt819LO94ec5cDMvhE+Dg8vxcEJDDA +tjOt228Uog5RZRXQSR+BXgrkyLSUo3AC2PMr+8Y/9OgyPHPo/X954zfbNyVlJkp/NpAHv 3P63XgZQidZSQRVcDkKM9qhbYEQKqhFj5W9XGHYQY0W522rbIK8V3e9AKDzpkP7QaOKeGY 6qwepeVDQRTVKAiePMrqoBncYn5h5Ky/C1OYdgZLC3tFY4tbUAea1CsBsZjqcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763915951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ILe3QuaYo6T33g0CrA7cxQ0xe+m60m8wgyLq0iTYc0Q=; b=R6xjHffrxeQ88fkF9/Qj9axH3OJt3NvXZeHYoK5r1OlKqN7aqapPADbcsWzsBsb+I8nUrY g/r7T7FQ+NSjjxEZg+9yEDZ3yTLtTd/lGZft6ogf3MU08RcbDeAoZoCerxRiLLll8/cYhh d5cRXOTeJDMdbqNmESakRZ0zrMArYblpKWGJijhRXa1GZcmZN1EuZHxiwVlYOyDQ08gGGp XeN2zU1AQ5LniVB/3SpqHtZnOWD7Dt9zZDgnxJdBtsKRmvBDnscvPeJPQgSlPA2t1fvMHm 7TA/icvRjRNZZqUjHRmVNfOLoQ8OxoEuQ1PFVtSeLz2d1BDcp96L0Xwh75Lhhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763915951; a=rsa-sha256; cv=none; b=TxsfAKU0aeoVz/riuST3UXROsAXAuou3lJ8U53ukDp7IM6NwoN2Ofv3kZB7MW6dNNHa2FP TdvS9n+bMW6SRanoVF5+NatReMw83yuitG+dK9g224iOLwpW1xRt4JXMHGE9HnSMb8J4uq ZMsJBZE6il9kifSms06fUsqITkAVFBx6xsuQycqIETXG5kaJOCuDYTcVPjrhtdXhLs5B37 g436FZXdfsk0xKmcMpRvjyVPcGOxLW/oHqcVDPn3SUZKb3y/Tj32IqB0ek1LwZORe+43a/ 1afS7eFr1otmWQjTXwOhZYxjR+HFYsz6T78Egtz4jNkmTUq8a+JQ7WEQZfDKCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDvmb2HQZzcpw for ; Sun, 23 Nov 2025 16:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3624c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 16:39:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gordon Tetlow From: Colin Percival Subject: git: fb9252e66734 - releng/15.0 - Add backup pkgbase signing key held by security-officer. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: fb9252e66734de75f5098e296c455d498d2aaced Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 16:39:11 +0000 Message-Id: <692338af.3624c.2a241b85@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fb9252e66734de75f5098e296c455d498d2aaced commit fb9252e66734de75f5098e296c455d498d2aaced Author: Gordon Tetlow AuthorDate: 2025-11-22 08:35:52 +0000 Commit: Colin Percival CommitDate: 2025-11-23 16:38:52 +0000 Add backup pkgbase signing key held by security-officer. This key was generated by gordon@ (aka security-officer@) on an offline system as a backup key should anything happen to the AWS Key Management Service that is currently in use for signing pkgbase repositories for FreeBSD 15.x. Approved by: re (cperciva) Reviewed by: cperciva With hat: so (cherry picked from commit 12ec49d8fac2eacd40ad235bf73cc585736ee77a) (cherry picked from commit 696b0e2209ee81c5a0b27c327cf66eb3c9cfc584) --- share/keys/pkgbase-15/trusted/Makefile | 3 ++- share/keys/pkgbase-15/trusted/backup-signing-15 | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/share/keys/pkgbase-15/trusted/Makefile b/share/keys/pkgbase-15/trusted/Makefile index e6205999b12f..32db72ae368a 100644 --- a/share/keys/pkgbase-15/trusted/Makefile +++ b/share/keys/pkgbase-15/trusted/Makefile @@ -1,6 +1,7 @@ PACKAGE= pkg-bootstrap -FILES= awskms-15 +FILES= awskms-15 \ + backup-signing-15 FILESDIR= ${SHAREDIR}/keys/pkgbase-15/trusted FILESMODE= 644 diff --git a/share/keys/pkgbase-15/trusted/backup-signing-15 b/share/keys/pkgbase-15/trusted/backup-signing-15 new file mode 100644 index 000000000000..a147d6788cf2 --- /dev/null +++ b/share/keys/pkgbase-15/trusted/backup-signing-15 @@ -0,0 +1,2 @@ +function: "sha256" +fingerprint: "56a77bdcb6c3cf7984729c6138bd5617c24aa0d466b3b604c96205b2c5629f3c" From nobody Sun Nov 23 17:53:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDxQm6wnKz6HPCY for ; Sun, 23 Nov 2025 17:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDxQm6HrPz3Kxc for ; Sun, 23 Nov 2025 17:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763920432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSZRlpVCuaTs7lf6ouycBVQXlWRRSrK6JjRX9StSM9Q=; b=HETVVVpQift96xfE2Aj808jkuamaP5AaQqnvMnBUnE21C25yL/S1adbCY0g8S1EjlFo4HR P/SPI3Gj1vU0dDBelO4BlMIOOg9n5RLQ4e5cVVqoqJl3GFKSR5uxWVNcXPzaMsOadUS3Bj H2+6uqLiIhfQyd1A9NUBOp5rI/atoRlW2O+OxSd7Db3iLMVnCRY0EfhcJcIUX97JJrgfA4 zPLoMFXxrmzVMctPzWK8ik2oSX0BUqBcYqtbT8aC4hpCN7N5LgT+lr5oxVKMGOF6ufwAN+ 5WJ+LNHbz7EGrXAb6xRSlhjhx8WoveJG6kFrqtf+2GkHwWQuFhIVygE3jmlDig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763920432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSZRlpVCuaTs7lf6ouycBVQXlWRRSrK6JjRX9StSM9Q=; b=ecpj8Q/8leI3zH/ZqIbnLEzdKEdloBv4uTbxhdPrzQGMeSQtMMEPDAS9wMqMIv0Z9KcqZl FPmEECmvq1hRrDpjdJhpJ5HWYNmksHRzoCNIVwwxONSaYktOSd1tXqZgw/toNvYmEcRZ2y 8hq9NF+VuKAQV/KnDKmAj2n8YRS7c5vTcgXmo53prfIX93JOAyhB+212EhfNvlRpmI6VwI RNtfC+DHEiFkACMw09JrQXpQJ/14gIOZoLgqOfM5mEZKZ6B1skO0yMYALtLd/ddJDKL+yt DT7V+Jcj5+j6y8qlVP9G++lz5f/1OCZLzaKmucMe2bQ3EFbYL8nYIQOS/UPOmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763920432; a=rsa-sha256; cv=none; b=bO9bj59dyPhYdDHzXFVmsQmFiyLkRpcDSMj5LTE3TBpMcuwx71Dq9TZ7nVz+M3JfUuSrvx 47Yg+FakVtzEBKMgYrtH4EkGwfC9fuNIc7lcoICoDkcuFvTWYP9YsMgf8VB9KQMIkiM8c/ SS7E57FQBlCfuNhjHMtCZ+OaegGuCGAugnahQt+drtb8llSZlmNeuFEtwxGH6Z9M3fboGQ jEKg1bdNo+lrmsIeTNShVrifCJWeJ6h98Bj7ZDLpjr1r0D/PojAR//MghWec26FPow7H9a jGrkJu4xxFR/Jjwq6KQoiugXcqgoYKzHZkTAaTUxN3hAmjU4VXtVP39zC6Qyww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDxQm5nnXzfnj for ; Sun, 23 Nov 2025 17:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f50f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 17:53:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 11c5b906fcac - stable/15 - mgb.4, muge.4: Use standard HARDWARE introduction List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 11c5b906fcac36e1b8749e9ef2f65ed8ad9812f9 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 17:53:52 +0000 Message-Id: <69234a30.f50f.a913f54@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=11c5b906fcac36e1b8749e9ef2f65ed8ad9812f9 commit 11c5b906fcac36e1b8749e9ef2f65ed8ad9812f9 Author: Ed Maste AuthorDate: 2025-11-20 16:41:38 +0000 Commit: Ed Maste CommitDate: 2025-11-23 17:53:40 +0000 mgb.4, muge.4: Use standard HARDWARE introduction Release notes are generated using this text. I used "interfaces" not "adapters" in these pages as the listed devices are the controller ICs, not end-user projects. Reviewed by: ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53846 (cherry picked from commit a4aa7df767e0df49ca3294d2b578be25812364d8) --- share/man/man4/mgb.4 | 2 +- share/man/man4/muge.4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/mgb.4 b/share/man/man4/mgb.4 index cf0f7aaa688d..0d26951d1b1e 100644 --- a/share/man/man4/mgb.4 +++ b/share/man/man4/mgb.4 @@ -49,7 +49,7 @@ For more information on configuring this device, see .Sh HARDWARE The .Nm -driver supports: +driver supports Microchip PCIe Gigabit Ethernet interfaces, including: .Pp .Bl -bullet -compact .It diff --git a/share/man/man4/muge.4 b/share/man/man4/muge.4 index 598106bf1855..2a1b0f600955 100644 --- a/share/man/man4/muge.4 +++ b/share/man/man4/muge.4 @@ -44,7 +44,7 @@ For more information on configuring this device, see .Sh HARDWARE The .Nm -driver supports: +driver supports Microchip USB Gigabit Ethernet interfaces, including: .Pp .Bl -bullet -compact .It From nobody Sun Nov 23 18:10:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dDxnq4RsXz6HQ4f for ; Sun, 23 Nov 2025 18:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDxnq2Lg9z3Mct for ; Sun, 23 Nov 2025 18:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763921423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSi/ICUq0ctu/nEPIsIO47P4ijzPkMMykbCn1pEGqOo=; b=pNDv3X+mUUANWnYD33TSUDXNoqHnIKjFVcXDMfagbejJ3mN5QZrIwm3CzyCYB8fQc9TW/i uNARF2ve19K6KDj4Nzjei6SE7AMBCMEo3MPReK97giqSA+K54yd/pysJm6y6/AEUBMr3VF ooCKpYpZEa99/LHUWnDAQ6djeBzUxHUjXo1Af3dGo9GtZBm1LBKAAkwq1mBmjdHuANbhl6 OTAw76kSc4JDacp0A5BJ8eS1qNGTlnuY3W08MpZBHLdnVQco03G90FGWHDlFveI7giWViv Qn6wogM/XEtzceXnzCjzTgldvqAOwq9mVJ9T/sMSI6EYU39CIyAwUulp/JnHcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763921423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSi/ICUq0ctu/nEPIsIO47P4ijzPkMMykbCn1pEGqOo=; b=ugykwdpwIu7qxAzpIahckIs4hDXbuWpMNqKFGMxTZNO1vDpZ1O5eVHtD2HoGBpBXDmuSxN 9cMefjtNsA+UNNZ7k1dnrY1eFj7Q0poWQtdlOjOT9Fzx31cOYHq7PB0OxpWC6DtZm4U7AN zQgfzNcfKQrsvOJOjdHNsQEBjIGluPcFvfIflmQzwGM4HrE65YhgifLFAUGpjLWaCZN/Zt ysYaDBqLcCYxFQqJAMjxwZHp/tXRZYTYJcdGGJSB5p1DYCPGzm2sTvH9zI2UOiKIG6E1mN WChmi1GmvsaRZNO/S460GAri/dx4qzjvg5c5fHhcjJidofVqZ/W9LL/ltx6G9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763921423; a=rsa-sha256; cv=none; b=PlkEXDqVZA4dk8qSRrc+p3QsNWodQ7E/0vXVfVaHiB+tUxXlReZff0h00tHTp7Ss9F6to4 X87MgenEN11M5I1OB7YUCwIpBfXezzvPMLFT1wjQMZhGslrBY0d14uaHrx4udOJe5JpK+7 PDyF0InvTaLvnRPU+0fpsEN8NNYFmlS7pSf+z6Yt2hnG95W6oYpXYVn4GREu4yq12SX+PN 8S6g89Jc+VMgT1n/Z13U21tHDyUrBAYn8z3NlvulwCRCbQ3TeYMH2kYMRkJYxZb5lZ5oln 0dSs62I+X8pWQOKMyM7IJ75gCfFjk8kB4avJ7U6NXA7p1WML81u/tEXPpRG3Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDxnq0bqZzg0V for ; Sun, 23 Nov 2025 18:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fc7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 18:10:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jose Luis Duran From: Ed Maste Subject: git: d06b14106a37 - stable/14 - mtree: Add missing flua/freebsd/sys entry List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d06b14106a376ab1658ea7917ba32c43e377ba2a Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 18:10:22 +0000 Message-Id: <69234e0e.fc7d.780fad32@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d06b14106a376ab1658ea7917ba32c43e377ba2a commit d06b14106a376ab1658ea7917ba32c43e377ba2a Author: Jose Luis Duran AuthorDate: 2025-02-05 19:52:03 +0000 Commit: Ed Maste CommitDate: 2025-11-23 18:09:15 +0000 mtree: Add missing flua/freebsd/sys entry Reviewed by: imp Approved by: emaste (mentor) Fixes: de1d7d7b87cf ("flua: add freebsd module implementing kldload/kldunload") Differential Revision: https://reviews.freebsd.org/D48838 (cherry picked from commit c587e4c7e4c28354634b4e13f30743ccdd3fbf91) --- etc/mtree/BSD.debug.dist | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index 435da9d14d43..a75edff4f865 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -38,6 +38,10 @@ engines-3 .. flua + freebsd + sys + .. + .. .. i18n .. From nobody Sun Nov 23 20:25:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dF0nv0J37z6HMVV for ; Sun, 23 Nov 2025 20:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dF0nt5SLjz3c2D for ; Sun, 23 Nov 2025 20:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763929538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BtPgAUaJOTlNS1hshmDdVWh6tnmCcN6PqXbAvRxfito=; b=dDc/NaH8T1JjXRweYUrsI1GvahYYMHNedBVVIs7Nwl61ajlxZeHwh5p2lBTss617TVVi6O /eHYps3pxKG40hfHnGMQETmAiQ3gGJrd9BD5hmmXloQEn3pe3QLp6r9B4JQjbhgsgrJi5e xCLscyfrc/EwhMOvOWpVw9kdIPQIUR6GgK1c2U6UVyDPWi3zeX1Xp7u2jbLBHsmIzt9aVA vFjmO8wp0kdnpeSB4gR2xNgfjLkwNKYaKOJo6RJfDLP0+T48KenGA9z33NYC4PepDkuRVv NUbRfoENdgJ6uHOFSw2bbsxP7gl4V9jdKgT7lpmO0phy2KiGClMsU2Hy1nxeng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763929538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BtPgAUaJOTlNS1hshmDdVWh6tnmCcN6PqXbAvRxfito=; b=h5G68cklZlmu4cDI04v88Zz/r09X+aoMkBXl3CqerXMwyxXzjO4y5PPomxl2xD3dxHViIp MsGIthYpArA/MGna266+skum6S3wOGNV8CgMxa9Xyf+nxVZHiTXh3qFBZzP0CzRHesSNpR ey+6yKSe2hjJ3ZcQV46aZyYAs9Sl5nLvSDX7ro+bJnSUTfFz4Atyn+rcHN9PCSwKCmmfTm P2H4/6DceouDpLiKw0jSFasJYYZ915bMoYVwm/GTBmJxP00sGShu0oZ2nSi+mXdjcaR04Z tkoA1Fp+pc8rmcOiai44xchfDmSagYqp8viex97Mrhq1S90fvW6zP42FEHzi7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763929538; a=rsa-sha256; cv=none; b=iRHi5Fr3EXmncwsCKDtz/o0Jfms7fpB3nnO4wfQkZbkyZbK1Izb00FObDBp+dLoDW9+nNJ 8crgEMd0Skob0dZmX2/+pBM2uGx66Lcxw+tOdgcXjL+Ib2ucyW0l5DIYgTe5ukzyAnb6QX yDErw+Ztm8crd2APDOBcGmeLmxxrn/iMxrKPTmymC/QmW10nnLNgMW7AxtbWrNbkpsxoYg gShAgqG1O61Rd9QkctTEUGpU78s0miroY3StjUFqTMDcwqdq/eZarw+b33iSHMipdYXJ5A 19IJONEKWPQ2+j2cHnzHaQsK5tNI4edeVhue5wwzhoUXRWGXdTVAts7KJSFdGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dF0nt3nBPzkqj for ; Sun, 23 Nov 2025 20:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f38c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 20:25:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 52159dd73fe7 - stable/15 - pathconf.2: Document the new _PC_CASE_INSENSITIVE name List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 52159dd73fe7a189450d9df36061c760b3632a7c Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 20:25:38 +0000 Message-Id: <69236dc2.2f38c.3e66c29b@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=52159dd73fe7a189450d9df36061c760b3632a7c commit 52159dd73fe7a189450d9df36061c760b3632a7c Author: Rick Macklem AuthorDate: 2025-11-01 22:20:40 +0000 Commit: Rick Macklem CommitDate: 2025-11-23 20:24:10 +0000 pathconf.2: Document the new _PC_CASE_INSENSITIVE name Commit d6864221d8 added support for the _PC_CASE_INSENSITIVE name for pathconf, to indicate if case insensitive lookups are configured. This patch documents this new name and also updates the description for _PC_HAS_HIDDENSYSTEM to also include UF_ARCHIVE. This is a content change. (cherry picked from commit b473bb274cef37d45940cad4624b5d3b7fc96e01) --- lib/libsys/pathconf.2 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libsys/pathconf.2 b/lib/libsys/pathconf.2 index 5a983a3a13e2..5348128be706 100644 --- a/lib/libsys/pathconf.2 +++ b/lib/libsys/pathconf.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 6, 2025 +.Dd October 31, 2025 .Dt PATHCONF 2 .Os .Sh NAME @@ -180,7 +180,8 @@ Return 1 if named attributes are enabled for the file system, otherwise 0. .It Li _PC_HAS_NAMEDATTR Return 1 if one or more named attributes exist for the file, otherwise 0. .It Li _PC_HAS_HIDDENSYSTEM -Return 1 if both +Return 1 if all of the +.Dv UF_ARCHIVE , .Dv UF_HIDDEN and .Dv UF_SYSTEM @@ -192,6 +193,9 @@ Returns the block size required for block cloning via .Xr copy_file_range 2 for a file system if block cloning is supported, otherwise 0. +.It Li _PC_CASE_INSENSITIVE +Return 1 if the file system performs case insensitive lookups, +otherwise 0. .El .Sh RETURN VALUES If the call to From nobody Sun Nov 23 20:28:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dF0s911yjz6HMb3 for ; Sun, 23 Nov 2025 20:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dF0s85gSDz3cBk for ; Sun, 23 Nov 2025 20:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763929708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FE5DBxvQPW5Ih7zkDLBs2CszJ1klOviaA8qqXyPmiCs=; b=ej+Pgr6U9jOliZPz57haGchTznR87x8GsHDpr5PZNsYu3R7DeoiBLlqCv2skmkui17bMXY 36/Hriwo5uAr6dzg5N9pd5APoOurBv7uqL0GkjcKPR68iQk9Nc7lvUSTN3A3Eq/i6kFIAw GoqHYT2IYNLd7MOAyPMhIeMq3Y8fpcbcjECR5J+058NUOnzFIv+Zd45R/GVH7odBe0kfq2 YSymjS0S9uLTU1Br3FdcirT39l2f4Zd4f5nbPUO0dUTVVsq2Wxyf9YZ6OYb7hgG6rcEAio iHG9a23MiCYJ331NKkUm8+yQrWblaxTtnnsqMbc6ilx913fZ/DA7Nb79NoYhkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763929708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FE5DBxvQPW5Ih7zkDLBs2CszJ1klOviaA8qqXyPmiCs=; b=ZdLTYiBxGDt9oUN1jfb0xvL/Q/m1nXd8GiQhrSczenONBlLsOUwh+kmiv/Snly5Ou1p9Q6 4reo98xnLg6N+MUUwxky9ABGQrUSUFMUj4C7jU8nPym+rYT1QngYBknGM5R5k5n2ahxdb/ KKtHmwuXHRYTItCKR7joHccV9Z6PZSgS0IdAbeYo+VxZLUZPe+r/pAv7Q8dGXQXK20Lbfk YPFJwCy4Qor742b+3jl4xl3chhSehVdGOMJKNqeYi2iEQCqCXRSH5/sem3QpWVkDUCAPH5 5sb5+eoSKdRDa4IVdI7R+aYrMb50Is8xSVX2zj/xSg7F0FUCiy25M1d2yWp9oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763929708; a=rsa-sha256; cv=none; b=LDjzqc71fQz/0SosOAay/rvA/7HadifqycCslX1a06saLwCFuaFHfmPTNkgWRU4ABqt3pe +/jiKbJl7vyYxJm8yy4IHDxDdj5Mw4wDsIWwDnDOwDlzUJKjD/9DyuFcUTNudoUvvRtiNy 0V3d71ueQTw9CE8/Elidn/L1upl6G+Zr4J5Yu3fKZ1SfoJdmhdCSdsMozZKKsgoNEjzOtP ZtsGZFH27/ZEl74Fo78NoCKf2BTypmdVSsqLbG7MePw+MpXVr6y2zem3ss1N1dkgtjVWjR m51QPSOc9rk/jj2DhvFanTGwVdDauBRkb0k1KHCQA/xKfHW2FyCY+J3H/+bB1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dF0s84cSRzkJ5 for ; Sun, 23 Nov 2025 20:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f390 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 20:28:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: f27afc476551 - stable/15 - nfs: Add support for the new _PC_CASE_INSENSITIVE name List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f27afc476551c62a09b02b9b9de5103a3094fc88 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 20:28:28 +0000 Message-Id: <69236e6c.2f390.78931747@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f27afc476551c62a09b02b9b9de5103a3094fc88 commit f27afc476551c62a09b02b9b9de5103a3094fc88 Author: Rick Macklem AuthorDate: 2025-11-02 21:38:45 +0000 Commit: Rick Macklem CommitDate: 2025-11-23 20:25:38 +0000 nfs: Add support for the new _PC_CASE_INSENSITIVE name Commit d6864221d8 added support for the _PC_CASE_INSENSITIVE name for pathconf, to indicate if case insensitive lookups are configured. This patch adds support for it for both NFSv4 and NFSv3. It also adds a fsidp argument to nfsv4_fillattr() which will be used in future commit(s) related to NFSv4.n directory delegations. (cherry picked from commit e5aa60d0695803c83dc0af08c057b82c463da3f2) --- sys/fs/nfs/nfs_commonsubs.c | 31 ++++++++++++++++++++++--------- sys/fs/nfs/nfs_var.h | 4 ++-- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- sys/fs/nfsclient/nfs_clstate.c | 3 ++- sys/fs/nfsclient/nfs_clvnops.c | 8 ++++++-- sys/fs/nfsserver/nfs_nfsdport.c | 18 ++++++++++++------ sys/fs/nfsserver/nfs_nfsdserv.c | 9 +++++++-- 7 files changed, 52 insertions(+), 23 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index f580a394a735..707ad5749ab2 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -658,7 +658,7 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap, NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMECREATE); (void) nfsv4_fillattr(nd, vp->v_mount, vp, NULL, vap, NULL, 0, &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, - false, false, false, 0); + false, false, false, 0, NULL, false); break; } } @@ -1706,11 +1706,18 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_CASEINSENSITIVE: - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); if (compare) { if (!(*retcmpp)) { - if (*tl != newnfs_false) - *retcmpp = NFSERR_NOTSAME; + if (vp == NULL || VOP_PATHCONF(vp, + _PC_CASE_INSENSITIVE, + &has_pathconf) != 0) + has_pathconf = 0; + if ((has_pathconf != 0 && + *tl != newnfs_true) || + (has_pathconf == 0 && + *tl != newnfs_false)) + *retcmpp = NFSERR_NOTSAME; } } else if (pc != NULL) { pc->pc_caseinsensitive = @@ -2690,7 +2697,8 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, nfsattrbit_t *attrbitp, struct ucred *cred, NFSPROC_T *p, int isdgram, int reterr, int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno, struct statfs *pnfssf, bool xattrsupp, bool has_hiddensystem, - bool has_namedattr, uint32_t clone_blksize) + bool has_namedattr, uint32_t clone_blksize, fsid_t *fsidp, + bool has_caseinsensitive) { int bitpos, retnum = 0; u_int32_t *tl; @@ -2865,10 +2873,12 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, break; case NFSATTRBIT_FSID: NFSM_BUILD(tl, u_int32_t *, NFSX_V4FSID); + if (fsidp == NULL) + fsidp = &mp->mnt_stat.f_fsid; *tl++ = 0; - *tl++ = txdr_unsigned(mp->mnt_stat.f_fsid.val[0]); + *tl++ = txdr_unsigned(fsidp->val[0]); *tl++ = 0; - *tl = txdr_unsigned(mp->mnt_stat.f_fsid.val[1]); + *tl = txdr_unsigned(fsidp->val[1]); retnum += NFSX_V4FSID; break; case NFSATTRBIT_UNIQUEHANDLES: @@ -2914,8 +2924,11 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, retnum += NFSX_UNSIGNED; break; case NFSATTRBIT_CASEINSENSITIVE: - NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); - *tl = newnfs_false; + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + if (has_caseinsensitive) + *tl = newnfs_true; + else + *tl = newnfs_false; retnum += NFSX_UNSIGNED; break; case NFSATTRBIT_CASEPRESERVING: diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 16a76c060e78..7db3952ecf5c 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -398,7 +398,7 @@ void nfsrv_wcc(struct nfsrv_descript *, int, struct nfsvattr *, int, int nfsv4_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, NFSACL_T *, struct vattr *, fhandle_t *, int, nfsattrbit_t *, struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t, struct statfs *, bool, bool, - bool, uint32_t); + bool, uint32_t, fsid_t *, bool); void nfsrv_fillattr(struct nfsrv_descript *, struct nfsvattr *); struct mbuf *nfsrv_adj(struct mbuf *, int, int); void nfsrv_postopattr(struct nfsrv_descript *, int, struct nfsvattr *); @@ -740,7 +740,7 @@ int nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct nfsrv_descript *, int nfsvno_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, struct nfsvattr *, fhandle_t *, int, nfsattrbit_t *, struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t, bool, bool, - bool, uint32_t); + bool, uint32_t, bool); int nfsrv_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, NFSACL_T *, NFSPROC_T *); int nfsv4_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 9ee1fb7d72d8..8cbfaa7a8996 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5452,7 +5452,7 @@ nfsrpc_setaclrpc(vnode_t vp, struct ucred *cred, NFSPROC_T *p, NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); (void) nfsv4_fillattr(nd, vp->v_mount, vp, aclp, NULL, NULL, 0, &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, false, false, - false, 0); + false, 0, NULL, false); error = nfscl_request(nd, vp, p, cred); if (error) return (error); diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index aa9d01fc4632..712d49c7160c 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -3701,7 +3701,8 @@ nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p) if (!error) (void) nfsv4_fillattr(nd, NULL, NULL, NULL, &va, NULL, 0, &rattrbits, NULL, p, 0, 0, 0, 0, - (uint64_t)0, NULL, false, false, false, 0); + (uint64_t)0, NULL, false, false, false, 0, + NULL, false); break; case NFSV4OP_CBRECALL: NFSCL_DEBUG(4, "cbrecall\n"); diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 5ce764fcedea..714c37de271f 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -4677,12 +4677,13 @@ nfs_pathconf(struct vop_pathconf_args *ap) clone_blksize = 0; if ((NFS_ISV34(vp) && (ap->a_name == _PC_LINK_MAX || ap->a_name == _PC_NAME_MAX || ap->a_name == _PC_CHOWN_RESTRICTED || - ap->a_name == _PC_NO_TRUNC)) || + ap->a_name == _PC_NO_TRUNC || + ap->a_name == _PC_CASE_INSENSITIVE)) || (NFS_ISV4(vp) && (ap->a_name == _PC_ACL_NFS4 || ap->a_name == _PC_HAS_NAMEDATTR || ap->a_name == _PC_CLONE_BLKSIZE))) { /* - * Since only the above 4 a_names are returned by the NFSv3 + * Since only the above 5 a_names are returned by the NFSv3 * Pathconf RPC, there is no point in doing it for others. * For NFSv4, the Pathconf RPC (actually a Getattr Op.) can * be used for _PC_ACL_NFS4, _PC_HAS_NAMEDATTR and @@ -4849,6 +4850,9 @@ nfs_pathconf(struct vop_pathconf_args *ap) case _PC_CLONE_BLKSIZE: *ap->a_retval = clone_blksize; break; + case _PC_CASE_INSENSITIVE: + *ap->a_retval = pc.pc_caseinsensitive; + break; default: error = vop_stdpathconf(ap); diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index ff28b089da5d..c05e0d67f0d6 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -2114,7 +2114,7 @@ nfsvno_fillattr(struct nfsrv_descript *nd, struct mount *mp, struct vnode *vp, struct ucred *cred, struct thread *p, int isdgram, int reterr, int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno, bool xattrsupp, bool has_hiddensystem, bool has_namedattr, - uint32_t clone_blksize) + uint32_t clone_blksize, bool has_caseinsensitive) { struct statfs *sf; int error; @@ -2135,7 +2135,7 @@ nfsvno_fillattr(struct nfsrv_descript *nd, struct mount *mp, struct vnode *vp, error = nfsv4_fillattr(nd, mp, vp, NULL, &nvap->na_vattr, fhp, rderror, attrbitp, cred, p, isdgram, reterr, supports_nfsv4acls, at_root, mounted_on_fileno, sf, xattrsupp, has_hiddensystem, has_namedattr, - clone_blksize); + clone_blksize, NULL, has_caseinsensitive); free(sf, M_TEMP); NFSEXITCODE2(0, nd); return (error); @@ -2468,7 +2468,7 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram, int bextpg0, bextpg1, bextpgsiz0, bextpgsiz1; size_t atsiz; long pathval; - bool has_hiddensystem, has_namedattr, xattrsupp; + bool has_caseinsensitive, has_hiddensystem, has_namedattr, xattrsupp; if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); @@ -2949,6 +2949,7 @@ ateof: xattrsupp = false; has_hiddensystem = false; has_namedattr = false; + has_caseinsensitive = false; clone_blksize = 0; if (nvp != NULL) { supports_nfsv4acls = @@ -2978,6 +2979,11 @@ ateof: &pathval) != 0) pathval = 0; clone_blksize = pathval; + if (VOP_PATHCONF(nvp, + _PC_CASE_INSENSITIVE, + &pathval) != 0) + pathval = 0; + has_caseinsensitive = pathval > 0; NFSVOPUNLOCK(nvp); } else supports_nfsv4acls = 0; @@ -2999,7 +3005,7 @@ ateof: supports_nfsv4acls, at_root, mounted_on_fileno, xattrsupp, has_hiddensystem, has_namedattr, - clone_blksize); + clone_blksize, has_caseinsensitive); } else { dirlen += nfsvno_fillattr(nd, new_mp, nvp, nvap, &nfh, r, &attrbits, @@ -3007,7 +3013,7 @@ ateof: supports_nfsv4acls, at_root, mounted_on_fileno, xattrsupp, has_hiddensystem, has_namedattr, - clone_blksize); + clone_blksize, has_caseinsensitive); } if (nvp != NULL) vrele(nvp); @@ -6405,7 +6411,7 @@ nfsrv_setacldsdorpc(fhandle_t *fhp, struct ucred *cred, NFSPROC_T *p, * the same type (VREG). */ nfsv4_fillattr(nd, NULL, vp, aclp, NULL, NULL, 0, &attrbits, NULL, - NULL, 0, 0, 0, 0, 0, NULL, false, false, false, 0); + NULL, 0, 0, 0, 0, 0, NULL, false, false, false, 0, NULL, false); error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL); if (error != 0) { diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 217675173add..71b32082a91e 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -252,7 +252,7 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, struct thread *p = curthread; size_t atsiz; long pathval; - bool has_hiddensystem, has_namedattr, xattrsupp; + bool has_caseinsensitive, has_hiddensystem, has_namedattr, xattrsupp; uint32_t clone_blksize; if (nd->nd_repstat) @@ -336,6 +336,10 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, &pathval) != 0) pathval = 0; clone_blksize = pathval; + if (VOP_PATHCONF(vp, _PC_CASE_INSENSITIVE, + &pathval) != 0) + pathval = 0; + has_caseinsensitive = pathval > 0; mp = vp->v_mount; if (nfsrv_enable_crossmntpt != 0 && vp->v_type == VDIR && @@ -371,7 +375,8 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, isdgram, 1, supports_nfsv4acls, at_root, mounted_on_fileno, xattrsupp, has_hiddensystem, - has_namedattr, clone_blksize); + has_namedattr, clone_blksize, + has_caseinsensitive); vfs_unbusy(mp); } vrele(vp); From nobody Sun Nov 23 20:36:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dF12D2sqTz6HNL8 for ; Sun, 23 Nov 2025 20:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dF12D1N5Cz3dFc for ; Sun, 23 Nov 2025 20:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763930180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wy3RqSP0VUqxRaswChhFX9J/RiBIxTAijEGJlwS9SOY=; b=vsEzxTaZXoJ713uDu+MS79vfPY1emw/1LObsPPhc1EXzFFOVLQ/KMPN12eY0Xv1sn+l9C+ zv76NgSWq/eesC4U7FEQOBcOtxKP5NwGHO6htTv18G2jMgVXYng6osPAlcZaTmQjD8ecXW x5HcjV1ToHRO218sQG6ScVB1382Le5w/6r5ssKqbHhSjWYu2oSSqjF8Jm5GVfStD4ructF nrER7LvHwS9sHSOWGmqOJQBdlnQDeamD0uCEROeVzYCfjN9eZw+kgxbtXkH5q5RyTxrgRG WkhPFRu6ux/At9PIKYgNK9L1eWFXBPpihxfHWqkPE7TOhdtug97soLH/41QkYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763930180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wy3RqSP0VUqxRaswChhFX9J/RiBIxTAijEGJlwS9SOY=; b=eu3jaoPn+/m6KXNL9tgn95g06r0KO0B4ptomgndtENGTxSjru9FAFA2z3vA0TMHvU6ueW9 UDqUWr1isH4cz6Ky9DJ+98EepLBneppD27i0wn/2MXuKY+bMoDdQnAH8RnDgzXgrURWVnM 5Tq3prQDzxiqQI/dtBXaYfuoaGkZl1qFp1dsPMV4DSuVrialiWlhjAgfLGVppAz3EZu/MO j9nNrU0F/f8uvZO/GFsGnnjZbOuw8Bj2bmmYIEGT5mGib095UXB0jnDKG9GKqFEydRajiA w7JC0Ax5dAoirvu69Ef53KkNdf8GL0VJG1LgPmlvW2+66ESxBD/YQ7MFkhX/YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763930180; a=rsa-sha256; cv=none; b=oz7jQYOT0PSq9mPveXuIlNYL5e7tM/EgrZ9hvsJofBzborzphxaT7WYtiT6HrN52mEJPWr tEDTHPDWhgFsDyY7MtgGTMKctExC1pgxWBSegWbS6dxw9sNvAHwklID1f+Pqqgi0FTO1qp EqzTBBDj2jWQjNMurw8dKrQdYoaRlrA6EXbiBMTcCsPWbIKJGMqgEOql/OZVfQCmGcVAyf cw3XDo4lpCYYKlxv/mAGgs0K5UJg85NdYe3VIv+01m8+gCsERSAFuktkeR46p2MK1hiOxc qsl9yfCQgive+R4bj8oWgo83ZCGKNVQzSPfTgWvKreKPEZAM8DmURdLMvBXp1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dF12D0WZPzkrZ for ; Sun, 23 Nov 2025 20:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f7f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 20:36:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 33d15245f9be - stable/15 - param.h: Bump __FreeBSD_version to 1500502 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 33d15245f9be27336035c41fcf7c78ab50f3e6cc Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 20:36:20 +0000 Message-Id: <69237044.2f7f0.508dc090@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=33d15245f9be27336035c41fcf7c78ab50f3e6cc commit 33d15245f9be27336035c41fcf7c78ab50f3e6cc Author: Rick Macklem AuthorDate: 2025-11-23 20:30:48 +0000 Commit: Rick Macklem CommitDate: 2025-11-23 20:33:33 +0000 param.h: Bump __FreeBSD_version to 1500502 Commit f27afc476551 changes the internal KAPI between the NFS modules. As such, all must be recompiled from sources. Bump __FreeBSD_version to 1500502 for this. --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index a4cdc76e0fb2..cb75e316c39e 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500501 +#define __FreeBSD_version 1500502 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Nov 23 20:41:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dF18d3nGDz6HNLq for ; Sun, 23 Nov 2025 20:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dF18d2mTHz3ddY for ; Sun, 23 Nov 2025 20:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763930513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B53eRWGjdMQXAqrO5s/+21akcpPhcV/GYjvT8h1OIYY=; b=lSZB9Afl8L+I6rivzEys+qyuHKSyAcmfbEKftcMTPI8TMizK3G8wdyB/z4UhnkCeGDTJP0 Mb9HnPaGh7DXF/7ScI+kZAkl0oUFm/eOZrkInU7hwIxOssGqP67THjO66j60njMbobFqzc uAG0o2wPULMa/dClFL/PjU00/0zQ+6+vS+CPqPbtaO5ROKeDvl49gsGIXPndwRPiV2iw8Y m0wmV+eUhLxGscs3O9FkIzvD0m+1EA0pBXQ//EvopCW6RpjjtwFisU4e7zcA6rCnO2+IHj /cnf2gT9an039XhJoM3qw0522fjILLd5PX9/rrYMDUhWgrMHHOWiXCceXM5lzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763930513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B53eRWGjdMQXAqrO5s/+21akcpPhcV/GYjvT8h1OIYY=; b=EU05a14CFwE3BC7abzdtnWrjzDb1Uy6UVED/WTRQ6Wnbk+ikqA3zPMMFvnP4QKZGZ0iiTq kQIeHhabAo+p/DIVTmFcsIot+flDjzIdFgda0bxU54QNQJiz7gYghYHke1tgBCQnBM20Bb TgVF9OsSfszLsd5FPzk1wz4coNlKmqUVh7YQEBDIxRT5RMsFqOnGr6tBo+xk708Xetu6F/ 1qU90mEPOoCxADxH/I5Mq6Na9ARQEtvE6bUL1T8+OGSdC8OzSTsTLOiH76STnsnsuM/Kah OQ57PTV5Xk1nma+Q2C7HgZTRw+d4h9wyLEL/+txh3+ZxMANZFjK1oSa0paiMuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763930513; a=rsa-sha256; cv=none; b=obPxx7L0Hq5N0pzxBlCOn55oRUltkmp8fSJk74pq04nq+kAaxLkjVS1EAByY29IZJ7e+c8 rlwmecLBteWU8YepMokRS4siJszhpHUdsCDoHlcdJawdWsxdiVzDSNuznd1ZEEG2N3FgB4 9/J3Ssj3odNFGDK87bG8BqIOW+BW4S1fPafomlEYlPlw/zI+FwJDXt4lA2NAWRdDTv7BfF ZZ3Sgn/DXX9TbbFUwyq0I6rXSijIVNMtfQINPXMErJ5Totlvyo1EQyzoyWGCOXH4j2UNvt BXSQqvKgJFu/nH5bIKYymbjFV7ZpAxgz/2WPnh9CZircY964KqNUXmojtOg5Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dF18d2Jnvzl6m for ; Sun, 23 Nov 2025 20:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2fc69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 20:41:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: bac4d3fd6cf8 - stable/15 - UPDATING: Add an entry for f27afc476551 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bac4d3fd6cf8ffd18781c216bc267671803f211c Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 20:41:48 +0000 Message-Id: <6923718c.2fc69.1e102337@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=bac4d3fd6cf8ffd18781c216bc267671803f211c commit bac4d3fd6cf8ffd18781c216bc267671803f211c Author: Rick Macklem AuthorDate: 2025-11-23 20:39:46 +0000 Commit: Rick Macklem CommitDate: 2025-11-23 20:39:46 +0000 UPDATING: Add an entry for f27afc476551 --- UPDATING | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UPDATING b/UPDATING index 2287ff9d8d22..ae28504cdfd3 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,10 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20251123: + Commit f27afc476551 changed the internal KAPI between the NFS + modules. As such. all must be recompiled from sources. + 20251115: The FreeBSD-base repository is now defined in /etc/pkg/FreeBSD.conf, disabled by default. In -CURRENT and -STABLE this points at nightly From nobody Sun Nov 23 21:02:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dF1bz1j2sz6HQXd for ; Sun, 23 Nov 2025 21:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dF1bz0dvkz3lWn for ; Sun, 23 Nov 2025 21:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763931727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bjMwYbE3ni3Jpeg93LR/ThR8N0dK/ovZAOCAErN1hdo=; b=unR7uKjKcy8+8w9uRaGxDrhpBZCl4sBcGZVaQjTL4DZuyywCUvhGzB1g0eUxsmG+Ri+E7O Dw/BCo3FG7XrLMBc/0jZ0yYrFp6y1rr200lQWdBAv6W80jG50Mn2t9ZgCCNvmznsLztO4N 40nDMHxF3TeQc6HwjXbTuEKaNNFwfDmDghVE8Ragp0OkOk5v1J3sjjimPKpplpdeCMFVuo KO7DE+qvrOLF0yCSCCf+emIIpBNJLYpcA4FXCcZEGOM+gmRW2DnbtGHg/wSWyYxAzz5fhV NWQAREbfjaxgpHutB31TyKhLAeOYcfW7Egb2QtFiv0Bv+wGwQRZTTw/Hyun6Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763931727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bjMwYbE3ni3Jpeg93LR/ThR8N0dK/ovZAOCAErN1hdo=; b=MrOHCQ+EE9IO6G90YyfYqz62gEeXtvuNLmMpzzX8SqqFjsYgGN8s6unfqDVbUDsgpCQ+lb PlZHNOIsDcj0HwlzrwlzDUbjdbC/tgrgj4o4buYbeWNY1xLLmite2WH3vhfWTQL80AHrWU CEguKLn9cAxuTRi/QgqWDJfhk5TklIGb1HYDkXZ3u6ObV2nK8jMMd8ttg2XrPyOM6GHFv6 BZJx3Qg6BsjB53CRt/FB2WtMugtoT+EPkKpw9OME2IvHR5u13MreaOH+JMDFYNl5OXIzov KXHQ17GLI9eKGjFIpGvG0rRVXqohagIZD/m1vbmhxjEraf5adM0TZGuQfXLVqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763931727; a=rsa-sha256; cv=none; b=APsyUbnBRpz4ZD3WKxdQ31mk7OlFUkDB1a1/i6PclU0pC53p8bFCxfdeOIGDMwpFk9pnAQ ugdb2kyxQCoHRq0qij+Xpd1uytbU3MnO9X9hEu1ptK1/jhBB3hK5ChElJdMRdLu6g1/RVF aUtz19A72xYtJUnbkYWq1IC/KlpTao1AvO8OPXnFXS0rdOcPyQC4fsfnY2lSXQuuZdLA+G S0qCwcxZpKG9ip7dwVBKILhz0VRqGg9RUpDx3/xroIlkx9VIroAoh24G2Tmigjp8tFvABU Jt5prchDFXkFQL9CL6PToH2n6gGM4JTdp2vjFPOstp2X1gi5cqAn8pdwa/RhyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dF1bz05KnzlSt for ; Sun, 23 Nov 2025 21:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 325b5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 21:02:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b409b786b8a4 - stable/14 - freebsd-update: Add some diagnositic information for a failure case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b409b786b8a42b05f006dfe7c0ac70923d5fbc70 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 21:02:07 +0000 Message-Id: <6923764f.325b5.21616ba5@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b409b786b8a42b05f006dfe7c0ac70923d5fbc70 commit b409b786b8a42b05f006dfe7c0ac70923d5fbc70 Author: Ed Maste AuthorDate: 2025-08-28 16:04:06 +0000 Commit: Ed Maste CommitDate: 2025-11-23 21:01:48 +0000 freebsd-update: Add some diagnositic information for a failure case Users report freebsd-update failing with "The update metadata index is correctly signed, but failed an integrity check." Add a hint at which of the cases is failing to help track down the issue. PR: 264205 Reviewed by: dch Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52222 (cherry picked from commit af4ba95daf75cf1b1624dd57038cfaa3ed2753e7) (cherry picked from commit d653eca0ef889a8e3fa1e370d2b3ce7b031441a2) --- usr.sbin/freebsd-update/freebsd-update.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index a9bda574713c..cf5f6373a75c 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1349,7 +1349,7 @@ fetch_metadata_index () { fetch_metadata_bogus () { echo echo "The update metadata$1 is correctly signed, but" - echo "failed an integrity check." + echo "failed an integrity check ($2)." echo "Cowardly refusing to proceed any further." return 1 } @@ -1360,7 +1360,7 @@ fetch_metadata_index_merge () { for METAFILE in $@; do if [ `grep -E "^${METAFILE}\|" ${TINDEXHASH} | wc -l` \ -ne 1 ]; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "${METAFILE} count not 1" return 1 fi @@ -1383,7 +1383,7 @@ fetch_metadata_index_merge () { # specifically grepped out of ${TINDEXHASH}. fetch_metadata_index_sanity () { if grep -qvE '^[0-9A-Z.-]+\|[0-9a-f]{64}$' tINDEX.new; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "unexpected entry in tINDEX.new" return 1 fi } @@ -1400,7 +1400,7 @@ fetch_metadata_sanity () { # Check that the first four fields make sense. if gunzip -c < files/$1.gz | grep -qvE "^[a-z]+\|[0-9a-z-]+\|${P}+\|[fdL-]\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid initial fields" return 1 fi @@ -1411,28 +1411,28 @@ fetch_metadata_sanity () { # Sanity check entries with type 'f' if grep -E '^f' sanitycheck.tmp | grep -qvE "^f\|${M}\|${H}\|${P}*\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type f entry" return 1 fi # Sanity check entries with type 'd' if grep -E '^d' sanitycheck.tmp | grep -qvE "^d\|${M}\|\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type d entry" return 1 fi # Sanity check entries with type 'L' if grep -E '^L' sanitycheck.tmp | grep -qvE "^L\|${M}\|${P}*\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type L entry" return 1 fi # Sanity check entries with type '-' if grep -E '^-' sanitycheck.tmp | grep -qvE "^-\|\|\|\|\|\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type - entry" return 1 fi