From nobody Mon Feb 26 15:36:09 2024 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 4Tk4TQ0kNzz5BbtZ; Mon, 26 Feb 2024 15:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tk4TQ0Drtz4KSR; Mon, 26 Feb 2024 15:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708961770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z011T0EMkTNSvzKuYAfLunJuBlVf7ObPfBxe35A9h9Q=; b=ARfsOX6KY0J380fShfM38aa7cIgIj8av+ORNRqy/O/Q4krtsJ9n6AGC4WG97YDUQTAqCuP TrkyoN9Uu04GVw+9d8/B2hytzBmC0YhvR4MLaurfNDow9bwhGQk29pBU409PHlr3M2nngG 8+YEtTZJg3ZhezDpp8ZDUQ/eKm8HN9HWt5m+qq6UfyTbKdDYXdR4ko7o50UWtMHGKQk9R5 UG81SKJ/0f3kQ6mdpnvTkVJ0s28Eb716w/DRp9P4GOxVq6WLWV5JOAbnOSxDci9btIuDm6 KMy0YDxGN6ls15LRPsxl1JGctW8cXw9iGf8y6JadH5KAYuHkh96pGBESSHF6dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708961770; a=rsa-sha256; cv=none; b=obJS1hjKq45Nr02CKCd4Gy2CSs/xs/KQqLr/JkWPQTawWlrR6ODW70+v09OxS/EhDt07hF 8ZvCpDDvEH8K0GlLMGLp0+UgD/0iSkWPXrPSd/HMYzqiy0tLB5ITskt/ujAIQa78euyJta 2k8q1BMEOIgQOaUVEil01okgCHspqeuxdKLYVAoBvpSOvvYmc9GzsNBqvZ9IGaZJ877Obu DJ1nkRIdZteIL0W4iA5tVQlkzlsnPM1Er83D+qscYvPFPJ4ct/50PAHmYt22pK2clG6tao BypqZujTuBcGRXoNI2uX9ITOSd8P/vDiOCpQpqO/RsW++3pY/BCnR2v/nzRsOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708961770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z011T0EMkTNSvzKuYAfLunJuBlVf7ObPfBxe35A9h9Q=; b=rIA10wHPXt804K+kgN0UmaAammixnG+0edbocp1oPzeO8MjjnGB1NsHDJPfYsd7llMxYPx JVce0NYMigJ0Zw7c9/xU9L+rtGtNHgp4s/61vv/l799xWvUZA22EIpN/nPGaCoffRBO4eB 5wmu64W97WwYZIMNqUcIq42TZGcB+KdLZ8lSWGEiKFpyizDKmg3LjvFnB8T2sivM0pvUXV mTvISDJiNNLS3UtoLpBz4SPl3dGVCFO0vrHuCDyROvjiqJu6Gkr30YYau8p4JqhLGreVlB A8GWVQ2yYTQ399soM0+ZQTMypI3I1DuPhOIhfePQsAIyhl6PivqTU5nBi1MngA== 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 4Tk4TP6RfXzZQl; Mon, 26 Feb 2024 15:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QFa9Q6022277; Mon, 26 Feb 2024 15:36:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QFa9JX022274; Mon, 26 Feb 2024 15:36:09 GMT (envelope-from git) Date: Mon, 26 Feb 2024 15:36:09 GMT Message-Id: <202402261536.41QFa9JX022274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7a3d7b29f83e - stable/14 - release: de-duplicate arm.subr fstab logic 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a3d7b29f83ef8330978f6ccc3069df3e3f718db Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7a3d7b29f83ef8330978f6ccc3069df3e3f718db commit 7a3d7b29f83ef8330978f6ccc3069df3e3f718db Author: Mitchell Horne AuthorDate: 2024-02-14 15:11:41 +0000 Commit: Mitchell Horne CommitDate: 2024-02-26 15:35:47 +0000 release: de-duplicate arm.subr fstab logic These days, the entries are the identical for GPT and MBR. Reviewed by: manu, karels, imp MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43847 (cherry picked from commit 94b86c12f14e69ace1bffe23c15c77a7def23216) --- release/tools/arm.subr | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 2a3a278fbee6..6c53724ed52f 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -199,18 +199,10 @@ arm_install_base() { echo '# Custom /etc/fstab for FreeBSD embedded images' \ > ${CHROOTDIR}/${DESTDIR}/etc/fstab - if [ "${PART_SCHEME}" = "GPT" ]; then - echo "/dev/ufs/rootfs / ufs rw 1 1" \ - >> ${CHROOTDIR}/${DESTDIR}/etc/fstab - echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \ - >> ${CHROOTDIR}/${DESTDIR}/etc/fstab - fi - if [ "${PART_SCHEME}" = "MBR" ]; then - echo "/dev/ufs/rootfs / ufs rw 1 1" \ - >> ${CHROOTDIR}/${DESTDIR}/etc/fstab - echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \ - >> ${CHROOTDIR}/${DESTDIR}/etc/fstab - fi + echo "/dev/ufs/rootfs / ufs rw 1 1" \ + >> ${CHROOTDIR}/${DESTDIR}/etc/fstab + echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \ + >> ${CHROOTDIR}/${DESTDIR}/etc/fstab echo "tmpfs /tmp tmpfs rw,mode=1777 0 0" \ >> ${CHROOTDIR}/${DESTDIR}/etc/fstab From nobody Mon Feb 26 23:18:25 2024 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 4TkGkp2p3kz5BtFB; Mon, 26 Feb 2024 23:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGkp0g5jz4TDm; Mon, 26 Feb 2024 23:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kghbs2HnTfGuXhvnjzWwOkKjhnrvbHcbb5FAAvpM4o=; b=MGfAhicuq2fON0t+Rc2nepkXRqlg34KN1sAQQi0wP/IJqRoeMH1rTPNEN5nqtWdxTQoMTd ATlkV7ygu2mlllbmXblZFwyRmx4vDo3P+S9gJ1E/YI4i9P4QsipUMvSa19+toC/8UfFx5e O8uTp24JPL6IeQZwjnvaxichhiY/VBWFwktFMTrgJnBg5cWbVdYC6CkzMEvCKteMNIQaJu FGMMsa5B9zOV3VpNdXkkEugUk4y4KqLXDfN1IQSA1p7+60eGWxSUTbWfRNIfx+RDIjFj/I 9psaY87kBhSQc1hYDHQWC4B/DgiqX0nb0SNfQfLNYRqhYwqYPcgU/Fp/2uh8oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989506; a=rsa-sha256; cv=none; b=yGoQ4vkhkR+cyXHNNG2iloGamRHpfQpgndW6gjM5Xkb+tIPqDqv29sL+W3hTwdAWT/Kdiw +qAIU/7N9AlCWNTqxhMb8j7S1QeAWVns1obGXQtxxb38oGbQPgbSEroWHgqA5P5x/I0FNz IiF2R2VNtXS2MU527f2y+Qfm0LG/HROfBT/tnc45f12a2izE47yy87U1lyYpXAIRLzU0Bl jcWohabS0hbozxjvchl4GvrhWZ5yG6Nj2TxR3ctkt9I0QjQhuVYVBTNd6BKTY+yfT4qfXg toayh10Nu+skJ4QkBUM/XbvT6ClzBuslBGYJciv+RcUVjg5VkavW1AKIL3sXcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kghbs2HnTfGuXhvnjzWwOkKjhnrvbHcbb5FAAvpM4o=; b=NWdxiX0Rf+3bk9LJrK1PhVKh/2+KZRY7OGzSAlSBEuUenLv5pm9Q7q0ACfXqq150baIXJ+ t0hTuSFgWKilfb5kv9u9w/aVKxQKljST/cPZvE6g5d3SJ3lt4kc1384oYTmGwp7RLmjSmb nNA25p+Vc5YoPeNd+Iru/D/nA0byuSmP7r4MfTtWTCS/gPQLnAIL1bx3bj9CBKEvcgJtD3 eX66NStbFH6ovSkgAqTYo44Fxw2MsoKcU2Mj8Xbbn1Jd9/Y/XHA5u5kmCZRMYB5kVC8UMH oxQfcNYgaAhCA0/1St2dX75fDeVfBY4F1tnlwKWFd+z0Inh9l7btWKfXdCcA8A== 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 4TkGkn6qp3znmZ; Mon, 26 Feb 2024 23:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNIPnd012551; Mon, 26 Feb 2024 23:18:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNIPcp012548; Mon, 26 Feb 2024 23:18:25 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:18:25 GMT Message-Id: <202402262318.41QNIPcp012548@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: 26db5b3e638e - stable/14 - Remove MOVED_LIBS handling from list-old-libs 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 26db5b3e638ee09a21b6554003a2257fd6e285a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=26db5b3e638ee09a21b6554003a2257fd6e285a4 commit 26db5b3e638ee09a21b6554003a2257fd6e285a4 Author: Ed Maste AuthorDate: 2023-10-16 12:46:31 +0000 Commit: Ed Maste CommitDate: 2024-02-26 23:18:08 +0000 Remove MOVED_LIBS handling from list-old-libs In 922337e8d398 I added MOVED_LIBS into list-old-files, so that delete-old-files would remove the old /usr/lib/libc++.so.1 as soon as possible (after the library moved to /lib). I left it in list-old-libs in case a user updated their src tree between delete-old-files and delete-old-libs. Now that some time has passed, tremove the redundant MOVED_LIBS entry. PR: 272642 Sponsored by: The FreeBSD Foundation (cherry picked from commit f38bad0ab0fca9b1f665b2ba79098edf993c0854) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2177ffb7cb27..2c3d96360129 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3459,7 +3459,7 @@ check-old-files: .PHONY list-old-libs: .PHONY @cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V "OLD_LIBS:ts\n" -V "MOVED_LIBS:ts\n" \ + -V "OLD_LIBS:ts\n" \ ${_ALL_libcompats:@v@-V "OLD_LIBS:Mlib/*:S,^lib,usr/lib$v,:ts\n"@} \ ${_ALL_libcompats:@v@-V "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib$v,:ts\n"@} \ ${_ALL_libcompats:@v@-V "OLD_LIBS:Mlib/casper/*:S,^lib/casper,usr/lib$v,:ts\n"@} | \ From nobody Mon Feb 26 23:22:42 2024 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 4TkGql035Qz5BtQP; Mon, 26 Feb 2024 23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqk6Nmtz4ThJ; Mon, 26 Feb 2024 23:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lHojr0wolv2XV+gxsoL+UKVzXhyYtgZpjvStqwmoe7w=; b=e0p2k5HZPl3LKrvObfKbJboYTm4JAgCRMtQVjNdn+4LtfpafcZGz745FGBCyLMxEY1USrV WAvj23xrchMdFPuBeAeV07gE3JFH4c4KEy8GEG8DtX+VF8heEUu4vKOPiXUkk+I9yyi7yC wRCeTsJewvpfsmlfMzmAeBvbjIqUcu2eGs3IVNK6DflFm51UEOGMSsxJN3tO9BWArxdSvA SuBIJhChSiGAuoE2RPkJ0uwX280nCzg91knrum/jeZm3JF+Sepu15+iwxBcIwh8tcN1G9O 38PL/I23LFnY4Xjm2DA9+zEkegcAROV017Qza/xHqVKaERSwhCvf0+0QZYBEMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989762; a=rsa-sha256; cv=none; b=JQGbt5lknNvzIaCShYOArsPUwgHkdPK7FhQd1Em29f10FTK94bVJ8uhHiotpWBehvThDAk KA9iYcNDWeAfEy/phLdooqQwmJv2zK648NrqDBL6pMWM5pq9Kd72POFRBMB40WOA3zb7vD 7NWV/rPEDhe8GpKUeZ5HRxX2RGKGlHqEstacv56kr5C8Gh1QIHfX18mXWgAjvEM1pMXznW fiycRhkkFiX14LKkmadXNEKsub9dhjve1XDLu7pvHAF65EcKHxRmR+C6vQjJ2ecuX7McJ+ mUh1smjboXMJdkiPgiGy0Mo9aypeF7MML1lNxGLE+/n4V/y449jg7PAROGWOJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lHojr0wolv2XV+gxsoL+UKVzXhyYtgZpjvStqwmoe7w=; b=nFP5j4QbCf6G4v0tr1wnvFViOpfOE49dbpjMsRbfkvucN9RWik8jSiWZdFiZbiX4aohmk2 qN1oXuGF+9NPnmWELDoPVYarlruDxdmXBcOuWOAwk1ThDs2JCKnOX3FvCiK+alQgxTLRM3 P9dMplgA5ayQt89P8d6Ek9NP5jKsXAmJMQcYXFsXRUuuJdl4LAW0dDV3VQRmhttkrNAdHM X+TSRMUlRXTBIX9394VKrlKrqgJcS3h48XXD+0Li30BYjFETm82HDiXPwM9LGyzduBj4oM Q36HI29K2LFUd4SRVwbKR0jRyudA9l8nHjDOOjhfrNIn5OqutNxB0XPWRJXfDQ== 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 4TkGqk5R3PzpJw; Mon, 26 Feb 2024 23:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMg3u028254; Mon, 26 Feb 2024 23:22:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMgiu028251; Mon, 26 Feb 2024 23:22:42 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:42 GMT Message-Id: <202402262322.41QNMgiu028251@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: 73db76a48c6a - stable/14 - mixer.8: Add terse example for increasing volume 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 73db76a48c6a6afa571f6fc8b7011f9349bb643c Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=73db76a48c6a6afa571f6fc8b7011f9349bb643c commit 73db76a48c6a6afa571f6fc8b7011f9349bb643c Author: Alexander Ziaee AuthorDate: 2024-01-12 17:12:19 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:30 +0000 mixer.8: Add terse example for increasing volume Reviewed by: jhb Pull Request: https://github.com/freebsd/freebsd-src/pull/1044 (cherry picked from commit 246e0457d93071ffd901c78e3ee7badc5f51bd4c) --- usr.sbin/mixer/mixer.8 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index 6d553a5934f4..10a461d91693 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -19,7 +19,7 @@ .\" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN .\" THE SOFTWARE. .\" -.Dd April 29, 2022 +.Dd January 12, 2024 .Dt MIXER 8 .Os .Sh NAME @@ -218,6 +218,13 @@ opens when the option has not been specified. .El .Sh EXAMPLES +Increase the volume for the +.Cm vol +device of the first mixer found by 5%: +.Bd -literal -offset indent +$ mixer vol=+0.05 +.Ed +.Pp Change the volume for the .Cm vol device of the From nobody Mon Feb 26 23:22:43 2024 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 4TkGqm24qSz5BtbK; Mon, 26 Feb 2024 23:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqm0FdDz4TbS; Mon, 26 Feb 2024 23:22:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9psMrBTk69uwzaYWAuQDJotDsjMsLBw+I+KEEfye8So=; b=dVUywCoM9E+9sE1cDPW9GwYQhqFSTnnuNMVyMH4d/7b1mWzcIDPQlis5z9mG9SrbA6l6de ZkvX6uvt/lOLtWpnmpyp4mRNQZDSpVoP6VINY7A6ff1Ebge9OWe2Czhu7achs2aqWgfm0L 7AK7q3wv7ohoLV9v9tILLf32A52T/oFE1a7ovk+GwK+MEhee7yrNExASm5PPpJtk8e9g/F 8BH6HyRG1OODgFsXmH1yZIhtMb/czSw+jM/djIC5V7eHHy8Kvin3Xeaj462pm8sCMIkfsl Qnx2V26UwO0bbj91kvz3BptztjyM6zdmctZsKROoXtkGHbKx5aQ5VCNxipOixg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989764; a=rsa-sha256; cv=none; b=tW7xoxL91PPWJq2Yg9ngZL9YrnQrn1SvXKDP+Us2Vd/zA20OaJ/85FLN0+Vn1GKANJz1F5 NoPtx68BToTZikhGeZTiqpoH2WW/WqRMmSBBnEXSCKcZsJsf+aSwjGz4UDPmjpRegDwRjN eXZUNAD9ld3X87dfZ7vEgiO/j1vFZH/BUT/Q0+xRjJyc+WOZSevkC6oVW1xzwyr8P1XSUo Pxa8UFIPe9P+os+rWJ7KRV3kF5DwSvKy9Wf1K8Ci+TiRdxVDw/tqZd8i66qJTHv9YB/Y3C pNELAa10JsUszaGNs+wRrJNzURIBhl3/dpq2ulaFPsnVU5ycJWPG2VWjuBWR6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9psMrBTk69uwzaYWAuQDJotDsjMsLBw+I+KEEfye8So=; b=A1AbEdC3PWa42+Urh4U85rSjHHb8t6hxrrOUz9ysldqxKimYw5ecIwamCy00+rWrM2iPxc SnuA6RRr6wyhllgFCU/ON9klVVpjoNJv0KVQ4UuHsK1hhDn1pO8I0xv9cInpx1bgl4+mUg 1rYX1RcK4VArfLAFRpFf6YqDL0U4MGufzQ6/8r08WJNBvp1Zfv6jTbLobt4j3mfkaSddSV M7vFEU0oq4Zef++NCePezhwgpj4gRh9+Zn2Ll+Vy9GwHfQTdeho7QZFHlHSbdYyNcv8Uzu LGGBWIK9+OVVU3BZLh1rVHVfhHz5rPFJYRT8oG/axV/P58nI9O+pU1nKUJEAig== 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 4TkGql6QYjznnD; Mon, 26 Feb 2024 23:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMh0Q028302; Mon, 26 Feb 2024 23:22:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMh90028299; Mon, 26 Feb 2024 23:22:43 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:43 GMT Message-Id: <202402262322.41QNMh90028299@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: 750a5298fee0 - stable/14 - mixer(8): Improve error messsages and warnings 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 750a5298fee0bd38bf5c9ec98554e2e3617b0294 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=750a5298fee0bd38bf5c9ec98554e2e3617b0294 commit 750a5298fee0bd38bf5c9ec98554e2e3617b0294 Author: Christos Margiolis AuthorDate: 2024-02-12 10:58:55 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:30 +0000 mixer(8): Improve error messsages and warnings No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, imp Differential Revision: https://reviews.freebsd.org/D43793 (cherry picked from commit 09ba07011a627e3ea05e0be8ee6db76fd2371540) --- usr.sbin/mixer/mixer.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index bb868fb5ca9b..043c8c412857 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -66,9 +66,10 @@ main(int argc, char *argv[]) aflag = 1; break; case 'd': + errno = 0; dunit = strtol(optarg, NULL, 10); if (errno == EINVAL || errno == ERANGE) - err(1, "strtol"); + err(1, "strtol(%s)", optarg); dflag = 1; break; case 'f': @@ -92,11 +93,11 @@ main(int argc, char *argv[]) /* Print all mixers and exit. */ if (aflag) { if ((n = mixer_get_nmixers()) < 0) - err(1, "mixer_get_nmixers"); + errx(1, "no mixers present in the system"); for (i = 0; i < n; i++) { (void)snprintf(buf, sizeof(buf), "/dev/mixer%d", i); if ((m = mixer_open(buf)) == NULL) - err(1, "mixer_open: %s", buf); + errx(1, "%s: no such mixer", buf); initctls(m); if (sflag) printrecsrc(m, oflag); @@ -111,7 +112,7 @@ main(int argc, char *argv[]) } if ((m = mixer_open(name)) == NULL) - err(1, "mixer_open: %s", name); + errx(1, "%s: no such mixer", name); initctls(m); @@ -212,7 +213,7 @@ initctls(struct mixer *m) } if (rc) { (void)mixer_close(m); - err(1, "cannot make controls"); + errx(1, "cannot make mixer controls"); } } @@ -315,7 +316,7 @@ set_dunit(struct mixer *m, int dunit) return (-1); } if (mixer_set_dunit(m, dunit) < 0) { - warn("cannot set default unit to: %d", dunit); + warn("cannot set default unit to %d", dunit); return (-1); } printf("default_unit: %d -> %d\n", n, dunit); From nobody Mon Feb 26 23:22:46 2024 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 4TkGqp6Vx2z5BtKw; Mon, 26 Feb 2024 23:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqp2DNDz4V1H; Mon, 26 Feb 2024 23:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XjsjHFstKB7MR7MWe3iD0Fkm3phVG5goJrGIYqputM4=; b=TX/Tjw7iJP0vKIHVMtLpSSZQ5aDMK5ff4jdGf87BuS+lGk1yRQiutLIb0leKQHLHJg5O4p 7dVE8YogzyIWfVhePAk+iXlrVMWpojkkLS05OZqTzPKWmwb2jnijgzuMekBdB9S2tdx//f 5qNcO14rBRkcetmriF+fzTG5Tpc1iokjqeShhJqRoJqJtNchgB6fHCvL/FSr1Ykzn7yTi0 afssJpkOFbLH4G0Ir2fxDSCOdkdEnqF7N6GjdGK4Cl0y8sHHgupXMAP0vfJZtD/nPOLnlG Sd6yayuYatwyXZBbxVZhnFPwbPrpx7VhXBTa1SQ66cQqFQos3D/SR/1h0qgd0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989766; a=rsa-sha256; cv=none; b=uFAGZda6TXZp++obfxDf7R+FMV/7/JXEYnjG3Mt3jpBRhysdnfjMmATchHRf0WqqxYEkzG qFFT8d7P4RlEgnfMk4ZqPTzW7iBj2oS5UrVyRijM0BJ8Fwsxq5L71xni4nuxpQHNksCgbL E+9emiElNhrCwCbqHloRGDXiSwxtkrOR+eu29+vDwtwvDGI9aArRECYTASXfJLvqgtG1v2 UPNSco/elGhY4MNUxfTEbkosJpKWoZre1wYu+a/tgqoZ5uB2MYx57kohW0TAWNKq6oUEQI 0Mtlzc0gbKM6mjSRGrpNyJOtOL+PRsL0ctGBKBjHB+jMp6qMCsrqKbvnA0Lr0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XjsjHFstKB7MR7MWe3iD0Fkm3phVG5goJrGIYqputM4=; b=wIBjCnHXuEr5pju67EJLtSlZJ1bBtMbJyGwpNC8VbEGNAN7jvIHortXQYsjCDljjvZOCn7 yvNo1R/948NXs44WQpqaHIbdOe+ETf+kb0hxfWPZXTuZ+6vJiO+ZhxI/32A6ZuWPvc3AyA lAYdnqykKchD1TvNnBPmRBjLuiOIytM9I79NmdOTc4o8ZeVqURTLztY8z6IuUeaN0NVR/R DOHdAKyBBgWrqhVY3yaBiueR6fAqcOIkBGh0gYBA6XjdOs22eR4+6963JzkGUXqBZpFKI5 awNA26QNSJo5lUkdbKlisYKzyDoGhDwcM1WkVnydQKsQl0gV42Q9GhKJJERVrA== 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 4TkGqp1LQTznsp; Mon, 26 Feb 2024 23:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMk7c028413; Mon, 26 Feb 2024 23:22:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMklm028410; Mon, 26 Feb 2024 23:22:46 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:46 GMT Message-Id: <202402262322.41QNMklm028410@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: 23269774b052 - stable/14 - mixer.8: Fix wrong sentence 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 23269774b052dc996c18e47450d8dc99646b2e6f Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=23269774b052dc996c18e47450d8dc99646b2e6f commit 23269774b052dc996c18e47450d8dc99646b2e6f Author: Christos Margiolis AuthorDate: 2024-02-12 10:59:16 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:31 +0000 mixer.8: Fix wrong sentence 246e0457d93071ffd901c78e3ee7badc5f51bd4c ("mixer.8: Add terse example for increasing volume") mentions that the example changes the volume of the "first mixer found", while the example shows how the change the volume of the current mixer's "vol" device. Re-phrease sentence to reflect the actual behavior of the command. Also, improve the example by using the % operator, instead of hardcoding 0.05. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D43795 (cherry picked from commit 7bd14d09a92a63f217ccee92e7fc9a1d6d60b387) --- usr.sbin/mixer/mixer.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index 5750b81c98c5..db0ec5f23a0c 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -223,11 +223,11 @@ List all available audio devices in the system: $ mixer -a | grep ^pcm .Ed .Pp -Increase the volume for the +Increase the .Cm vol -device of the first mixer found by 5%: +device's volume by 5%: .Bd -literal -offset indent -$ mixer vol=+0.05 +$ mixer vol=+5% .Ed .Pp Change the volume for the From nobody Mon Feb 26 23:22:47 2024 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 4TkGqq61dQz5BtH0; Mon, 26 Feb 2024 23:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqq3Hdjz4V62; Mon, 26 Feb 2024 23:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIJqmChev0P+Fp4Xp4dzJFEXD3JDWcO9SUQ4GzKt0GA=; b=pEDCsQnm94/2vz+j6PC39fauQky5M1fQSmnDk4H2fcLZiVE100AgSqQr1OJKtSGu14571Y /WD1jGXZR3mceOB83xZdYNhnIQ3r+40qds2aLX38rG3DwEsF/iikAU74b3JUZXX9qETXmX CLbD0foyzfjfZJog4iTJ2YqmZlVdW64dQfL5iSfRQ1/y2/TI8uQdak+Sw2h8lGMSYiTjNF Bf18uB6WF584RIgkfHChGu5z3sQJ44fVV7ajHmW3+BgSDLba+id13KonsTbUAolu2TXedh Ejrl/8Fyk/r/kIuhg3KRHDsUT7meztR0D23F2K/T/Jr3RTTGKKObrcj2iCaJ4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989767; a=rsa-sha256; cv=none; b=uq5II4UW5M9vpwsf7kLG1DPf4w4pXw/fVCUv+8u2nIztcNnFgH/Z6B0JXoiuRj0crdeuMW s76MN2IiH32ZTB+sY7cTef/7g7bcCRQoA4WLJwG5hImWWkcv6S+rthE5tRmYugZBgLBUxD DvqYhbtvgiYzATreoROYKM6EGgTryePulro8n+e+NdUkUw89Nh/yONNXCxBl5XkJBUNxOt /hNxjDI7Il+oKDlxrDiyzhpxHLnEKsXlxcrl57vUlr6jEl4ysvVbmRY5v/JdCiqg9YCvzm fM7XK7gGtnUdqveGXsMaRAS0/3JXtNwtMI5RjEWDOZbxiaffzZCGG2MbaxCjIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIJqmChev0P+Fp4Xp4dzJFEXD3JDWcO9SUQ4GzKt0GA=; b=bp6gQ9D6X3oylAQLQDWsGVg2y1iIl6DVRay5NyPGbNUwHMTc/3z8T21GdKgPnT44tUJf/8 5rf6dNr7+NyfGEyXDnfWFcYY8SNSby1iUzrtXvQqWjtTo5qNwOZ6tJATe3N7XbCUZiLGR9 84FZVW8DNQMWujIn5Cify7UFctF2f+3CmraXsXsoecWG0IGIGfTBOhCMKdKMgSlc+4bXsK bdiRcWy34tNIip8lya2/lgKw8K8GyHU475GyJ/3sq2tJKn0ooC0qaeszlFpzM9cUF2a6em z9fWDTPjEq/l+tHBFMBd1qfTExcXuoMzlp24HRaR6HmPXyBnQEFI4VXxZgX0tg== 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 4TkGqq2MH7zp4Q; Mon, 26 Feb 2024 23:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMlLb028458; Mon, 26 Feb 2024 23:22:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMlB6028455; Mon, 26 Feb 2024 23:22:47 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:47 GMT Message-Id: <202402262322.41QNMlB6028455@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: 96a80ca9ba72 - stable/14 - mixer(8): Improve mute and recsrc controls 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 96a80ca9ba727a36e311b18d5f94626cf27355c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=96a80ca9ba727a36e311b18d5f94626cf27355c9 commit 96a80ca9ba727a36e311b18d5f94626cf27355c9 Author: Christos Margiolis AuthorDate: 2024-02-12 10:59:22 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:31 +0000 mixer(8): Improve mute and recsrc controls The input options of "dev.mute" (+, -, ^) and "dev.recsrc" (+, -, ^, =) are quite cryptic. Allow the input to also be an actual description of what these options do. + -> add (recsrc) - -> remove (recsrc) ^ -> toggle (recsrc, mute) = -> set (recsrc) 0 -> off (mute) 1 -> on (mute) Also, deprecate the use of the symbol options in the EXAMPLES section of the man page, by using the new descriptive options. In the future, we might want to get rid of the symbol options altogether, but preserve backwards compatibility for now. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, imp Differential Revision: https://reviews.freebsd.org/D43796 (cherry picked from commit cc7479d7dc9b895c0a2f4d3805315437e03d0cf6) --- usr.sbin/mixer/mixer.8 | 33 +++++++++++++++++--------------- usr.sbin/mixer/mixer.c | 52 +++++++++++++++++++++++--------------------------- 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index db0ec5f23a0c..75c6a81e3a55 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -114,7 +114,9 @@ with one of the available devices): .Oo Cm \&: Oo Cm \&+ | Cm \&- Oc Ar rvol Oo % Oc Oc .Xc .It Ar dev Cm .mute Ta Cm 0 | 1 | ^ +.It Ar dev Cm .mute Ta Cm off | on | toggle .It Ar dev Cm .recsrc Ta Cm ^ | + | - | = +.It Ar dev Cm .recsrc Ta Cm toggle | add | remove | set .El .Sm on .Pp @@ -150,14 +152,14 @@ The .Ar dev Ns Cm .mute control (un)mutes a device. The following values are available: -.Bl -tag -width = -offset indent -.It Cm 0 +.Bl -tag -width "xxxxxxxxxx" -offset indent +.It Cm 0 | off unmutes .Ar dev -.It Cm 1 +.It Cm 1 | on mutes .Ar dev -.It Cm ^ +.It Cm ^ | toggle toggles the mute of .Ar dev .El @@ -174,22 +176,23 @@ To modify the recording source you can use one of the following modifiers on a .Sy rec device: -.Bl -tag -width = -offset indent -.It Cm ^ +.Bl -tag -width "xxxxxxxxxx" -offset indent +.It Cm ^ | toggle toggles .Ar dev of possible recording devices -.It Cm + +.It Cm + | add adds .Ar dev to possible recording devices -.It Cm - +.It Cm - | remove removes .Ar dev from possible recording devices -.It Cm = -sets the recording device to +.It Cm = | set +makes .Ar dev +the only recording device. .El .Sh FILES .Bl -tag -width /dev/mixerN -compact @@ -250,16 +253,16 @@ $ mixer mic.volume=+0.10:-0.05 Toggle the mute for .Cm vol : .Bd -literal -offset indent -$ mixer vol.mute=^ +$ mixer vol.mute=toggle .Ed .Pp -Set +Add .Cm mic -and toggle +and remove .Cm line -recording sources: +from the recording devices: .Bd -literal -offset indent -$ mixer mic.recsrc=+ line.recsrc=^ +$ mixer mic.recsrc=add line.recsrc=remove .Ed .Pp Dump diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 0c0c37ccb2bc..83e97df19116 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -413,26 +413,24 @@ mod_mute(struct mix_dev *d, void *p) m = d->parent_mixer; cp = mixer_get_ctl(m->dev, C_MUT); val = p; - switch (*val) { - case '0': + if (strncmp(val, "off", strlen(val)) == 0 || *val == '0') opt = MIX_UNMUTE; - break; - case '1': + else if (strncmp(val, "on", strlen(val)) == 0 || *val == '1') opt = MIX_MUTE; - break; - case '^': + else if (strncmp(val, "toggle", strlen(val)) == 0 || *val == '^') opt = MIX_TOGGLEMUTE; - break; - default: - warnx("%c: no such modifier", *val); + else { + warnx("%s: no such modifier", val); return (-1); } n = MIX_ISMUTE(m, m->dev->devno); if (mixer_set_mute(m, opt) < 0) - warn("%s.%s=%c", m->dev->name, cp->name, *val); + warn("%s.%s=%s", m->dev->name, cp->name, val); else - printf("%s.%s: %d -> %d\n", - m->dev->name, cp->name, n, MIX_ISMUTE(m, m->dev->devno)); + printf("%s.%s: %s -> %s\n", + m->dev->name, cp->name, + n ? "on" : "off", + MIX_ISMUTE(m, m->dev->devno) ? "on" : "off"); return (0); } @@ -448,29 +446,26 @@ mod_recsrc(struct mix_dev *d, void *p) m = d->parent_mixer; cp = mixer_get_ctl(m->dev, C_SRC); val = p; - switch (*val) { - case '+': + if (strncmp(val, "add", strlen(val)) == 0 || *val == '+') opt = MIX_ADDRECSRC; - break; - case '-': + else if (strncmp(val, "remove", strlen(val)) == 0 || *val == '-') opt = MIX_REMOVERECSRC; - break; - case '=': + else if (strncmp(val, "set", strlen(val)) == 0 || *val == '=') opt = MIX_SETRECSRC; - break; - case '^': + else if (strncmp(val, "toggle", strlen(val)) == 0 || *val == '^') opt = MIX_TOGGLERECSRC; - break; - default: - warnx("%c: no such modifier", *val); + else { + warnx("%s: no such modifier", val); return (-1); } n = MIX_ISRECSRC(m, m->dev->devno); if (mixer_mod_recsrc(m, opt) < 0) - warn("%s.%s=%c", m->dev->name, cp->name, *val); + warn("%s.%s=%s", m->dev->name, cp->name, val); else - printf("%s.%s: %d -> %d\n", - m->dev->name, cp->name, n, MIX_ISRECSRC(m, m->dev->devno)); + printf("%s.%s: %s -> %s\n", + m->dev->name, cp->name, + n ? "add" : "remove", + MIX_ISRECSRC(m, m->dev->devno) ? "add" : "remove"); return (0); } @@ -493,7 +488,8 @@ print_mute(struct mix_dev *d, void *p) struct mixer *m = d->parent_mixer; const char *ctl_name = p; - printf("%s.%s=%d\n", m->dev->name, ctl_name, MIX_ISMUTE(m, m->dev->devno)); + printf("%s.%s=%s\n", m->dev->name, ctl_name, + MIX_ISMUTE(m, m->dev->devno) ? "on" : "off"); return (0); } @@ -506,7 +502,7 @@ print_recsrc(struct mix_dev *d, void *p) if (!MIX_ISRECSRC(m, m->dev->devno)) return (-1); - printf("%s.%s=+\n", m->dev->name, ctl_name); + printf("%s.%s=add\n", m->dev->name, ctl_name); return (0); } From nobody Mon Feb 26 23:22:44 2024 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 4TkGqn3dGvz5Btpt; Mon, 26 Feb 2024 23:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqn11q0z4Tp5; Mon, 26 Feb 2024 23:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nz684uNhirWEoy5ho8nTAQpLxKJtJrd5qW9kMYap/vI=; b=EQj9521ne6xwJA8LImgYlKVb0cG/TuMZSRm5y+eePU1R1J7pc8chq4vP9kxw9NOPSC8fKg rgfPhYvt8QApEx+XO5mfX/7YcXMA4559xeojSemtLs9g2TrswTl74w54MfXokMZXh2FA6H Y8Tc00CMhpYjPlBknVmVM2LRRR68i4BNC0QKu/nJfVC+GYDrCGJy0rpLQMpHuddHqDb82h mhwJzP9IBvHFEPUfbfhWd6BPma/7WrrPoAnx0/CaFYRZEx3qGnr6r0mT2w4CXPqn6vthJN buiqhVQoUDZJQwYixM2msiD/uT32GT7iEUCUu44ZmrLergSm3wi18+0ukfIBmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989765; a=rsa-sha256; cv=none; b=pGusoXoLubPYmGR+v93TxSSpn0lHbLHOsSBQQNNGe9056oN4QPsq9QvjyZN3SMCHaM08Eb q03tTfmeu2PXAOS870U530kMGhFADf+QPxhfVW/IWALNHKXfN5rQjpVhqnTX1WIMIZA4aR +rWYqZRH2LkRm3SwSZ9w0R1bgXxpxmpSVJBYuy1LLccqIn6pNH0CX8t1rORwBoY9kR/DTQ hT5d2slHY/k6RgVL0J21iAk5mzybkpQQJNyRW2BkfMIiPdSQvzyl0n0xzXyqXFrmdg1U/J iqCijf/aFA6wbYEFffgocbRVctk6EoTrdMpGRIk13JKtwcmfeaypeEHt8Z/mOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nz684uNhirWEoy5ho8nTAQpLxKJtJrd5qW9kMYap/vI=; b=t/5bBPkoFNlJcPc7zgsYpVAp8LYb3psCLcUpbhEdA2jNyMtO64K/J5Ymeqw8lWFe0hyNEo YJeIWq4i6/ilLuKB9sSS7doA1E4fh/7O+cimhBCNK+O2LYR+apqlqfSxA6zrZ5NfhhcB9G ElytD7YgCc1B0v3yQ3p6zW8Gee24/9SlPe/gv4IELpgdye6WZOlVPIJHse4N+t0w7wGRf4 699r29NIOdormLmDFNzQiIbWReemknQgaXlU3Z8FAOmbaq7j6AAfyWNakSQT8M53G6pZNj 2rlGYQ0qJ30yro2gVYJC9G7iYvIMHaczsX1apDsKCc0bQ9tkuNKh3gXSw+/EEg== 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 4TkGqn07QXznnF; Mon, 26 Feb 2024 23:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMitj028367; Mon, 26 Feb 2024 23:22:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMimO028364; Mon, 26 Feb 2024 23:22:44 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:44 GMT Message-Id: <202402262322.41QNMimO028364@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: 7ff8cd094b73 - stable/14 - mixer(8): Allow full PCM device names as input for the -d option 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 7ff8cd094b7342d0071d7afb40ea2cdcd3359b0a Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7ff8cd094b7342d0071d7afb40ea2cdcd3359b0a commit 7ff8cd094b7342d0071d7afb40ea2cdcd3359b0a Author: Christos Margiolis AuthorDate: 2024-02-12 10:59:02 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:30 +0000 mixer(8): Allow full PCM device names as input for the -d option The -d option is a wrapper around hw.snd.default_unit. Currently mixer(8) expects the option argument to be just the unit's number (e.g pcm0 -> 0). To avoid confusion, allow full device names of the form "pcmN" as well. While here, improve the -d option's description in the man page. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, imp Differential Revision: https://reviews.freebsd.org/D43794 (cherry picked from commit 75be886e58dc237b633104fc9cf8d7d1285e4003) --- usr.sbin/mixer/mixer.8 | 23 ++++++++++++++--------- usr.sbin/mixer/mixer.c | 6 ++++-- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index 10a461d91693..5750b81c98c5 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -19,7 +19,7 @@ .\" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN .\" THE SOFTWARE. .\" -.Dd January 12, 2024 +.Dd February 8, 2024 .Dt MIXER 8 .Os .Sh NAME @@ -28,12 +28,11 @@ .Sh SYNOPSIS .Nm .Op Fl f Ar device -.Op Fl d Ar unit +.Op Fl d Ar pcmN | N .Op Fl os .Op Ar dev Ns Op Cm \&. Ns Ar control Ns Op Cm \&= Ns Ar value .Ar ... .Nm -.Op Fl d Ar unit .Op Fl os .Fl a .Nm @@ -44,16 +43,17 @@ The utility is used to set and display soundcard mixer device controls. .Pp The options are as follows: -.Bl -tag -width "-f device" +.Bl -tag -width "-d pcmN | N" .It Fl a Print the values for all mixer devices available in the system .Pq see Sx FILES . -.It Fl d Ar unit +.It Fl d Ar pcmN | N Change the default audio card to -.Ar unit . -The unit has to be an integer value. -To see what unit values are available, look at the number each mixer device has by running -.Nm . +.Ar pcmN , +where N is the unit number (e.g for pcm0, the unit number is 0). +See +.Sx EXAMPLES +on how to list all available audio devices in the system. .It Fl f Ar device Open .Ar device @@ -218,6 +218,11 @@ opens when the option has not been specified. .El .Sh EXAMPLES +List all available audio devices in the system: +.Bd -literal -offset indent +$ mixer -a | grep ^pcm +.Ed +.Pp Increase the volume for the .Cm vol device of the first mixer found by 5%: diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 043c8c412857..0c0c37ccb2bc 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -66,6 +66,8 @@ main(int argc, char *argv[]) aflag = 1; break; case 'd': + if (strncmp(optarg, "pcm", 3) == 0) + optarg += 3; errno = 0; dunit = strtol(optarg, NULL, 10); if (errno == EINVAL || errno == ERANGE) @@ -194,8 +196,8 @@ next: static void __dead2 usage(void) { - fprintf(stderr, "usage: %1$s [-f device] [-d unit] [-os] [dev[.control[=value]]] ...\n" - " %1$s [-d unit] [-os] -a\n" + fprintf(stderr, "usage: %1$s [-f device] [-d pcmN | N] [-os] [dev[.control[=value]]] ...\n" + " %1$s [-os] -a\n" " %1$s -h\n", getprogname()); exit(1); } From nobody Mon Feb 26 23:22:48 2024 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 4TkGqr6bYQz5BtYH; Mon, 26 Feb 2024 23:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqr40jyz4VC0; Mon, 26 Feb 2024 23:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBIKBS0yfVP3w5J4ozHVjbWqTcnYYYIN63apJ6O+TLA=; b=oomUI0GPahqYefFh4Wlb5z4zLABTTHjsVoJtWv1Fjbc/FtFSedHzcHWRQ0z8SD1gKm3l4a MT36OXkJ42VDndjleiqGhDYNxAHA012wOkXhHyLwp4ARm8N5JzLsQlW66p8EE60y7s+g9I 8ZETSxFUapJ6lIjMkVySRb6+ObBFikTV4LYHYmSRBo7QJoWlkJPe+pABj3mZEsWr3x0lME OwpfEtQykvUku4WBRiYcydMia8ftUUQHm13RS5+W0rFAaZwVIPhMP5Ht0kQlS1Eumdherz kwA0lLWy6OCwOuNY7a2V7ZI3cZT3f5gAbOiQdytGJn5OLPpD2y4FxIWHyoHm6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989768; a=rsa-sha256; cv=none; b=vOICql7/+cchxMfEbFOqd2Wn+aRSqx7MXtoqyU2/Zzqb0thT215eOuiENBmp5PhA8Xwbl2 9HDT/illd36NcvO3i5QQjF5cctraQy5UZ16nDSg5BmMqCBiHZYDUWcF5En9g7LwFNDLJ47 K6H3vcRvbxJ+82Vk+w7ZelpXy607ucbzeFUbYuIWW7ynTm3m4zgWsoZAjjDzhsiQzu7QY6 R0zryGui3JDolTC5kmFxZ6RqSpUVmBaF6/U09ClNORKlaTOXMlvVIPNNyIU8PiOQ8S3SDk lCQRXMgm1JrwTy4Hl8HjsLWmZWvAQmPdog27y5zYpjXKt6+elSzMjkJnYH3KsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBIKBS0yfVP3w5J4ozHVjbWqTcnYYYIN63apJ6O+TLA=; b=VbenGsisc42lcaLKqiLN4TUcU8UoiSZW88ixcCqrcTbBQq9jAiZuXQSugCrVXdz3/DjRuM mBYiVJV4EGXD0Ru/0dGMyS/slQPySwjA7JNN4XCbpZGX0oeB/bFIxbw7+KR3g4ZUXEz515 1cpAFkwBSXjih5rj6A0HARqsLOOFI/dkulqZ7rOzR45SgMNZRGGBwWpmyvnTQK5xBM/fdR oOFzhGzNqJ3SSphQEBBbBrwnrjM2fl9rEH2kHIDzwHNX8ETmaOeBJNxKRvVrX5b6s9IKe9 9SHpjrlfoI0HBtZ2gt9lLqZhS51SJXOGhrZrm37Zb4/gqBdup6DhMTbgXbDJDw== 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 4TkGqr3463znrK; Mon, 26 Feb 2024 23:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMmXu028515; Mon, 26 Feb 2024 23:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMmKL028512; Mon, 26 Feb 2024 23:22:48 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:48 GMT Message-Id: <202402262322.41QNMmKL028512@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: 6ae4ed11c4d3 - stable/14 - mixer(8): Use new mixer if we change the default unit 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 6ae4ed11c4d3f3c082e126eb9193ad535bf462ba Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6ae4ed11c4d3f3c082e126eb9193ad535bf462ba commit 6ae4ed11c4d3f3c082e126eb9193ad535bf462ba Author: Christos Margiolis AuthorDate: 2024-02-12 10:59:28 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:31 +0000 mixer(8): Use new mixer if we change the default unit If we use the -d option to change the default unit, close the current mixer and open the one we set as the default to avoid printing and applying changes (if any) to the old one. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D43809 (cherry picked from commit 5daa7cf42f4551cb2f4a452fd038807925320eac) --- usr.sbin/mixer/mixer.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 83e97df19116..47d8e6359b73 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -118,8 +118,21 @@ main(int argc, char *argv[]) initctls(m); - if (dflag && set_dunit(m, dunit) < 0) - goto parse; + if (dflag) { + if (set_dunit(m, dunit) < 0) + goto parse; + else { + /* + * Open current mixer since we changed the default + * unit, otherwise we'll print and apply changes to the + * old one. + */ + (void)mixer_close(m); + if ((m = mixer_open(NULL)) == NULL) + errx(1, "cannot open default mixer"); + initctls(m); + } + } if (sflag) { printrecsrc(m, oflag); (void)mixer_close(m); From nobody Mon Feb 26 23:22:49 2024 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 4TkGqs6bBfz5BtbS; Mon, 26 Feb 2024 23:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqs4p5zz4V4K; Mon, 26 Feb 2024 23:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KKIrBXlwCzu5UbLK8jUJ60vnUGCGEpIesdi4KGhm6y4=; b=Z/bi4Ne8TYdv1ZhLdZGsGsoSTnwpJbx17wMZPzZ+Enw5pgJ2uY1RAjOqrlO4h7a8jQuzwH 8kCd61FqaynKquPd/aIzBF6DS0H5TpMM5SGBe9hoMiRjp3uWzuH5MtcYWzHrJkBsz55rrL e0ZcEjKfswR2BkeP+nfb3MlPvaL0YBpwAjqTPke1IkfS/imsdmOAAnG9PavyvZIUIO1Z2J TiXz3Dx71T8yROo4+xFQdekmh5l7upMPZsoz5DMkWxhGFtoBJU+1vtjctkdfQ8X7alhv+4 HPngUTfLMYgFubTW4iUVIa5sx8bRnVHERsaeVwxvpj916/3HiuIfhjWl7lj0cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989769; a=rsa-sha256; cv=none; b=DnrF/uMOZ5pj7nS2gdeNjfsccvdOroj9tosC3k/OWjWUZsCHd8CQIIZDtFU19hPOfxVFLa gTBpGehwHXQwzJLUo9rnbIMM21xofmG2vs6zWdixHRx0WvkXdidx9h/+2RbFsoCpudMYlG q1J5jtCYa8Q0gYtvQNr9iLtJOhryBiJKwGJGoN110/WYcWVFm3SwCb/dIWTsjHgFT0Lkki sxzozKy5jOq8Lg7gxvWCu8nuwuljT6VhDgGvElTUbgySWKGzqM6EMdnhWsqpsCF+GEDyRK 1QPadxKOqPR4X5AthMWfiRTsHaXU4CjUC+VJUPgYuDXdi1l0HQvaeOa2+F9dhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KKIrBXlwCzu5UbLK8jUJ60vnUGCGEpIesdi4KGhm6y4=; b=Uw1iMCrPuTKcuhjVasmddMJA5mq/BAQ1GohZhoAq8RK5Z8Mso7Ux85FEuOgXCKzPesCcSq SuTvRhm14M2TtooMf9FWQQccvD+KaE7amvAMP+UgiVk2Bi2XFRlEyvbUodT3+J2BkcJyAi pmeC+JPYTh3qt+jDGbDCdhMZSMd3DygpGlMjv+P2kLVACQaA9SjhI6ZoMd/fp0TIOuFiw/ mOxMQsa2JuEi+Gtt2fQTJ3RPLopKoBRQHC1VWy2fZmQW7h0/iVDUMPl5X4EDUJ9j+e5ZXa gPQdj5c3yN2OOH0BX4X6sZlh6w2AZDon3SrhTJlSyqv9PVG2EtO/H7w0ruuQaA== 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 4TkGqs3qlHzpJx; Mon, 26 Feb 2024 23:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMnTA028557; Mon, 26 Feb 2024 23:22:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMn95028554; Mon, 26 Feb 2024 23:22:49 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:49 GMT Message-Id: <202402262322.41QNMn95028554@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: 7e984a34c304 - stable/14 - mixer(3): Do not hardcode "/dev/mixer" 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 7e984a34c3048404400e8dba517f14ba44078e32 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7e984a34c3048404400e8dba517f14ba44078e32 commit 7e984a34c3048404400e8dba517f14ba44078e32 Author: Christos Margiolis AuthorDate: 2024-02-12 10:59:32 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:31 +0000 mixer(3): Do not hardcode "/dev/mixer" We have BASEPATH defined. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D43812 (cherry picked from commit 53c768e6836a32c8dcd0b0b422a169ef7a82a3ab) --- lib/libmixer/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libmixer/mixer.c b/lib/libmixer/mixer.c index d78ca6e0fc87..93ace1d0c69b 100644 --- a/lib/libmixer/mixer.c +++ b/lib/libmixer/mixer.c @@ -87,7 +87,7 @@ mixer_open(const char *name) dunit: if ((m->unit = mixer_get_dunit()) < 0) goto fail; - (void)snprintf(m->name, sizeof(m->name), "/dev/mixer%d", m->unit); + (void)snprintf(m->name, sizeof(m->name), BASEPATH "%d", m->unit); } if ((m->fd = open(m->name, O_RDWR)) < 0) From nobody Mon Feb 26 23:22:50 2024 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 4TkGqv1kzkz5BtQg; Mon, 26 Feb 2024 23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqt61Tfz4V4f; Mon, 26 Feb 2024 23:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NROtqf0EwJGSVd9ZVcwSYxBRyYnIAZ6Qz2hqZ1F2ffo=; b=FNCQyD6WQSWaDUyMY/cm+dFTtc9POfigS+VMwAIwr6IUQro/d/dCtx0mLJbgfpKk5jqfRz Kwk5KyG3oMiiUuhlGWcqQ51Ysyija812j6hbpyWR2vnRRi5/4Tdgy1EDkarnPpqXJah1aK iyne+lJzB4Cmx41Y/g7bGd+Q3DhqSW6SwrqpkBCahvpkbn3sroigoGF39An1A9DT4vPjyM 7rXuR6dYkivjIsl/V/7y/Iwr1JJFEW3a8CXTvgDxqjPwmGfsw464hoc8LNpa65Sv8+3tnP dFx6B6c1nce4JkWtpUMxZP/4QwkY0Ush7ViCB4IcLAlOlUzsGMkLiVpqaIB3jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989770; a=rsa-sha256; cv=none; b=eUqv60cs5lzOY2calOAyEgZ0rvUzjtJgLwxxTzmCHLRKo1nyXtrSwEmCpzM8fpFK1omjFy JlgrhL2DfUJjdzzX0WRSchf298C+C3aoyItq/2fdkSad0/kTTT3j2qSGvCFL54bKo3ZWz+ iKCx2Rw1eAVc7BUTXfJKC3FMB9TNvrEBmuyqr6bqeXfPUU6Jk/KTxn9G0YsIo7oczBzCi2 nmTxQt26nHWBwltApgcqU/kusCcAuEzagoS9iGty/KMUcFGt/eK16rGu201EeQUgwFipXy s3loKwR+i1eYDpqrrBxqr9SHQTgJ0oO4a5nGwwKUrQstJnT0LAgqkefd0XmPZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NROtqf0EwJGSVd9ZVcwSYxBRyYnIAZ6Qz2hqZ1F2ffo=; b=rNBf9ikbpOwgtgbF3rZLAbMu69+icTp86seZLDrtTcvHu4XkNL9P/PWdGvKTVITr2uxzZ9 AhR5ptpaFD/E36O1sOwMFrcN8t5y5DpUsbG+iKilrsBiaDZNKK/jLavJxkVJvnoSSNO+mI w9+wupbBI3kgpCMyVExztBSjfaCGW3GudQvbrg7UCwz4GSkKnH3BhoXQokmyBpfWItb9p8 xCxA9VoUl3TPjRXUSvIO2A/8x6TciO0U0dupZ+Ox5Fx9zDZjYyPUAVbeBL7tGTG4qvG/mc cJ7EhzB/OhX1KzXPfk9lgiHzolzSAX1elmgADEx2fkxuAtgDNwhFiNtwep6Xxw== 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 4TkGqt56kyzpJy; Mon, 26 Feb 2024 23:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMoBu028605; Mon, 26 Feb 2024 23:22:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMo1E028602; Mon, 26 Feb 2024 23:22:50 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:50 GMT Message-Id: <202402262322.41QNMo1E028602@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: 75358ca4fb54 - stable/14 - snd_uaudio(4): Adapt buffer length to buffer_ms tunable. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 75358ca4fb54390c313e5346574771c292bb764f Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=75358ca4fb54390c313e5346574771c292bb764f commit 75358ca4fb54390c313e5346574771c292bb764f Author: Florian Walpen AuthorDate: 2024-02-12 11:04:57 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:31 +0000 snd_uaudio(4): Adapt buffer length to buffer_ms tunable. Adapt the length of the driver side audio buffer to the USB transfer interval, which is adjustable through the buffer_ms tunable. This eliminates unnecessary latency in USB audio playback. To reduce power consumption caused by frequent CPU wakeups, increase the default buffer_ms value to 4ms. In combination with adaptive buffer length, this still results in less roundtrip latency compared to the previous 2ms default. Extend the buffer_ms value range to 1ms for low latency applications. MFC after: 2 weeks Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D41942 (cherry picked from commit b2e97edffdab6ad1e9103a6bbe90300d78a961ed) --- sys/dev/sound/usb/uaudio.c | 70 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 10 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 917b6bd3f238..b0bf815f7797 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -96,7 +96,7 @@ static int uaudio_default_rate = 0; /* use rate list */ static int uaudio_default_bits = 32; static int uaudio_default_channels = 0; /* use default */ -static int uaudio_buffer_ms = 2; +static int uaudio_buffer_ms = 4; static bool uaudio_handle_hid = true; static SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, @@ -110,6 +110,9 @@ SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_bits, CTLFLAG_RWTUN, SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_channels, CTLFLAG_RWTUN, &uaudio_default_channels, 0, "uaudio default sample channels"); +#define UAUDIO_BUFFER_MS_MIN 1 +#define UAUDIO_BUFFER_MS_MAX 8 + static int uaudio_buffer_ms_sysctl(SYSCTL_HANDLER_ARGS) { @@ -121,10 +124,10 @@ uaudio_buffer_ms_sysctl(SYSCTL_HANDLER_ARGS) if (err != 0 || req->newptr == NULL || val == uaudio_buffer_ms) return (err); - if (val > 8) - val = 8; - else if (val < 2) - val = 2; + if (val > UAUDIO_BUFFER_MS_MAX) + val = UAUDIO_BUFFER_MS_MAX; + else if (val < UAUDIO_BUFFER_MS_MIN) + val = UAUDIO_BUFFER_MS_MIN; uaudio_buffer_ms = val; @@ -133,7 +136,7 @@ uaudio_buffer_ms_sysctl(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_hw_usb_uaudio, OID_AUTO, buffer_ms, CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, 0, sizeof(int), uaudio_buffer_ms_sysctl, "I", - "uaudio buffering delay from 2ms to 8ms"); + "uaudio buffering delay in milliseconds, from 1 to 8"); #ifdef USB_DEBUG static int uaudio_debug; @@ -1310,13 +1313,60 @@ uaudio_detach(device_t dev) return (0); } +static uint32_t +uaudio_get_interval_frames(const usb_endpoint_descriptor_audio_t *ed) +{ + uint32_t frames = 1; + /* Isochronous transfer interval is 2^(bInterval - 1) frames. */ + if (ed->bInterval >= 1 && ed->bInterval <= 16) + frames = (1 << (ed->bInterval - 1)); + /* Limit transfer interval to maximum number of frames. */ + if (frames > UAUDIO_NFRAMES) + frames = UAUDIO_NFRAMES; + return (frames); +} + +static uint32_t +uaudio_get_buffer_ms(struct uaudio_softc *sc, uint32_t int_frames) +{ + uint32_t ms = 1; + uint32_t fps = usbd_get_isoc_fps(sc->sc_udev); + /* Make sure a whole USB transfer interval fits into the buffer. */ + if (fps >= 1000 && int_frames > 0 && int_frames <= UAUDIO_NFRAMES) { + /* Convert interval frames to milliseconds. */ + ms = ((int_frames * 1000) / fps); + } + /* Respect minimum buffer length set through buffer_ms tunable. */ + if (ms < uaudio_buffer_ms) + ms = uaudio_buffer_ms; + /* Limit buffer length to 8 milliseconds. */ + if (ms > UAUDIO_BUFFER_MS_MAX) + ms = UAUDIO_BUFFER_MS_MAX; + return (ms); +} + static uint32_t uaudio_get_buffer_size(struct uaudio_chan *ch, uint8_t alt) { struct uaudio_chan_alt *chan_alt = &ch->usb_alt[alt]; - /* We use 2 times 8ms of buffer */ - uint32_t buf_size = chan_alt->sample_size * - howmany(chan_alt->sample_rate * (UAUDIO_NFRAMES / 8), 1000); + uint32_t int_frames, ms, buf_size; + /* USB transfer interval in frames, from endpoint descriptor. */ + int_frames = uaudio_get_interval_frames(chan_alt->p_ed1); + /* Buffer length in milliseconds, and in bytes of audio data. */ + ms = uaudio_get_buffer_ms(ch->priv_sc, int_frames); + buf_size = chan_alt->sample_size * + howmany(chan_alt->sample_rate * ms, 1000); + return (buf_size); +} + +static uint32_t +uaudio_max_buffer_size(struct uaudio_chan *ch, uint8_t alt) +{ + struct uaudio_chan_alt *chan_alt = &ch->usb_alt[alt]; + uint32_t buf_size; + /* Maximum buffer length is 8 milliseconds. */ + buf_size = chan_alt->sample_size * + howmany(chan_alt->sample_rate * UAUDIO_BUFFER_MS_MAX, 1000); return (buf_size); } @@ -2626,7 +2676,7 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b, buf_size = 0; for (x = 0; x != ch->num_alt; x++) { - uint32_t temp = uaudio_get_buffer_size(ch, x); + uint32_t temp = uaudio_max_buffer_size(ch, x); if (temp > buf_size) buf_size = temp; } From nobody Mon Feb 26 23:22:52 2024 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 4TkGqx1n3wz5BtYT; Mon, 26 Feb 2024 23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqx10jzz4V9b; Mon, 26 Feb 2024 23: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=1708989773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1PzHn7GXy6RrjHq33tJ/uM2NNAHgd57zGSUT/1a2HY=; b=vC6usnNkrPWTLQ45K8uAnDr24ZCzEAztfufPq6MWJG5xQmMLWIFhICBkI8lLbD3s7ArJJW UzXaZp2g0+0qHdusrfICEtzZ1rYmz049UTpaPe8LG6UmenMsZ/cMrekt6HI3R5Y0yFofu/ GAPYwVfIUpu1vQaxf26GwDXJz2pNQR+7DCwXhVs/Po+7EqzsOc3zcnRFVYLvMv7E4B1Ft4 P3KlinwUgeaLzsr1b+0zqXQ7F/NRxHcAbfNfiM/KgMNZYwg7q23dLdreHUI7zAhk1eDbNB 1hHDBP+qhWpk/RU72R1zAPBHnwjokUT7H/l6NL0cq0VDAojjaUlodIt3FJgLAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989773; a=rsa-sha256; cv=none; b=Q4VDmw394P4P1BK8pw8VjGURm6ZqYSJSfV8eWTLRheG5pxsDrT7BV2LSLO11uX8p9w2hTS 623vpQZFa7Y6bM2E8AKWnR+Ctt61StlIeNj9ML8hcxMGISv6Ugkl6M6wrM2kf3uUOIEpGR sujCeWpS7ZCIrMV2KCZmo52n86EOrD+t8dJbvIUtwPaxZ6Dcp86hc3tLw+JIss7vld6KAb 19PfEsUzXpzo1KM9TTeKzfQtnetFUiiTOy/Wq5sonFbYIBzhb3E3hhpNjdGtJb8HzLwcmV LDEVwQOvUcJHsMbovHU6lilAcjaN+yZaH3njs50LsS0wXwY9FTPBtYPZ+oSdIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1PzHn7GXy6RrjHq33tJ/uM2NNAHgd57zGSUT/1a2HY=; b=JTwRW11LO+BwuMq7WLHQdhhBkstjn/2vKWdKLgeNbtuNyYBtaPiN+vroihWB1QvSvhbG6U jiJxa1hCbWrT3nV4VWDgQK27Xows4mz1sShAf6O/u97hUwOFaBlRzphzETcgJMbb6HfNpj KtL5fNP6nlssrMxd0erPIx0L0GcR6Yvxs8AbfMUKnl4QbWNEI82IwoC11WVnD+AIC+ubgW lFpoT66zGV33jCiuxvKAGB4wywvhij7qc5Ud6W7PL2jlwgrK4nS7uOVDj2O5Vlv3bLLnO2 g56qQmzuJpfe1VucCTMb8Pi8UErvJsKLawiIL42lEZfL4FsdDnrZro8UaT3/yw== 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 4TkGqx06NmzpK0; Mon, 26 Feb 2024 23:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMqWP028708; Mon, 26 Feb 2024 23:22:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMqlg028705; Mon, 26 Feb 2024 23:22:52 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:52 GMT Message-Id: <202402262322.41QNMqlg028705@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: 6f2d6237fe98 - stable/14 - sound: remove snddev_info->inprog and pcm_inprog() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 6f2d6237fe98f6741bfab9284dd0244a35d77011 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6f2d6237fe98f6741bfab9284dd0244a35d77011 commit 6f2d6237fe98f6741bfab9284dd0244a35d77011 Author: Christos Margiolis AuthorDate: 2024-02-12 11:05:33 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:31 +0000 sound: remove snddev_info->inprog and pcm_inprog() No longer used. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43737 (cherry picked from commit 883b8ed582eb3e9e98c62c471228ff3c3a25377d) --- sys/dev/sound/pcm/sound.c | 17 ----------------- sys/dev/sound/pcm/sound.h | 2 -- 2 files changed, 19 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index b23a28d3af08..186e7b194f27 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -392,16 +392,6 @@ pcm_chnref(struct pcm_channel *c, int ref) return (c->refcount); } -int -pcm_inprog(struct snddev_info *d, int delta) -{ - PCM_LOCKASSERT(d); - - d->inprog += delta; - - return (d->inprog); -} - static void pcm_setmaxautovchans(struct snddev_info *d, int num) { @@ -1127,7 +1117,6 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) d->pvchanformat = 0; d->rvchanrate = 0; d->rvchanformat = 0; - d->inprog = 0; /* * Create clone manager, disabled by default. Cloning will be @@ -1182,12 +1171,6 @@ pcm_unregister(device_t dev) d->flags |= SD_F_DETACHING; - if (d->inprog != 0) { - device_printf(dev, "unregister: operation in progress\n"); - PCM_UNLOCK(d); - return (EBUSY); - } - PCM_ACQUIRE(d); PCM_UNLOCK(d); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 5b366a62630c..4af56a2c411a 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -320,7 +320,6 @@ int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, pid_t pid, char *comm, int devunit); int pcm_chnrelease(struct pcm_channel *c); int pcm_chnref(struct pcm_channel *c, int ref); -int pcm_inprog(struct snddev_info *d, int delta); struct pcm_channel *pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, int num, void *devinfo); int pcm_chn_destroy(struct pcm_channel *ch); @@ -379,7 +378,6 @@ struct snddev_info { struct snd_clone *clones; unsigned devcount, playcount, reccount, pvchancount, rvchancount ; unsigned flags; - int inprog; unsigned int bufsz; void *devinfo; device_t dev; From nobody Mon Feb 26 23:22:51 2024 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 4TkGqw3ZGbz5BtbX; Mon, 26 Feb 2024 23:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqw01jbz4V0V; Mon, 26 Feb 2024 23: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=1708989772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2CR7WRs0CWLNu8eLdJRZrPMKQw3XpgFJk9Zhgn4PMJE=; b=SH54hU0QxxeApK+t0xo/Iv/508iCpSZMrEZPVuH23M8QSxD7hHMV00uCfV8D8VIhQg+PJj 0IczrgUcuJvEBpwz+rMssjRGUbNWtiuQZexFw7oylfFdAMu4aM1IgvG+fqv/0siuFpevpr Dk1QsQidFYmMQga1g4PlGYN4IZWxjdaYEPAHWnVXrPfAmVcftH/U3AwftaMamsj89sA20/ sY9DJCHEtEeRwrNEzZRsjfpJfZDiDRRwCuH+W1lKu4jPSjHskHYD+pHPBUbwQxtJdLG0e/ A20VjI7IFhxdAl960yfLRDLHkUjPXye3kh3CeDFNHYLNslNQZQSyUsXLtVYngg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989772; a=rsa-sha256; cv=none; b=WpoZIbFJa8RHuXM152sb06VADfZk6NB0qqkaJTG5ARVfJ+85IwET6uAn0Adk1hCBYdLWbp SeTacY2hoyn7dzTE0CAEuzdeAh2RR+EE5UaE8nwWVBVhbHCkWbtzb9FRU4ALdZm7tCUazE z0+s+sAjzsGhs/CzH/85AEpR+CgJ2+B//4vtFk0fIxkbaMAJG++FlneB1FI0H3y5+Bwejt tVITAp/yRl13uekiWcmcCf6xYgQdbXlKmM/w8WWL1DV43DBiQkrXMYh0WGoOnU/evu2vl9 AUXAj6iY7caufKYnh+HZbEersII1W3gKcyT1sRJsd3PcdGSoI6LpvvDYyxT8jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2CR7WRs0CWLNu8eLdJRZrPMKQw3XpgFJk9Zhgn4PMJE=; b=Vm0ESl6CKjj3xO85QC+7WuEVUteny7W3rZz/QGSvAhN2AoBja7iaN2RLBL22HWleRfu9uS HGrDj91OUBO4A1kQ/88U1D8ohz895Jit38+7H5W+KrHnQtxIF1j10HEZ4lYHtLXhGY1ksX liSrC24P3TguG1+cLlRgm5h5rZW/Hn8N0GpxCDmEdYADmHvGMK0DWwzAfmeSv6iYf6QyHF CUSkvgRxt30lcpvr1yBMqeSi4NJvak7Sk+PqjComnR+o5eNh3TPxu/QVk7D9XTWrkeKt8v 7BmjX5ejRNQ19ujryvqVKKRCO7/+Iu94d+lzH5Z279RbEhVdNmnZWp7mqN6O8w== 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 4TkGqv6DM2zpLw; Mon, 26 Feb 2024 23:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMpHW028666; Mon, 26 Feb 2024 23:22:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMpCj028663; Mon, 26 Feb 2024 23:22:51 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:51 GMT Message-Id: <202402262322.41QNMpCj028663@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: 4c6b20d4b3e3 - stable/14 - snd_uaudio(4): Fix config detection with defaults set. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 4c6b20d4b3e3054e1f37f20976c6b68685adb53f Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4c6b20d4b3e3054e1f37f20976c6b68685adb53f commit 4c6b20d4b3e3054e1f37f20976c6b68685adb53f Author: Florian Walpen AuthorDate: 2024-02-12 11:05:27 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:31 +0000 snd_uaudio(4): Fix config detection with defaults set. Let the USB audio descriptor iteration detect configurations with more channels and larger sample size, even when the following global sysctl tunables are set to a lower value: hw.usb.uaudio.default_channels hw.usb.uaudio.default_bits This improves utility and is closer to the meaning of default. Also, do not create duplicate sample rate entries. MFC after: 2 weeks Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D43679 (cherry picked from commit 42fdcd9fd917764d84edcc43e252a90cade78f80) --- sys/dev/sound/usb/uaudio.c | 68 +++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index b0bf815f7797..eb4b676d5e7d 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -94,7 +94,7 @@ #include "feeder_if.h" static int uaudio_default_rate = 0; /* use rate list */ -static int uaudio_default_bits = 32; +static int uaudio_default_bits = 0; /* use default sample size */ static int uaudio_default_channels = 0; /* use default */ static int uaudio_buffer_ms = 4; static bool uaudio_handle_hid = true; @@ -150,6 +150,7 @@ SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RWTUN, #define UAUDIO_NFRAMES 64 /* must be factor of 8 due HS-USB */ #define UAUDIO_NCHANBUFS 2 /* number of outstanding request */ #define UAUDIO_RECURSE_LIMIT 255 /* rounds */ +#define UAUDIO_BITS_MAX 32 /* maximum sample size in bits */ #define UAUDIO_CHANNELS_MAX MIN(64, AFMT_CHANNEL_MAX) #define UAUDIO_MATRIX_MAX 8 /* channels */ @@ -2203,31 +2204,37 @@ uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev) uint8_t bits = uaudio_default_bits; uint8_t y; uint8_t channels = uaudio_default_channels; + uint8_t channels_max; uint8_t x; bits -= (bits % 8); - if ((bits == 0) || (bits > 32)) { + if ((bits == 0) || (bits > UAUDIO_BITS_MAX)) { /* set a valid value */ - bits = 32; + bits = UAUDIO_BITS_MAX; } - if (channels == 0) { - switch (usbd_get_speed(udev)) { - case USB_SPEED_LOW: - case USB_SPEED_FULL: - /* - * Due to high bandwidth usage and problems - * with HIGH-speed split transactions we - * disable surround setups on FULL-speed USB - * by default - */ - channels = 4; - break; - default: - channels = UAUDIO_CHANNELS_MAX; - break; - } - } else if (channels > UAUDIO_CHANNELS_MAX) + + if (channels > UAUDIO_CHANNELS_MAX) channels = UAUDIO_CHANNELS_MAX; + switch (usbd_get_speed(udev)) { + case USB_SPEED_LOW: + case USB_SPEED_FULL: + /* + * Due to high bandwidth usage and problems + * with HIGH-speed split transactions we + * disable surround setups on FULL-speed USB + * by default + */ + channels_max = 4; + /* more channels on request */ + if (channels > channels_max) + channels_max = channels; + break; + default: + channels_max = UAUDIO_CHANNELS_MAX; + break; + } + if (channels == 0) + channels = channels_max; if (sbuf_new(&sc->sc_sndstat, NULL, 4096, SBUF_AUTOEXTEND)) sc->sc_sndstat_valid = 1; @@ -2241,9 +2248,26 @@ uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev) uaudio_chan_fill_info_sub(sc, udev, rate, x, y); /* try find a matching rate, if any */ - for (z = 0; uaudio_rate_list[z]; z++) - uaudio_chan_fill_info_sub(sc, udev, uaudio_rate_list[z], x, y); + for (z = 0; uaudio_rate_list[z]; z++) { + if (uaudio_rate_list[z] != rate) + uaudio_chan_fill_info_sub(sc, udev, + uaudio_rate_list[z], x, y); + } + + /* after default value in first round, proceed with max bits */ + if (y == bits) + y = UAUDIO_BITS_MAX + 8; + /* skip default value subsequently */ + if (y == (bits + 8)) + y -= 8; } + + /* after default value in first round, proceed with max channels */ + if (x == channels) + x = channels_max + 1; + /* skip default value subsequently */ + if (x == (channels + 1)) + x--; } if (sc->sc_sndstat_valid) sbuf_finish(&sc->sc_sndstat); From nobody Mon Feb 26 23:22:54 2024 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 4TkGqy3jGWz5BtTL; Mon, 26 Feb 2024 23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqy20brz4V9l; Mon, 26 Feb 2024 23:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=atQ5la8GoWN0kLnVCE7jqQB+Ld+pHBEhwubfcS4U6vE=; b=WJ/we74OUEAF9icTRU3j9e9BaCLC1QjCysSYDmL/xYpQm00R9zhFXk+eudZ6CnQIWC7GTd 2Sk3ceRzP+s5p9O+hnz70MjS7+olaJqcRAbPZG75QWMeax6gjAEDghmJkiPtRZ1xsOGk+/ 9PdGdgkcgfLE/Wgolf3Pbwy8RE/EVQQ73CJlcQWEeW0c0kOl3OUIUPzNe1RXXixjH3XUpV vgDLaCCjILxlkwb/TRy2XMMtdfSTKTuKZS0CvzXs4sxAYc7KGETYaQao/zjP6vLkNje4Pq uvk+Lx587MfADsLoDHpRMY5cJsr3GTT2p1mcemuh4UHpWqYl6KmyndvsMMLS1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989774; a=rsa-sha256; cv=none; b=nIo8YrmKQDVWvLx702AEJbH9c/nNYzLd7MBswTqnevYWwbZcDiIhyMSKTF8EZEqtQt3g5i VLDQy9WKH2PuDwNelNaLXNfDIaG4Z8ZDtayMd86gT9JVnR2WmgfVf+iKAgvxwTGZ6dwDj/ dW63tcNBWVqMRYY1woMcmAsSihf2Is5r0p+kCfrR0UAVqMgvQp0wU1EsUkDSpyYLEOWDi1 QYHC52I0U3o6E+3MLvJ/QNLVr8JdPkjVheYTKfTs3LAjFCIqbvJjBLtw1Wxk2DI0hOz6T6 uscg0K573lYrhOeIipBNMW/tDEjWVrwBv+imW0wxv095bKs4CmWijqkNEJCHLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=atQ5la8GoWN0kLnVCE7jqQB+Ld+pHBEhwubfcS4U6vE=; b=QjUWMUQigT03jfFaxwDWJtOaPPcq4hVBu3Z4M5xHPJxxWQiAm5KiB+T8JxBJIGynNfISCv pWkij4B2o5msVb0wm3SwAZrOoboCNwF/upWQYoWDe/AJQ4bn6LQBZ6QJs1BMH37f5Srhyf Y4wscTaGi4iybTlAdurotS3XAczGtftxcbRkiHfafffCR1Qxt6j6350pKNWM7ixza/Wagb 66JC4Fim9HTmCWuB2nLGfkKfMaJNY11yahyFHSFlTeeAARaRCYC4u/rpxht8U2eqUpNhv3 FH/CsCqatS3g6B8N0z/F6xroqF1Zts8Vew88ukY/VBPhOYzKFV7ZSasK1neMEg== 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 4TkGqy15hgzpLx; Mon, 26 Feb 2024 23:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMslf028747; Mon, 26 Feb 2024 23:22:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMsRQ028744; Mon, 26 Feb 2024 23:22:54 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:54 GMT Message-Id: <202402262322.41QNMsRQ028744@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: 80da975b55dc - stable/14 - snd_uaudio: mark selected configurations 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 80da975b55dc2a2074a0ae49bb464cbe103d000d Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=80da975b55dc2a2074a0ae49bb464cbe103d000d commit 80da975b55dc2a2074a0ae49bb464cbe103d000d Author: Christos Margiolis AuthorDate: 2024-02-12 11:05:47 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:31 +0000 snd_uaudio: mark selected configurations snd_uaudio(4) selects the first maching rate/channel/bit/format/buffer configuration for use during attach, even though it will print the rest of the supported configurations detected. To make this clear, mark the selected playback and recording configurations with a "selected" string. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D43766 (cherry picked from commit f60e99f45e8197de2bc0970c7dd7f87148fdaf30) --- sys/dev/sound/usb/uaudio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index eb4b676d5e7d..26d95bf3ee9f 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -1051,11 +1051,12 @@ uaudio_attach(device_t dev) for (x = 0; x != sc->sc_play_chan[i].num_alt; x++) { device_printf(dev, "Play[%u]: %d Hz, %d ch, %s format, " - "2x%dms buffer.\n", i, + "2x%dms buffer.%s\n", i, sc->sc_play_chan[i].usb_alt[x].sample_rate, sc->sc_play_chan[i].usb_alt[x].channels, sc->sc_play_chan[i].usb_alt[x].p_fmt->description, - uaudio_buffer_ms); + uaudio_buffer_ms, + (x == 0) ? " (selected)" : ""); } } if (i == 0) @@ -1081,11 +1082,12 @@ uaudio_attach(device_t dev) for (x = 0; x != sc->sc_rec_chan[i].num_alt; x++) { device_printf(dev, "Record[%u]: %d Hz, %d ch, %s format, " - "2x%dms buffer.\n", i, + "2x%dms buffer.%s\n", i, sc->sc_rec_chan[i].usb_alt[x].sample_rate, sc->sc_rec_chan[i].usb_alt[x].channels, sc->sc_rec_chan[i].usb_alt[x].p_fmt->description, - uaudio_buffer_ms); + uaudio_buffer_ms, + (x == 0) ? " (selected)" : ""); } } if (i == 0) From nobody Mon Feb 26 23:22:55 2024 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 4TkGqz4QsRz5BtR0; Mon, 26 Feb 2024 23:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGqz2zSDz4Tqk; Mon, 26 Feb 2024 23:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AyCyuCOTv19cVk91K71UMOTWPiBldpen5clNcAIa1Ro=; b=FWGLPU2n3O/FsdgRnc68n2s37NVhS2TnIegrLqoh3EQf7B1TRHaBtv6yU7P+qYgQemT7hk +0VyFtSiRz7O0MBNPwLkpvus4EyqPi28HbmJmtRBTRGUHzdO0PNE5LTK6sW2kQw4OML6ao UBZk6ZCbqrdRi00fJ+J/3M+onJMfH7HcOdNZVIruvnHZhqt90mmk4QEjsRJnfMTpBMyMDU k+yMg/JHuiuHxvhbsOBNqC1WavLsj9mQF4qNYVLbTuY/T/I7HdumnTQ2KqAqjezFeoQS0G Oz3NJYx7T1qd0lLnPnDIj92vm1ixvJPW3DnL7N11CHF8NtOLqp96HIFXtafDtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989775; a=rsa-sha256; cv=none; b=fxcYqmfXlkMwrzEcRNN/PMG9Clo+AvcYEwBiUE2/3uHqa1dZNhtfhkCSbuy/rkdoyje54j lL6aBhFvcL6sTpISSiNIV3VaBCaa3w89kKHSNIghC6rNczXrFTzDy9dxn/g3tQuC+VeYUf 3lSGlSw04Kg0P8NuUxkdK8tKR+aUMmdPTXq9CtvH0JG/SvS6y79yxYViopO/OV3AbHrn/O 0lcgepA1oFC8ayqbbF7f01Ed0dBRMIw6hidUABFLasOMLVgtyHR8CdCCTNEr+njeove5b7 nm2c+Dv4PwuNkueHHX063o9LTLy/4UgFgo2YCt+5lyyzJWNP2UYVu92wgUMzDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AyCyuCOTv19cVk91K71UMOTWPiBldpen5clNcAIa1Ro=; b=n9vL5BGZg3EXptQMfvwoLzXdw7+d2UBE42ki4jM3hxPiFehsrt69i9fDtiVV+FODZ9PxP9 sLVUAgK3A43cpinvZKQGFvwZsNT3U8HDbZEDiXA+6PYrMyRfS4hj+SouZXhFPTS7lfBeJg VO79pnfFDp0N28j8iBwbimc2qJ6ACesggCL29z9l3FKrVSW6diMMClJ+9qp1RRSZiM0fiM YNV4zeR6Y9p2uAK58eIz9tLydF/L0+OI+bD/095mmU94XbS5LkVQ4He/CYAXducu+K/N88 ww/8ZLvLaydlzR4KodqSktZPvCCVCD36CNYsR6hQdAjh6g32jIzZf//OfF/swQ== 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 4TkGqz25dBzp4R; Mon, 26 Feb 2024 23:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMtQw028789; Mon, 26 Feb 2024 23:22:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMtkh028786; Mon, 26 Feb 2024 23:22:55 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:55 GMT Message-Id: <202402262322.41QNMtkh028786@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: 2e5b4890e1d2 - stable/14 - snd_uaudio.4: remove useless .Tn macro 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 2e5b4890e1d28362cce37e6c9679e67f3aa4a5a1 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2e5b4890e1d28362cce37e6c9679e67f3aa4a5a1 commit 2e5b4890e1d28362cce37e6c9679e67f3aa4a5a1 Author: Christos Margiolis AuthorDate: 2024-02-12 11:05:55 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:31 +0000 snd_uaudio.4: remove useless .Tn macro Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43651 (cherry picked from commit dcc47cd49e19df4af987cd094e5a313935f4cd86) --- share/man/man4/snd_uaudio.4 | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/share/man/man4/snd_uaudio.4 b/share/man/man4/snd_uaudio.4 index df2c74b886c3..04dc10ccaa25 100644 --- a/share/man/man4/snd_uaudio.4 +++ b/share/man/man4/snd_uaudio.4 @@ -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 November 12, 2016 +.Dd January 29, 2024 .Dt SND_UAUDIO 4 .Os .Sh NAME @@ -51,17 +51,11 @@ snd_uaudio_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for -.Tn USB -audio class devices and -.Tn USB -MIDI class devices. +driver provides support for USB audio class devices and USB MIDI class devices. .Pp -A -.Tn USB -audio device consists of a number of components: -input terminals (e.g.\& USB digital input), output terminals (e.g.\& -speakers), and a number of units in between (e.g.\& volume control). +A USB audio device consists of a number of components: input terminals (e.g.\& +USB digital input), output terminals (e.g.\& speakers), and a number of units +in between (e.g.\& volume control). .Pp Refer to the .Ql USB Audio Class Specification @@ -86,9 +80,7 @@ and modified for by .An Hiten Pandya Aq Mt hmp@FreeBSD.org . .Sh BUGS -The -.Tn PCM -framework in +The PCM framework in .Fx only supports synchronous device detach. That means all mixer and DSP character devices belonging to a given @@ -104,9 +96,7 @@ See the .Va dev.pcm.%d.[play|rec].vchanrate sysctls. .Pp -The -.Tn PCM -framework in +The PCM framework in .Fx currently doesn't support the full set of USB audio mixer controls. From nobody Mon Feb 26 23:22:56 2024 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 4TkGr06Wnyz5BtYd; Mon, 26 Feb 2024 23:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkGr03kDrz4V3B; Mon, 26 Feb 2024 23:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gDUElWmpPVSFeNpdl0AmPQ+orFgfC6aE2pB9gRU386c=; b=OrkDztz5d1jciiVHb1oCXSREaCJWv8Lj8KcWEyZcv5D8dH94DjYfvFeSqhVtBiZWdgH8yl nPLhEYQeXXMZFG87SpXHCA/3uqmu9gEPhxOFKkU35jwONQx338MRh1t8AtY/qDQfJhou+8 Fsiz7I68TbDqSbuSo/6inz8ykgPjLhAhk1timW0dFITd6bNY6mYLQr0xVYjLz3sSekV/yE /2oXwgyfn1KvaGy3pIibLlxCZ3K143kNw0FFeihU6BZnyarwfMvdnsaq+78OTKEcoC18dJ 2ra2HSpjN3gt2X89MHKk3lgUCqWktAx284mwytsLcX7KfcQIIDpKLlWGejju3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708989776; a=rsa-sha256; cv=none; b=AQ+9SJNahYUuV9neMu86IrBbPI75Hv+j11XNpzRKf9aFaa4O+HbPKPT+qRqeTtMrw4F1As M0cDET0w8bJGmlO9WJzcJVqYBuUapKT9zyln4snIziIzDjl688rX7L3VrxxGMnt3F7mXsG AGvVCeqm1J63EItqP0QrM1j1iuPncwaJywxRvAMSthncSKny+JY6oQZJmEK87jCMD1w9jx 4wONOTk87EmgNRKfas8Fvz8LMWyQIXGaJJCVonqBOPxAJ+iigpDfz5HnHVxZWRsoYuqLZ+ ASXvnRiRxs4Fc1EwqnZqq7/7jBB/py0XtYQK7Lu29yqakiAYWxR0NLtsjUJhLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708989776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gDUElWmpPVSFeNpdl0AmPQ+orFgfC6aE2pB9gRU386c=; b=FI4Aaj/SaQsVfSyK2F1UBOuxYYrlh8SVRutoa4tydTB68UHJIFCfsLGM35ayYDkh+jck23 W4V0vGuxCVd5NqmzY/OrSIQX1X8+dfDYzHLCKgp+9A41IoyvohbXB+hKhkIS8dz0ZDJVBp twYt4tfq3ouutVIzDQhErEI4xuYUv7xZrIPFrrYWriFkP3u3gJwNb84FWCy9mNNgoT3QvP Q+SP8VYmvSc1SqxNKHQgm31pYKJl4LbRecloL076cIJlKHgWTMFUnY2vb65YxS4SdrGJ4c 0GGzTTj0IxIrd9KpmgBoVv+i2MdLv/KDjfvxltTephkJELj0pjCOacNbxYThWQ== 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 4TkGr02qWrznrL; Mon, 26 Feb 2024 23:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41QNMuJ2028825; Mon, 26 Feb 2024 23:22:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QNMuZ0028822; Mon, 26 Feb 2024 23:22:56 GMT (envelope-from git) Date: Mon, 26 Feb 2024 23:22:56 GMT Message-Id: <202402262322.41QNMuZ0028822@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: f8d5fb7db333 - stable/14 - snd_uaudio.4: document sysctls 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: f8d5fb7db3332ced2e13c67d9dbd4fb79d9acb22 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f8d5fb7db3332ced2e13c67d9dbd4fb79d9acb22 commit f8d5fb7db3332ced2e13c67d9dbd4fb79d9acb22 Author: Christos Margiolis AuthorDate: 2024-02-12 11:06:00 +0000 Commit: Christos Margiolis CommitDate: 2024-02-26 23:22:32 +0000 snd_uaudio.4: document sysctls Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D43649 (cherry picked from commit 5960ab73d865b59bfa7d7fd3bd49a6f7d730ef83) --- share/man/man4/snd_uaudio.4 | 81 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/share/man/man4/snd_uaudio.4 b/share/man/man4/snd_uaudio.4 index 04dc10ccaa25..b6a6c06a2312 100644 --- a/share/man/man4/snd_uaudio.4 +++ b/share/man/man4/snd_uaudio.4 @@ -57,12 +57,88 @@ A USB audio device consists of a number of components: input terminals (e.g.\& USB digital input), output terminals (e.g.\& speakers), and a number of units in between (e.g.\& volume control). .Pp +If the device supports multiple configurations, and there have been no +user-supplied values specified through the +.Xr sysctl 8 +interface, the driver will select the best matching configuration supported by +the device during attach. +"Best" means the configuration with the most channels and highest quality in +sample rate and sample size. +.Pp Refer to the .Ql USB Audio Class Specification for more information. +.Sh SYSCTL VARIABLES +The following settings can be entered at the +.Xr loader 8 +prompt or in +.Xr loader.conf 5 +and can also be changed at runtime with the +.Xr sysctl 8 +command. +For a change to take effect during runtime, the device has to be re-attached. +.Bl -tag -width indent +.It Va hw.usb.uaudio.buffer_ms +Period of audio data processed at once, in milliseconds, from 1 to 8 (default +is 4). +Lower values mean less latency, but this can result in audible gaps due to +frequent CPU wakeups. +.It Va hw.usb.uaudio.default_bits +Preferred sample size in bits, from 0 to 32 (default is 0). +A value of 0 sets the sample size to the maximum supported sample size. +.Pp +Set this to select a smaller sample size if the device supports multiple sample +sizes. +.It Va hw.usb.uaudio.default_channels +Preferred number of sample channels, from 0 to 64 (default is 0). +USB 1.1 devices are limited to 4 channels due to bandwidth constraints, unless +a higher value is explicitly requested. +A value of 0 sets the sample channels to the maximum supported channel number. +.Pp +Set this to select a smaller channel number if the device supports multiple +channel configurations. +.It Va hw.usb.uaudio.default_rate +Preferred sample rate in Hz (default is 0). +If set to 0, the device's highest supported sample rate will be used. +.Pp +Note that if VCHANs are enabled, the sample rate will be overridden by +.Pa dev.pcm.%d.[play|rec].vchanrate +(see +.Xr sound 4 ) , +which can also be used to adjust the sample rate during runtime. +.Pp +If +.Pa hw.usb.uaudio.default_rate +is non-zero, +.Pa dev.pcm.%d.[play|rec].vchanrate +will use it as its maximum allowed value. +.It Va hw.usb.uaudio.handle_hid +Let +.Nm +handle HID volume keys, if any (default is 1). +.Bl -tag -width 2n +.It 0 +Disabled. +.It 1 +Enabled. +.El +.El +.Pp +If +.Xr usb 4 +has been compiled with +.Va USB_DEBUG +on, the following setting is also available: +.Bl -tag -width indent +.It Va hw.usb.uaudio.debug +Debug output level (default is 0). +.El .Sh SEE ALSO .Xr sound 4 , -.Xr usb 4 +.Xr usb 4 , +.Xr loader.conf 5 , +.Xr loader 8 , +.Xr sysctl 8 .Rs .%T "USB Audio Class Specifications" .%U http://www.usb.org/developers/docs/devclass_docs/ @@ -98,8 +174,7 @@ sysctls. .Pp The PCM framework in .Fx -currently doesn't support the full set of USB audio mixer -controls. +currently does not support the full set of USB audio mixer controls. Some mixer controls are only available as .Va dev.pcm.%d.mixer sysctls. From nobody Tue Feb 27 04:39:59 2024 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 4TkPsq6rfgz5CPp9; Tue, 27 Feb 2024 04:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkPsq4PT8z4FMh; Tue, 27 Feb 2024 04:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709008799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HFU510uEY12lfWq6EYfaPSStrhoxbDbSPnSf1ZtwAWc=; b=UYs4TWEddRcVDNJIQLAo1IL8ipzhUDVqBX2O+fmx1ScKfnouYqi0METJIYWDMEi2y58cEs X0mbR/0tjP0GkDAZ74whjmSCg30wOuXT02gYCONkya2QPj8dDA5YJAJpLTGVfmblYeHuCy dzbE1e0Hkin/nGjsGYKmTCFgbGjXuP39jE1wzqeJHkXEKXrPAoqZYHiah+uRpdkHiAGJ03 3D4+Y+7E6TLPtM8HM7PyYObTa9c8zenLapInq7/roR8SG41XFbcPCR7UuNO1ymPKz0+MIo QE4pGbSkinnQmWsFh/2BrQHy6rLOX/H68wQvo1vfUtEcavVOHW60admvhkvp2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709008799; a=rsa-sha256; cv=none; b=wcHA5h8LLItMq5RqrRcmsSZRU3nhR3UU9qpCCE3DmErne3qfUaE/iIRScckPPj2iQyHf2R 6Yub4I8IkcJQPEau0L1sOWaz1Mw0reM2vRG8MuuIxYTLXceXkUWkaCNQ/Sl2mudsjISJna jOamqqgzO/ahcKLnG8wtbFAGczWkL71iMvSEeifn0yOyssb+SLl4I/DsoG+Js6nd4acMyV peZW+oMRBI+s67nG2jfqlhvgLSAo2V/UfMRScez3H9D5CgXbkQoYPRyCwMZub9puM2bggU hGwUEVxn8snGyJ9MOvWzvc03zSXnpMgZZgGL2w0iXU+BLcxuhRkPewtg9Wngog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709008799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HFU510uEY12lfWq6EYfaPSStrhoxbDbSPnSf1ZtwAWc=; b=clzFZZT7Zq4ESwwb6tveEtXuluFxgpBCPS3k/2zFiamOsI3etDgyKIHfIBfRnU8R4YvZzU 0QizDK9hceq2hf2KEjJTTakTY2gqsbcupM0t+Q2dLVynDInGc+ir4LCL8iChWi71sUPPXq 3kOadcUj7xkWe1dUsGvaZzRuq/kqC5PcRgKWRGsdH5j3Zobt2INFXDOwr0as74KHS143V9 a0upFXANmJZ9NyOJ5PYfXp2OZmTStqVjQ3Rzqq5XQUGPLIEE5zc4qk6lGNKpqLuzy6owjV wb+oBrDWDBVnVRAIJgSpObxd25LQ4+owRkoPp766/xwmZxBOVYfo1nMxcMLUYA== 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 4TkPsq3K2rzy16; Tue, 27 Feb 2024 04:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41R4dxT7055319; Tue, 27 Feb 2024 04:39:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41R4dx0x055316; Tue, 27 Feb 2024 04:39:59 GMT (envelope-from git) Date: Tue, 27 Feb 2024 04:39:59 GMT Message-Id: <202402270439.41R4dx0x055316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 6a9a097df9da - stable/14 - Add link from if_iwlwifi(4) to iwlwifi(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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a9a097df9da00ed8882fbca5c18c6ecd1d9a2fa Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=6a9a097df9da00ed8882fbca5c18c6ecd1d9a2fa commit 6a9a097df9da00ed8882fbca5c18c6ecd1d9a2fa Author: Li-Wen Hsu AuthorDate: 2024-02-22 18:45:22 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-27 04:39:09 +0000 Add link from if_iwlwifi(4) to iwlwifi(4) MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 1b09a310b78cd2965e3a2fc392327d9cc1376a44) --- share/man/man4/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 820bfa456448..a2d544034005 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -691,6 +691,7 @@ MLINKS+=ipfirewall.4 ipaccounting.4 \ MLINKS+=ipheth.4 if_ipheth.4 MLINKS+=ipw.4 if_ipw.4 MLINKS+=iwi.4 if_iwi.4 +MLINKS+=iwlwifi.4 if_iwlwifi.4 MLINKS+=iwm.4 if_iwm.4 MLINKS+=iwn.4 if_iwn.4 MLINKS+=ixgbe.4 ix.4 From nobody Tue Feb 27 04:40:00 2024 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 4TkPsr4zk5z5CQ79; Tue, 27 Feb 2024 04:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkPsr2C6Kz4Ff4; Tue, 27 Feb 2024 04:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709008800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xsiy1rMFNSpgDalCHCgD65/2cjmtoykmSeFg5DjmLu8=; b=kDIPpuNqpaLDvBwIryrGWhtWeRYb/UgLdpE1em3Ww6IeaOrDqFH8+qnnAI1Scd9paoA+eI e16hkkgMLhfqYZPIMGg8WXAHTL/Vlkg943+X8wV5bW3OwxZgzz8oOV9vo4scOq0Kp00XFZ 1RsLHU9YLKwITOb9L6j/6aWsAbHEh2sER0cP+hGKQP2oxTjwRUvMhHz9EnQ7GYSUwFK2ei uHSBXTp555mGBBL2rPoiw/BY1XblV4tk6Z6f6J60KdztcCSpNnj311SGfq6Di/I87PJy+S kI4WxNZnD8sAt/B8DM34aL3hqRqRjX4e/6d8OmIOKXNPkS6SNGW9Odz7mGXT8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709008800; a=rsa-sha256; cv=none; b=A4FiL1Hg8lMJu/rOa+BdWkRoMcpc2yHBXulnZK4fYW/tRXG9dvLrBXA4ntgct0VWi6q0KD XkWJf+N/F+jXhXi54XvhAghtJkZn9nKlia25GTQVt7XSLawv/ZiQ0/Llvr5BvXM4izbEm4 sJV9wl8z1b6KyN+9zc90vdJxOr0gFBHY53ePlQXTogkfdsZOhMmETIh04MO7UGIJ/9GGRr WL0QOGKRVFiFgltJrDY+ziJb+XeSLFA2TXYz7c+hD0d9oZec7xOey0qqQ6dcD6PgQElOmv uIE3ldEW8XzjWZOZ4YH8qPckpXJxAdp5CSkysliD7In7Yxs4ZgrA5xFxea+3kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709008800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xsiy1rMFNSpgDalCHCgD65/2cjmtoykmSeFg5DjmLu8=; b=DSJN6qAqQCiI7S/e0el9xl2a6e/W7Oa5nUOX6GLTxDLhk0D2Y/QSPojXfyWu49loivdWrL TShJkbuHdcS4Q6P28qgA/NOOpbnIaT2ZTm452ikNL2CaabAOW+JYzYK+PwDe8MFI6a6W2S L6/nRrFFjEGicPsHz78fLw/fnLqxYj098IFc2Lc40/7d5dWjCK4KIWlUBeh0HNP0Yft1UX 21HvCBR0D+ZwKGnWvCHXBIGcofQhSnAYsJwe1ZJpDN1XRf1O3B7//qE53FQmCKbYwisfCG 6K56Jf4ipbw+AX1CuRUMyZmMojlUXwlJtyAdTMzpMR5OqSJGUEBejjET9rrZYw== 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 4TkPsr1JX6zxhs; Tue, 27 Feb 2024 04:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41R4e0UE055450; Tue, 27 Feb 2024 04:40:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41R4e0TD055447; Tue, 27 Feb 2024 04:40:00 GMT (envelope-from git) Date: Tue, 27 Feb 2024 04:40:00 GMT Message-Id: <202402270440.41R4e0TD055447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 2f8ad699a753 - stable/13 - Add link from if_iwlwifi(4) to iwlwifi(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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2f8ad699a75376e9a538988c88601a559239ce10 Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=2f8ad699a75376e9a538988c88601a559239ce10 commit 2f8ad699a75376e9a538988c88601a559239ce10 Author: Li-Wen Hsu AuthorDate: 2024-02-22 18:45:22 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-27 04:39:24 +0000 Add link from if_iwlwifi(4) to iwlwifi(4) MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 1b09a310b78cd2965e3a2fc392327d9cc1376a44) --- share/man/man4/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 5f7383ab2080..83bec8e9f66a 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -710,6 +710,7 @@ MLINKS+=ipfirewall.4 ipaccounting.4 \ MLINKS+=ipheth.4 if_ipheth.4 MLINKS+=ipw.4 if_ipw.4 MLINKS+=iwi.4 if_iwi.4 +MLINKS+=iwlwifi.4 if_iwlwifi.4 MLINKS+=iwm.4 if_iwm.4 MLINKS+=iwn.4 if_iwn.4 MLINKS+=ixgbe.4 ix.4 From nobody Tue Feb 27 08:24:44 2024 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 4TkVs85JjWz5CkYh; Tue, 27 Feb 2024 08:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkVs84mpSz4dJW; Tue, 27 Feb 2024 08:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709022284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FZtJKE7Ys+0qm+eMeisQ6fphgWJldtZWDorwtzxthGE=; b=tnAGM54qV26fHm5tuaHeFer3FaQ0V5juc1qBH94uE+X9lTxxTIr5LnpPWwxsDkjCeV6isJ 2uz4PlcPp98CQZUT+072nAN52MC/D9CW9SL2qIE2DdjPOe+3mZlAsLk0T+lVVmdBkqzcdJ XCtJ/qZ7zB9ud+ppbdZhF22LvFFqNRwm+jL8Cd1p0rxQ0nFDl0Pc8qeYergWyVg9HwAX25 UM+D1G5nn4YhSLXKuAqbYO8mXclnIzQr9rxBALmJZetS/JcfjJ/0+2KTxYuvS4HYQ+o6dj O5tSfaZuZ83undG1bALgKKBgCgdQjgu+GeYP0HUns3ELwMuviXsKsY6Z89bY8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709022284; a=rsa-sha256; cv=none; b=OoY8FB0Gyv5JItVLePHoefGCCBMOd+L88ot4CHWqv8rUKmFcBrY2iEmEJ3v0BoryIV5wIg uwEoiy54JUfJUZeb5iL/yt8A7/YEqM18pcJpOfB2DAA58OiTf426y2noOgpQimJQJtFf93 4la2RJV6wKYNj7EIpXVVJKjl7dfeNdy7W4M6+Q0nluO4TLAwmWQNeMv9KIji9z70MkO6f9 TGhEQaMu6UEcuB4yHbrBTncnJeoOY1BNhh+ZozmDvAWgKBFeXg7ZYhH6T6mp5995TSTfSp mDOXSY5yInDzZZmQ8B09UQim2vUqYJvdmwiMYgMCn36mjovCRPQ8oJkXjTLSig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709022284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FZtJKE7Ys+0qm+eMeisQ6fphgWJldtZWDorwtzxthGE=; b=q7NIz8qesLf7Zoj9NduWLp8R7ymxb9IWug4plqTMdBniy1W6C1EjztXH+cuO3u9/N7P1WP 1IGmYRawaqdvUB29XGD3UdeQ/uSQAyYyaXXF8PBELpIbLxiItGWEs1iIEQfUQ6RbhmILIz BgHbBhOc78bEao7Ar/9uSHK7sYW71jklxbG+B+hB5DKfaYA4PH+j9MkTjJDtd6P+lZINbL JLOEjvi1dTbQu6tJ/TdPH9141pFZkgdSQu5C+Lhci9M0DA67LM6703PuRTVHV10/i0wrPz dkZtaC7+bzMPaOwCXabh+AVfHCqdpW2f2iO1QeOCExzGeZgEgToJ9B84tcfOWg== 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 4TkVs83qYsz14BR; Tue, 27 Feb 2024 08:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41R8OicJ043865; Tue, 27 Feb 2024 08:24:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41R8OiX0043862; Tue, 27 Feb 2024 08:24:44 GMT (envelope-from git) Date: Tue, 27 Feb 2024 08:24:44 GMT Message-Id: <202402270824.41R8OiX0043862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8bafcf60ef68 - stable/14 - if_hn: Fix two typos in source code comments 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 8bafcf60ef683c5ffc44bd334c196ae911a0c8cf Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8bafcf60ef683c5ffc44bd334c196ae911a0c8cf commit 8bafcf60ef683c5ffc44bd334c196ae911a0c8cf Author: Gordon Bergling AuthorDate: 2024-02-24 09:13:44 +0000 Commit: Gordon Bergling CommitDate: 2024-02-27 08:24:34 +0000 if_hn: Fix two typos in source code comments - s/managment/management/ - s/transacion/transaction/ Obtained from: NetBSD (cherry picked from commit 61b88a230bac766f55984d8d33b98845d2b0d1a9) --- sys/dev/hyperv/netvsc/if_hn.c | 2 +- sys/dev/hyperv/netvsc/if_hnreg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 7d8e1914163e..6e1c9771a02d 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -2523,7 +2523,7 @@ hn_detach(device_t dev) hn_stop(sc, true); /* * NOTE: - * hn_stop() only suspends data, so managment + * hn_stop() only suspends data, so management * stuffs have to be suspended manually here. */ hn_suspend_mgmt(sc); diff --git a/sys/dev/hyperv/netvsc/if_hnreg.h b/sys/dev/hyperv/netvsc/if_hnreg.h index 59ed38b71c72..bc6256bb375b 100644 --- a/sys/dev/hyperv/netvsc/if_hnreg.h +++ b/sys/dev/hyperv/netvsc/if_hnreg.h @@ -58,7 +58,7 @@ #define HN_NVS_RNDIS_MTYPE_CTRL 1 /* - * NVS message transacion status codes. + * NVS message transaction status codes. */ #define HN_NVS_STATUS_OK 1 #define HN_NVS_STATUS_FAILED 2 From nobody Tue Feb 27 08:24:59 2024 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 4TkVsR6hB3z5CkW8; Tue, 27 Feb 2024 08:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkVsR681zz4dVm; Tue, 27 Feb 2024 08:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709022299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ol6AiVj4xIyrYiyUJGRyUrQ1Y+Hw6KHpSoBy8mBATwM=; b=c9TstRRPjFz14rU+R32dSXE4l2vKG2UwDzD1PglpZs0PLK/nab2qnAe9B9xCuVfawRKp72 rxwmPgUB2Pd1/Wu2bgbdR1yXFLJX3dfKUYIe17POQN0JVppqSPhlY+EIfy03HpN+Fm1kZQ IC9pqafXGgdlR/vo4+sfbCp6EjVOKLRc+e6Sx9V7upxLr9QIfy+u592h6QdB4e0GmVE52u 48YTdRR1Q+K/3+2msGoLTWXTHY9LWJQQ9fxc9oUl1YNvlITqxAupJCgpLX4yWVQE4wpk0a owqu890ohif+cQS40QyMLajBmkPCukHsfFyCdQpMDo8CWtijhym83JzN4jPvig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709022299; a=rsa-sha256; cv=none; b=O96vgEJuMTxFLUaXjdmSIHKlBYeWdFrhaVxwGOpAUTy3ya0Y8io0rM1uxxjvwaU5Jny5cJ dxSL3tdSenwfoaJCOHEZ4FiEFcKPWhdlB9PTZ6BHn7fyjnuffrn24xDZ7h4XOUhdviv44b m+76A8aKOauj45mRK470tUuPO9pAhLeILbxZ/WZys/+N+U3gmV8PeeqtuHmvq8yFjJOK13 cyTttjdjx+9gNR3XcUARGvEpTUxFntgbrXz0jOfv4v+gQurdhT8MHF1vPfEUt2bU8V+sS/ 8en4FazHxkOvJ0iT9GuHwMrbf5nhIT7y5NwNMp9GqFE2QFgWTxx4rqGFcf6C8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709022299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ol6AiVj4xIyrYiyUJGRyUrQ1Y+Hw6KHpSoBy8mBATwM=; b=j2JvocXP1waayF1XnJvN7nic4joQx52C47EsCzUcNXzXvZJwdf7//m67kJLqfYbYNJZ8I1 PjeyS3cL0P0ZfOc4QQbrEhQ3lK4CFFo+OQzivBBW+Wx71jLOLE8DQ0pR2w+HhQAzIqU2Nx WdENSRHiG5YDt8HdidUuPm3Bm9XZBmcnegIFy1ORJIMO0X7gBt5LKlWvHjEl/1aBSrjuVT km7hjoyaDKFx+4qBQhqlZc7VIxilAXZtYFuVxADAdR5cwWVzf2uUKzxZJXsttMLaV7J5U0 ifcebEukXwSPZ9SOupqCgsdyzqS0AxvvGN8NHJp/dPAZc5jZqipbPr6PtlfLKQ== 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 4TkVsR5D7Yz14Qx; Tue, 27 Feb 2024 08:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41R8OxZp044042; Tue, 27 Feb 2024 08:24:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41R8OxGh044039; Tue, 27 Feb 2024 08:24:59 GMT (envelope-from git) Date: Tue, 27 Feb 2024 08:24:59 GMT Message-Id: <202402270824.41R8OxGh044039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: a8ed50b57e04 - stable/13 - if_hn: Fix two typos in source code comments 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: a8ed50b57e042c5bcb788c888b49ecd713f34279 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a8ed50b57e042c5bcb788c888b49ecd713f34279 commit a8ed50b57e042c5bcb788c888b49ecd713f34279 Author: Gordon Bergling AuthorDate: 2024-02-24 09:13:44 +0000 Commit: Gordon Bergling CommitDate: 2024-02-27 08:24:52 +0000 if_hn: Fix two typos in source code comments - s/managment/management/ - s/transacion/transaction/ Obtained from: NetBSD (cherry picked from commit 61b88a230bac766f55984d8d33b98845d2b0d1a9) --- sys/dev/hyperv/netvsc/if_hn.c | 2 +- sys/dev/hyperv/netvsc/if_hnreg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 0aa7e6fd40fc..a18f608e1aab 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -2535,7 +2535,7 @@ hn_detach(device_t dev) hn_stop(sc, true); /* * NOTE: - * hn_stop() only suspends data, so managment + * hn_stop() only suspends data, so management * stuffs have to be suspended manually here. */ hn_suspend_mgmt(sc); diff --git a/sys/dev/hyperv/netvsc/if_hnreg.h b/sys/dev/hyperv/netvsc/if_hnreg.h index 59ed38b71c72..bc6256bb375b 100644 --- a/sys/dev/hyperv/netvsc/if_hnreg.h +++ b/sys/dev/hyperv/netvsc/if_hnreg.h @@ -58,7 +58,7 @@ #define HN_NVS_RNDIS_MTYPE_CTRL 1 /* - * NVS message transacion status codes. + * NVS message transaction status codes. */ #define HN_NVS_STATUS_OK 1 #define HN_NVS_STATUS_FAILED 2 From nobody Tue Feb 27 08:25:13 2024 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 4TkVsk2k7lz5CkKq; Tue, 27 Feb 2024 08:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkVsj71hkz4dyW; Tue, 27 Feb 2024 08: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=1709022314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z12Plb3piTWu1KFj00ThEtxaKv4VPVJrzb31Hwgjpqk=; b=ilWttrjb/Nn06aOHbIgsXbBGkwpqYnFSA0HhT/2C1UFAaspoGmQaItgJEFf1PQ7cVbuVUu Q1fM2BZkp0JnkskQx+0A8SIaNPObmQXriJmjSe6uXRXUCI+rTprwlrdLdb8YSMnU6Cu9KQ ehCoQdlNy0NoS0NFDLduiXPFGObklYplhgM6vQmJKPst1K24H21sHwjWELRFWaoe95hvoo MuzahJow02INeKclWu5k+DmPZ3kS5gbrR8l7wdKLI7pC4ZzIsnA6XG/BxUWeoTB1/JUMjJ zWQuZ3oKtoZmWX2MTEhdBNyN+C5zn3dfNdaaPWG935Hw/C6/KxKeOhEWT4Ql9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709022314; a=rsa-sha256; cv=none; b=sgQf5/ygF6AvQO8mZm6d2fIMRpoW0eXXie/7QPq0KPmz8khiMhNJkrOgncVjZjl28XTx9v qeWHAIodzPn7bvqunm/kx7T/WR5m9SZsK3HNVI6VIh5I+B1P+nCRX5eDVEqAjuUDCSbTYE tsDZ87bPV55bma2u9zjZ0ZkEPSSgvVz1o/zfVXQ1pEeGa63osjg7yd2507iFc+jM7yPaVQ Dbzvs/y9zfgrhzluYwjUpyxxFuvmJowr3VkF3+hor8h7jE24IvGFUmEnEjDkL9EQ/k5abe pgfusgmFH8sIOwjWqMxX/NqUaXlPB6Mgl+QnILzZwGw/sW+Yri+GhUHHVSNvig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709022314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z12Plb3piTWu1KFj00ThEtxaKv4VPVJrzb31Hwgjpqk=; b=RiAcnGh36nbG7IXlu99vmEvr1LZ2h7NplyLj8FmigJOFyap2DrL4ScNt8rMBlMeXWF3AcO 4PFzw1C0w9AhQedb9Ush1hzMvWvfGkeOPphkDIG712X0d/h+sYnBTcrQneD7AN80DlvMCG 7W0B7KUA3ZjDpGt+l+qje/MzW4Nm2WafiQmjrTL0Fme4TipcDl45P+JIuF+ScwD8OyKZLl 8W+i6bMadK8yk5EkwztgJSe8Odjtd6hxYH5zPRBC/Y93fhcDEcKwWUm/h1gZBGnEq6Lfsz mFDotLK5erq1fVX2F6prV/+30onOyk43V8wP8sq/wk6bBPc+7wP2qc+/AFT9hw== 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 4TkVsj66Btz14Dq; Tue, 27 Feb 2024 08:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41R8PDvW044232; Tue, 27 Feb 2024 08:25:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41R8PDkY044229; Tue, 27 Feb 2024 08:25:13 GMT (envelope-from git) Date: Tue, 27 Feb 2024 08:25:13 GMT Message-Id: <202402270825.41R8PDkY044229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2ba9bcd97608 - stable/12 - if_hn: Fix two typos in source code comments 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: 2ba9bcd97608923c084edd6d7a36bf5b5a73f6be Auto-Submitted: auto-generated The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2ba9bcd97608923c084edd6d7a36bf5b5a73f6be commit 2ba9bcd97608923c084edd6d7a36bf5b5a73f6be Author: Gordon Bergling AuthorDate: 2024-02-24 09:13:44 +0000 Commit: Gordon Bergling CommitDate: 2024-02-27 08:25:06 +0000 if_hn: Fix two typos in source code comments - s/managment/management/ - s/transacion/transaction/ Obtained from: NetBSD (cherry picked from commit 61b88a230bac766f55984d8d33b98845d2b0d1a9) --- sys/dev/hyperv/netvsc/if_hn.c | 2 +- sys/dev/hyperv/netvsc/if_hnreg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 97346272b993..e638e3ecb58a 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -2532,7 +2532,7 @@ hn_detach(device_t dev) hn_stop(sc, true); /* * NOTE: - * hn_stop() only suspends data, so managment + * hn_stop() only suspends data, so management * stuffs have to be suspended manually here. */ hn_suspend_mgmt(sc); diff --git a/sys/dev/hyperv/netvsc/if_hnreg.h b/sys/dev/hyperv/netvsc/if_hnreg.h index 54db556cc56d..ff2da480c0ef 100644 --- a/sys/dev/hyperv/netvsc/if_hnreg.h +++ b/sys/dev/hyperv/netvsc/if_hnreg.h @@ -60,7 +60,7 @@ #define HN_NVS_RNDIS_MTYPE_CTRL 1 /* - * NVS message transacion status codes. + * NVS message transaction status codes. */ #define HN_NVS_STATUS_OK 1 #define HN_NVS_STATUS_FAILED 2 From nobody Tue Feb 27 10:38:30 2024 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 4TkYqV6lnGz5CvlS; Tue, 27 Feb 2024 10:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkYqV51Bfz4sjk; Tue, 27 Feb 2024 10:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030310; h=from:from:reply-to:subject:subject: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/zzQYhPS/ws689boKvkG3ok+ei5GQyAX4dMgbEOu9M=; b=gyxZBIAAsD+6sVnVC3UvXsoskF+0FZ9fxxbkShlv2Q+fTDqcjr/fyZg7UVeyFS57z9e4rx UUHVEGpL5sTg2w4nHgEj5b2ruxRxgMJ27YXtlu+Qpg4kPWCA/eXqwzlvu7mQS/PqxI0QbU T4RWB40a+ztRSdI+HvESlUmRsPf1txHLavCo4epEc4a+C/iSKhh2z76Lu2ihkmmBH2rHr8 prvHPZmd/qTGvhSohJiUOEX7unzGO68wJABDBNoYBcruw4F2yQuGv1Btjiaw+vM47uNFHp MxMBBV4SXapbN7c5ZOn2XCRNvUmgmEmAyXAtzGza9VBQs6auBFd8up+q6TBKeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030310; a=rsa-sha256; cv=none; b=mgwNTDsQN5lPdHn3+zecXcySEBLzZhDyiLKJFItqX6n5wTJwjuqeSfOLLjx9KT0RyrHC3s j6jDaPREwhv/PwpLbYscwmFSdgtpRDioaxyFo6eCxxQbXULHGthqSbnWnuAosCAcIf8+lm VBgwo2vgQW/B58Vt+b57n0puh0xrF87TihipSzQsDazP426xL/dWvJpQDaN6eyInmhWuSH uhUzW0KaQiVPM+SfiO+LwqyFVRoZwVTv1TejsGO8W/8tjy+t4eb94AFCJXevZJMTk3voQ2 1hWMnx1Sl/p3WnEF0BfVPwm+qedALvGZ347UhsPT38pU9+sqkV99NYxRKAp0zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030310; h=from:from:reply-to:subject:subject: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/zzQYhPS/ws689boKvkG3ok+ei5GQyAX4dMgbEOu9M=; b=HfXVxugafKydDV7fE5KECCwCdC5At2nu1YqdOjo2VNz+sQBRw2yt3M3qVgV1B5Az0jqnxp /YZGAZEHiPJCz5A/ybrsWHi+hhrUfqdKedtePbLzf+KLiNk4i8m0yLnONHBpVa71PVx3eE 8qe37NkrOhSFn/pIEAFAopTUh9FofL1vUeVO1JK5BUoCc6HU8SWoujQ12nmpxvfUO/fCHH jo+Pf/17Eo4sJK64XqRTWtGaB23W+CnXTrIr0HQ85G10L/S3GIeCX6VX3fOxpuHJUf8381 A14bvscX5+jKfrv0/qUV2oQTr0ZUV+2avpuCs/ezLL7O7cq+xX3nls/Tzb5DEQ== 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 4TkYqV44WKz185L; Tue, 27 Feb 2024 10:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RAcUf0063860; Tue, 27 Feb 2024 10:38:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAcUD1063857; Tue, 27 Feb 2024 10:38:30 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:38:30 GMT Message-Id: <202402271038.41RAcUD1063857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: d3de30d0186b - stable/14 - sched: sched_switch(): Factorize sleepqueue 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d3de30d0186b7ac984a272b4d874613c5fb59580 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d3de30d0186b7ac984a272b4d874613c5fb59580 commit d3de30d0186b7ac984a272b4d874613c5fb59580 Author: Olivier Certner AuthorDate: 2024-01-16 09:42:11 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:36:57 +0000 sched: sched_switch(): Factorize sleepqueue flags Avoid duplicating common flags for the preempted and non-preempted cases, making it clear that they are the same without resorting to formatting. No functional change. Approved by: markj (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 6a3c02bc52892eb09c3b766562b8ddb452c393a9) Approved by: emaste (mentor) --- sys/kern/sched_4bsd.c | 5 ++--- sys/kern/sched_ule.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index efcd9b7cb250..f0fffeb08e2d 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -1041,9 +1041,8 @@ sched_switch(struct thread *td, int flags) } else { if (TD_IS_RUNNING(td)) { /* Put us back on the run queue. */ - sched_add(td, preempted ? - SRQ_HOLDTD|SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEMPTED : - SRQ_HOLDTD|SRQ_OURSELF|SRQ_YIELDING); + sched_add(td, SRQ_HOLDTD | SRQ_OURSELF | SRQ_YIELDING | + (preempted ? SRQ_PREEMPTED : 0)); } } diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 20515f4e430b..ee1e0ab0b955 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -2227,9 +2227,8 @@ sched_switch(struct thread *td, int flags) TD_SET_CAN_RUN(td); } else if (TD_IS_RUNNING(td)) { MPASS(mtx == TDQ_LOCKPTR(tdq)); - srqflag = preempted ? - SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEMPTED : - SRQ_OURSELF|SRQ_YIELDING; + srqflag = SRQ_OURSELF | SRQ_YIELDING | + (preempted ? SRQ_PREEMPTED : 0); #ifdef SMP if (THREAD_CAN_MIGRATE(td) && (!THREAD_CAN_SCHED(td, ts->ts_cpu) || pickcpu)) From nobody Tue Feb 27 10:38:31 2024 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 4TkYqX00Z7z5CvLv; Tue, 27 Feb 2024 10:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkYqW5yhpz4smD; Tue, 27 Feb 2024 10:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I9zdvJqtIL71gk1jziBmI4EldFTuKmKrLYQ5racjYHM=; b=BT6QsegLex/oDNgWHkBG2TIc1WOQDl9HSBWFaGNNrXCTY11WGVaupFqUCDF25fd5gK7qMd c/Asvbc4LHnmKy34ydbhpkpyKoLdhoo2CrKhDXQcQlr2/1rFFGlIHwWoy7+LX4SYKciI0K pj4niqxQ96bfydgpohBf0wFEnEa4+Uy+N7QZqcobYwuTABpJfC8jmMIY9jlqr88HBgArmn Na+sKTCoatQGu45GBY3T5u+qvRijvCBEPczhQylgyPSDQRjj2z3ATmFft8XEJbWFfRab7X y3n6/WpAzoOOC+LkQ+VAQ2LNNVwB0SJGg44Py8fqX3dUl6ZsH+PF0dBysAYlFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030311; a=rsa-sha256; cv=none; b=ILhwuK4IiH2j1NqInu+CyzCaZA/pb4Px/6FQJ2KbZKzK39EYAw9fOrwxLw6pnpurZzwabg mEMd60CXTSRSDPLMaKB1uWZynYMXQjFkWmG+vbWVYnaqfRZgMWQIg2bE3Cd3FHYvxNvI8a G5QOeNNwCTmmd+3j6tmyC4lRMv5KJ75Os4aESjSVN9GkAiJfnt7nfdhmPbT63bRFdwK4fX YC/IFMvl7/RqLdd0N5AlRg1pJWq1GDyIBJlTdGnyMVQrInGeDqkKp3ywMt9IfhP1ffnpSk b4yYgrcD5z4LjwMCuCKK1Fwgq8s+0pXsOaEMJoiwt1tdLLFzXdO97RCHYTOnZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I9zdvJqtIL71gk1jziBmI4EldFTuKmKrLYQ5racjYHM=; b=Xa0COne15pTDW6WFwAV4vWPA+/5Cf01Ml70PjAO40SxKuHFjm4NE4ZQ/9wRaH4QhPkBYJl itmpMm6PB+BDDAez/8b9fnLgd1MZ8C8FrgIgpEIv1stNgKzf6DYjvsiFkE6Djg8gnF6ZoK HnrB8B4gx/XMppJjincpiwSlO3vnFooEZbQeLe/QhO7bQc6urA7/+1gph4Idtw2CMv29zf IPN2We8nDwv828xT2H2fGTc65vdJDEOUrUc7J9WmPI6bElKrY1hb/+Od/wZxkeCIvgrQv5 Cjrz0QAwpiOhV712gNAStwKNd9egAt1cg68r5hjqP+VIWXHhPEbuds853EWNiA== 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 4TkYqW5212z187n; Tue, 27 Feb 2024 10:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RAcVuT063899; Tue, 27 Feb 2024 10:38:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAcVZC063896; Tue, 27 Feb 2024 10:38:31 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:38:31 GMT Message-Id: <202402271038.41RAcVZC063896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: ff7f93814c37 - stable/14 - umtxvar.h: Add missing include 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ff7f93814c37c17c2440d7d6cb0cccc36084786e Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ff7f93814c37c17c2440d7d6cb0cccc36084786e commit ff7f93814c37c17c2440d7d6cb0cccc36084786e Author: Olivier Certner AuthorDate: 2024-02-08 20:11:17 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:37:08 +0000 umtxvar.h: Add missing include Necessary to have the definition of 'struct timespec'. No functional change. Approved by: markj (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit bcaa0b4c2bab2866d5ee11c9eb8900a70bdb21e1) Approved by: emaste (mentor) --- sys/sys/umtxvar.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/sys/umtxvar.h b/sys/sys/umtxvar.h index 216c7a3e2cd1..647ee2a4650c 100644 --- a/sys/sys/umtxvar.h +++ b/sys/sys/umtxvar.h @@ -32,6 +32,8 @@ #ifdef _KERNEL +#include + /* * The umtx_key structure is used by both the Linux futex code and the * umtx implementation to map userland addresses to unique keys. From nobody Tue Feb 27 10:38:32 2024 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 4TkYqY1cg3z5CvPJ; Tue, 27 Feb 2024 10:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkYqX6kxZz4svh; Tue, 27 Feb 2024 10:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DftR0Gagdph5vJzPlqwd9HmnzNDmcMZqqJGvCMYzCb0=; b=yaHT8u4+KCvisG+P1iTGazl4XwgbfZ/NLC9oMcM1jD0q+gixAoD4+JEu9t4RjYbHJ6Ar7d J3/s/zNnqEamWjkhp5+h4CvEy4Csjbx6dr7CN2jOcE5KZ74XRz3u7owWmUMmWT7e3pCj9X coW2YpI/r5LsWUVYZsVzBmN4WhE2a534nj5e18kFMIc+hXF/Abx0BByx6MoWMzKFKXQzjI 4DOEAg8L7OWvc7h/cJp89k9R/OOHkogQK5qB+K/O3zmZ2cFtWug4MZ6eI8M0RUxgerv8xV lEO3+rXQnesgK1yWkY+adBfnbAWOu7oVoFc5X9fyOJk7wLnUCrNEmCsJYg82tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030312; a=rsa-sha256; cv=none; b=YgRsQhqapk5mXe03Sw/tjLlgKLKRA6WIP6Fhl0YMxISSo9z9JgaZR3Wn35IiSCdwbJdYFS B7ePY6zD9WBbmBZnK2qd8M7rmUg8suICsK+vjek/64hiCoDzFBxVOUigwuHfzDzOduedaB 5XhDGXLGqqxGuTNjNULu9UQtLMzeK/+KKScQS8n06jFTxTG/ePetYOg5LJRNiKIyonkwCJ vl4tjVnmVS7u/sCKUoF7Pl+cI0Xq74u8J2QqBF8DQjL5hUPvMK941Xl82edF53ocuWt/n5 tvZmLU0UxcuIwUXAK6LEOM0XMjXSghPU9+J2Wj0doakCuoLt+a52vTDtbz04Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DftR0Gagdph5vJzPlqwd9HmnzNDmcMZqqJGvCMYzCb0=; b=NAvNATeXlpQZvOIO26RN87OSEolGAFU3hnAsYGUuCgAieyePAXToTc1P/ZXdGLNZfSAeT8 No9hg3Low3Ic+mOl03Wd9jqFgnXtUMjnw4uF7A7qj7ey57nt1W894S7duCNqV2wkNfB2BI PtT6Jbv3iljyQvnerL15odSG0LrYuNAieR0Ni64X514s73TS5CYSTnOLNSNsvbQ84fmEee UVY4VYlnkZU0PJLE/mv+4l5TP8w47kZNn8Ss83enG0wRAPgXM8GFsNHvQZAhYt+qkxAwv5 XsO0mxRcak+wq1tHb9py/k7NDhnyK09EO6V8dPhjBcPaLn1bYfJICfnQj3D8AQ== 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 4TkYqX5r48z182F; Tue, 27 Feb 2024 10:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RAcWN2063947; Tue, 27 Feb 2024 10:38:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAcWPe063944; Tue, 27 Feb 2024 10:38:32 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:38:32 GMT Message-Id: <202402271038.41RAcWPe063944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: e36cb22221e1 - stable/14 - kern_rctl.c: Minimal includes when RCTL not defined 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e36cb22221e11b711830509479fd56df69221b0e Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e36cb22221e11b711830509479fd56df69221b0e commit e36cb22221e11b711830509479fd56df69221b0e Author: Olivier Certner AuthorDate: 2023-10-19 14:28:06 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:37:23 +0000 kern_rctl.c: Minimal includes when RCTL not defined If RCTL is not defined, only the system call stubs returning ENOSYS are compiled in. In this case, don't waste time including most headers since their code is not used. Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (cherry picked from commit e0205aa325c0936ccdd0e635576875786c41f6c3) Approved by: emaste (mentor) --- sys/kern/kern_rctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_rctl.c b/sys/kern/kern_rctl.c index 799fcd76b77e..8e65fabeddc9 100644 --- a/sys/kern/kern_rctl.c +++ b/sys/kern/kern_rctl.c @@ -28,6 +28,8 @@ * SUCH DAMAGE. */ +#ifdef RCTL + #include #include #include @@ -56,7 +58,6 @@ #include #include -#ifdef RCTL #ifndef RACCT #error "The RCTL option requires the RACCT option" #endif @@ -2204,6 +2205,9 @@ rctl_init(void) #else /* !RCTL */ +#include +#include + int sys_rctl_get_racct(struct thread *td, struct rctl_get_racct_args *uap) { @@ -2239,4 +2243,4 @@ sys_rctl_remove_rule(struct thread *td, struct rctl_remove_rule_args *uap) return (ENOSYS); } -#endif /* !RCTL */ +#endif /* RCTL */ From nobody Tue Feb 27 10:38:33 2024 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 4TkYqZ1q2xz5CvfR; Tue, 27 Feb 2024 10:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkYqZ0fhFz4t13; Tue, 27 Feb 2024 10:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/WrlDiYwuCePKgw8sVKMz/avkkTjkRjno+Zoow8Tn9M=; b=greSBs9BzCbaW8zNYSNSj2hiXwbQr6eWySYO5705spsoGyjq/HWHb27AOk2QPiWb9rLHsT 1zcXr5k7+yCudGqCp+lXc9/V0FFu2XUaz1iYoGKLzoBIBS3dJNjdJKRED/yCkkrOFqzoUI qXmaOnNL2y02iVAnhr6A1Pn40R2aRrTqjEiXIKV2GRiROWBsC5WTs994LGzQo7aSE9M7OG p+HWirKwr/tUEO3gQPk7omulxoAg9/XG8XCxTewK4NooBagbJmcEkYeswU5OmZ2wk01a7p sqChJPbOG5/RvB9zy1EDPi1ERmbu42lwCa7FlQ2wXPu7nI0pKAp2OGTkh9/TNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030314; a=rsa-sha256; cv=none; b=iuDLFtGGAFBfPBpxDd8lZC/xTPC3C9Bxz2VGdYCZHmFTIbdfsQn6fWbUcySlskQdGbXWMb AqtUHIKnzmR07GaMIdAHbip/sS8cp3rsKx/39CHda4yioCqfPs0swdSEE0g4vog+oV8PNJ 9ty5yO5TEZbI9F6HZB/9YNBUMegGkGG8QdHyEWtpDpZNKiKUb0rv4JjScK7G/JXM4eClDj rxWFQVOkqOzYGjx3EMUiG8cWFIhG5exHSWTpRnPNM8FVacUw5iebX8oqfhTHJzZHi1kMh+ 9IHc/kDgr5J5Nth6k7WOp959kfCj0jwovaXTAraO6BAkVrei8KpOFkpMuWUE/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/WrlDiYwuCePKgw8sVKMz/avkkTjkRjno+Zoow8Tn9M=; b=fZTDH9JJiHXiOaLG95l8clBsOcK2Ad2+KPBpu+wAwYZC0DFB6qnPmbrdL61LbVz5Yua9My gHz2Z9tSRoWCuBeUNopPgTW+NjG0T/vswnXJwtwHUDJTJ85qjzizhmuosH/WKKEw0RJCTM v0/MQxbMERqUJIJDyAuVObkPAQ++PqmY2xnKOtgP8rJbqPjc7daZcseuHSbzpeHS8S9Ue+ bWSmYiMkx/fAHZ2bIKYWzwD6XLY2U+msWF4iAmQUlaJX34gaDT9cyNCnzDmssvxDrLfnnx Z0lXfPVRrB6L1tvHlaAZLSiNMzVz5t9TlF83Z7+SQADOjpfoZpGjwXRBWDLhcw== 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 4TkYqY6sq4z17Zs; Tue, 27 Feb 2024 10:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RAcXOU063992; Tue, 27 Feb 2024 10:38:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAcXdN063989; Tue, 27 Feb 2024 10:38:33 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:38:33 GMT Message-Id: <202402271038.41RAcXdN063989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: f54344ec12c8 - stable/14 - kern_racct.c: Don't compile if RACCT undefined 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f54344ec12c85fc732f79b6b0f19f45e99cf3e05 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f54344ec12c85fc732f79b6b0f19f45e99cf3e05 commit f54344ec12c85fc732f79b6b0f19f45e99cf3e05 Author: Olivier Certner AuthorDate: 2023-11-21 17:33:08 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:37:33 +0000 kern_racct.c: Don't compile if RACCT undefined Just skip compiling this file if RACCT isn't defined. This allows to skip including headers that no code uses at all, and also to remove the whole file's #ifdef/#endif bracketing. Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (cherry picked from commit 7fa08d415283c9a0c1e2b57edfbb13d722c25735) Approved by: emaste (mentor) --- sys/conf/files | 2 +- sys/kern/kern_racct.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 4d5585b0bb79..b6a85d6a86a2 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3793,7 +3793,7 @@ kern/kern_priv.c standard kern/kern_proc.c standard kern/kern_procctl.c standard kern/kern_prot.c standard -kern/kern_racct.c standard +kern/kern_racct.c optional racct kern/kern_rangelock.c standard kern/kern_rctl.c standard kern/kern_resource.c standard diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c index 37b77243fe0e..43c3da0c2320 100644 --- a/sys/kern/kern_racct.c +++ b/sys/kern/kern_racct.c @@ -59,8 +59,6 @@ #include #endif -#ifdef RACCT - FEATURE(racct, "Resource Accounting"); /* @@ -1364,5 +1362,3 @@ racct_init(void) prison0.pr_prison_racct = prison_racct_find("0"); } SYSINIT(racct, SI_SUB_RACCT, SI_ORDER_FIRST, racct_init, NULL); - -#endif /* !RACCT */ From nobody Tue Feb 27 10:42:21 2024 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 4TkYvx3hs8z5CvyL; Tue, 27 Feb 2024 10:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkYvx3Cxxz4vCl; Tue, 27 Feb 2024 10:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIviaB4KatVXXglFZzM5Qjx1TYCY18P412iOzfYBkYQ=; b=Hmz+eeh7R/ObiDDAj14vPqKUW03FWKzBnvpK/oCAV5JFFP/Tf/X8ea/zhaqL9m9imVj17x 0F4Ui/kx1EZ3DyjdI4ePwg222MzLmTq3PR6OhbGSUEASx8w+quBUAiyLWJ/dkFmXc/UqCn e8T0lZv4Cf9s+EXpJKo8m96H0eQia3rqce46lrFQqxD9UX7zhPd5lqB4Pamh9RKg4bKs0W U8z2HhX/P/0cCm22fFVc3z+Mn6KJUzNNnMleFoUcvhN0wCvuNR+7RpIL0HabvA+w8MwbiL G7yaU3YzjI24b8w3Loe92UqU2BPETxUfdjpQnY0/k963R2EHAN248fbB5BxeYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030541; a=rsa-sha256; cv=none; b=KCNQuzt2ZKdWU3z70ux1hC0zpZKXjupQPAqdVHYugrphD2JzZkho92mXttj2PBUJ8Ox1gz itHClJl5ljOzUjD6bZILOhwQrXrB2VGQ+7PjTFuXOyaFnWcLd7imHLj1k42+kUTAca0QB4 VhfGLJKhMpbRSIx+FcPhHfMdjzuVtxCuTXcCs4EBOd9nOeRHTL0wVwGRssCENGMKggxSQW /3PMZhytrqc282rYuyvLfEtWJP9Tr1BSkE9wIPAmpj9zEWkNeEl4J+VjUb9+QRn5Qpzen3 CLjakOJRRl/Idm1VG4y2ZuPoJN0LgV2InpXPL7VHOjZogJrKJvuYta6IQOPL4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIviaB4KatVXXglFZzM5Qjx1TYCY18P412iOzfYBkYQ=; b=u3HmXkjxZY3FRQ/AVXqnbo9UASsv/gLf/MRlXh7LcMjJrp3NMFp1vvLx9FtOJSfVs+Sbh5 11rduNXnk9xsY16RWwGmYfJRYxilaWb0NhFUGI3tH/p/skU4ac7jshw5QH3lZnmMTXN8di 5KgXsbAPFnR7Sr+PPakrmXCtVkNWs4QoQXm8y6X1Ub/zFa4smCwI6CNa2kiqjpYDxv71Ro TmfhAFu/LuDyqyIMlC8mWMYY9SbDZODEYak3YJFU13Ek5fTLD43+mzcMKVxy+RLeek/gy/ CRQZIZkpw/xf619HjfXuJIE+vRptvgHlnTJRvUYSeG/n1j+7XGB1M+RP3mjojw== 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 4TkYvx2Gnyz18BQ; Tue, 27 Feb 2024 10:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RAgLog079605; Tue, 27 Feb 2024 10:42:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAgLoR079602; Tue, 27 Feb 2024 10:42:21 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:42:21 GMT Message-Id: <202402271042.41RAgLoR079602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 79a1410c0dcb - stable/13 - sched: sched_switch(): Factorize sleepqueue 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 79a1410c0dcbdd5245b2b0af17897932d146daa9 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=79a1410c0dcbdd5245b2b0af17897932d146daa9 commit 79a1410c0dcbdd5245b2b0af17897932d146daa9 Author: Olivier Certner AuthorDate: 2024-01-16 09:42:11 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:41:36 +0000 sched: sched_switch(): Factorize sleepqueue flags Avoid duplicating common flags for the preempted and non-preempted cases, making it clear that they are the same without resorting to formatting. No functional change. Approved by: markj (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 6a3c02bc52892eb09c3b766562b8ddb452c393a9) Approved by: emaste (mentor) --- sys/kern/sched_4bsd.c | 5 ++--- sys/kern/sched_ule.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 621ec77523bf..700f0dca93aa 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -1016,9 +1016,8 @@ sched_switch(struct thread *td, int flags) } else { if (TD_IS_RUNNING(td)) { /* Put us back on the run queue. */ - sched_add(td, preempted ? - SRQ_HOLDTD|SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEMPTED : - SRQ_HOLDTD|SRQ_OURSELF|SRQ_YIELDING); + sched_add(td, SRQ_HOLDTD | SRQ_OURSELF | SRQ_YIELDING | + (preempted ? SRQ_PREEMPTED : 0)); } } diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index e87294d670c0..9220b4700af7 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -2215,9 +2215,8 @@ sched_switch(struct thread *td, int flags) TD_SET_CAN_RUN(td); } else if (TD_IS_RUNNING(td)) { MPASS(mtx == TDQ_LOCKPTR(tdq)); - srqflag = preempted ? - SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEMPTED : - SRQ_OURSELF|SRQ_YIELDING; + srqflag = SRQ_OURSELF | SRQ_YIELDING | + (preempted ? SRQ_PREEMPTED : 0); #ifdef SMP if (THREAD_CAN_MIGRATE(td) && (!THREAD_CAN_SCHED(td, ts->ts_cpu) || pickcpu)) From nobody Tue Feb 27 10:42:22 2024 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 4TkYvz0Q3Sz5Cw8h; Tue, 27 Feb 2024 10:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkYvy4Q0Cz4txr; Tue, 27 Feb 2024 10:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030542; h=from:from:reply-to:subject:subject: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/LMTeus+rDVdl0iUeBi9Y456UcWrg7Mb3pcdxVBj0U=; b=K98W42yCOqsg1eS6FRcIvNgCeazQqfPSUMvzunJG/0aHKXYwDqhn/St2WnxudNu3Flkp7x EBHYwv0GC9ENrOLfjdKvfXPFCw595x2z2nzwz8rYjA8m7V4bdtazi0wLRY5RoyeKZkI+L8 RyBlVF66rvXjLEXF56kDA6f5PTsYxQZx82clvPwBjAy0cwXHbLoJ2vXOysuiXcWqEQruWX wBfllQB3qEM90jalddLaaqiw1ps/ByWMuBmtA7z7jYu+aI/byelaoApv3NUagn/9QuQ9ba YZD6RH8ZIJX8Vk/HukZjnawsxtYZe1Dy0nj9YsvSzyj2NKBY5S5FlK1Z4HFeJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030542; a=rsa-sha256; cv=none; b=Gmg7vUJQ+3S59k8YleX99jUaVyC7gQoMwAUCiRd8PK8rN4ciRuBkb8SU6pgDrDJBMdXInC RcxIGBUgnEpCSeXCEx7esyMOaonAnCNmeyjBNCeY150tIbRExikBuBNWcBW0hFRretab9v GeoAGjbkYBtrKuE7qZFVS+o8WzwWmEGZm9vOki09gS6Cbc9wPzmQSph61TvkUCIq0VEGWx xJq1gmvPQfPJqiOlik3jLcsh3GcJgXjbBw3BDj+BQE4rI6gbbvsDAArJviI4qcquukUDlo ns0eH2zwlaMxSTK3Y9sdRlRa2Dp/uR466A1AD+H8zZEHeNNjCnzquGOwzR+yxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030542; h=from:from:reply-to:subject:subject: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/LMTeus+rDVdl0iUeBi9Y456UcWrg7Mb3pcdxVBj0U=; b=N9IF7UojyYOjKvVvL9L42UC3vBlTFEL629Mf5vSfoD/xQG0g0hSOygSmiUZ7GvxOsYiOVJ r497MlA625Ksa/0KIZT+DTyigaHh6fzvoSFN5s3x8r1pik+UpgoKFI0Cj3iKQ7EC2+HEzl gBfyGTq5ypRqrcQzSu/my+jZL0OyxeWNfV+jPQtd1NIbmQFUdUWDhQlqPN5ikD9L2GFrER 2EIBzMxWUo6j4/eOxlrQAdf/yb1Jl6L2c8kZ5Q4WL/fQomqzlRqqnrw3Sz6aJaDagFCYPp fkfu48FHIPUu6QSMLk4v3G8W7dvo8SEeFzqSZtCZhC5IbxQsCi3/MNO7jXeX2A== 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 4TkYvy3Tm8z18BR; Tue, 27 Feb 2024 10:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RAgMmf079649; Tue, 27 Feb 2024 10:42:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAgMou079646; Tue, 27 Feb 2024 10:42:22 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:42:22 GMT Message-Id: <202402271042.41RAgMou079646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 024284f3af0a - stable/13 - umtxvar.h: Add missing include 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 024284f3af0afa362c504d30eff3950bab779b34 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=024284f3af0afa362c504d30eff3950bab779b34 commit 024284f3af0afa362c504d30eff3950bab779b34 Author: Olivier Certner AuthorDate: 2024-02-08 20:11:17 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:41:40 +0000 umtxvar.h: Add missing include Necessary to have the definition of 'struct timespec'. No functional change. Approved by: markj (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit bcaa0b4c2bab2866d5ee11c9eb8900a70bdb21e1) Approved by: emaste (mentor) --- sys/sys/umtxvar.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/sys/umtxvar.h b/sys/sys/umtxvar.h index 216c7a3e2cd1..647ee2a4650c 100644 --- a/sys/sys/umtxvar.h +++ b/sys/sys/umtxvar.h @@ -32,6 +32,8 @@ #ifdef _KERNEL +#include + /* * The umtx_key structure is used by both the Linux futex code and the * umtx implementation to map userland addresses to unique keys. From nobody Tue Feb 27 10:42:23 2024 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 4TkYw005QCz5CvnD; Tue, 27 Feb 2024 10:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkYvz5P1pz4vNG; Tue, 27 Feb 2024 10:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5aobA52T28it8rEi2ZP5nJpZESlStA+idC1EA32Oyc=; b=ZEYdhs+xD8oqo1yXv1UVC64VT+JuqeM1luDbpBdGQOZrVm1GmxVWXR9/ZDkcUMh2/ztYyt usa+qpEAfjziSR23W/pTiNBcehRXGZK36/el7y3vu8mtrFHJs95sQ5izVkkAF3V+i/zCjt 6XtUMRkc3/wdNKmWY8Xd5ggqSRNJM2brKdKUm0HLaHJU3EJWoaw3nXK4wvcAJMnIVQfDfB iPwlwc5FnGnHeL20kUiNb1ugLfDynzBo6TcHFMYa/ew2kC5cxK6Rko1jh5opswtHK/Qyst HqKxK50ACNFiFbgIhRrDsAqtU3T0c9Ixt4J6qO1qbuTrZ2ZIHakX7dEKV/E5iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030543; a=rsa-sha256; cv=none; b=sgUfwKqsdvHi10fP2GWe1IgF8ZtF5zfuveIw4YguIuzGpvNAv6UlN0F5mydHfaGUG4Mr3n ekljy8wtsuPWx/q+oOBLbRpdoXasg7K+y7JHMPa5R91/pEzHBIXp+BzK10Rp+aEJzrqeGb AxCm0fy0cmoVqCXQ6DXnWQR7QvMVQERhFEc5+feNVTMP5BVhuAgI3/SALyvvkTM9Q/BhBX zQtxY/BTaGiQeTgm5aXdlkYR/41TFSfi3gzx9xIvPWlMiOuDkzbyOu/iyoftgNv7ep2m2D bZKYNkcSTx9aIvRJZ8wZW6VsnMQQlIf/8zpIufKECit3BXWwDHSaFY/uUypP/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5aobA52T28it8rEi2ZP5nJpZESlStA+idC1EA32Oyc=; b=GkObf9MDigleZscS0W+xDCxUhr9X7H0MgPX9Un7uyJQF8AXyM8hoW3J41smIdxXkaAoMbQ zXPPr+1bd2Ttr9aL48wi8vmEDEtIH6HmwX6Hv+p5+Ntu84b/C3aCl4z4PbNEQRzL4AEbUD Es3cipA2VfgJyLviIwSks+6jK+ClGP6Ec/HYFUTfLj5vjPhG34XyuavsArMarcNhcIIjZy 2T9ldZz2q6PS5QhjOtcb2MvpcDtuCDYVS+aKNgVTSW14HObVzSajmsc1SW/xY0ZRaWpWNw oOWgEJ7TQJVoh9rscPOa2Lw5gC8GmJAIzl28taM74s5WrJpM1CjUDfsf1VY/zQ== 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 4TkYvz4VXzz17ys; Tue, 27 Feb 2024 10:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RAgNQY079697; Tue, 27 Feb 2024 10:42:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAgNG9079694; Tue, 27 Feb 2024 10:42:23 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:42:23 GMT Message-Id: <202402271042.41RAgNG9079694@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: b689353a46b6 - stable/13 - kern_rctl.c: Minimal includes when RCTL not defined 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b689353a46b637fad6218956df2716092b8624e6 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b689353a46b637fad6218956df2716092b8624e6 commit b689353a46b637fad6218956df2716092b8624e6 Author: Olivier Certner AuthorDate: 2023-10-19 14:28:06 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:41:47 +0000 kern_rctl.c: Minimal includes when RCTL not defined If RCTL is not defined, only the system call stubs returning ENOSYS are compiled in. In this case, don't waste time including most headers since their code is not used. Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (cherry picked from commit e0205aa325c0936ccdd0e635576875786c41f6c3) Approved by: emaste (mentor) --- sys/kern/kern_rctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_rctl.c b/sys/kern/kern_rctl.c index 799fcd76b77e..8e65fabeddc9 100644 --- a/sys/kern/kern_rctl.c +++ b/sys/kern/kern_rctl.c @@ -28,6 +28,8 @@ * SUCH DAMAGE. */ +#ifdef RCTL + #include #include #include @@ -56,7 +58,6 @@ #include #include -#ifdef RCTL #ifndef RACCT #error "The RCTL option requires the RACCT option" #endif @@ -2204,6 +2205,9 @@ rctl_init(void) #else /* !RCTL */ +#include +#include + int sys_rctl_get_racct(struct thread *td, struct rctl_get_racct_args *uap) { @@ -2239,4 +2243,4 @@ sys_rctl_remove_rule(struct thread *td, struct rctl_remove_rule_args *uap) return (ENOSYS); } -#endif /* !RCTL */ +#endif /* RCTL */ From nobody Tue Feb 27 10:42:24 2024 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 4TkYw114P4z5CvyQ; Tue, 27 Feb 2024 10:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkYw06R7vz4vPc; Tue, 27 Feb 2024 10:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QSN8zSwT6l3WmYAQNfus/mkEqy3GDuLbvSMX2HmYv5U=; b=IA1cXx4lB8sNjramzzfO1qmcJhExQahRN2ezhB82FVNBFtawaz7JDMy6zFSE7HdnVOUWpq CMHGuErm5XLAov102Z3FOvsZX/pVpwO3C6RgCAWo0QXmPPLtlz2lAI5/P0Ftb3WX8N388F eNceblxW7VUh4qcRsi1v9YZkWxH9sl0caYiSK8bCjp1h98S9hf8SDtPuaYYQcElS7JPckg Ex4dVBr7Zq6EvKLgbyNNkSCKS2u00ZCZukJ5WEghTEPqfupGATNkefCxFQBkYtWWQk1sJW xdHECZWHhty0KRPM8I59JqYPG/ChogQ7Ej7ql8oBB4wLH2ThQB9YSlRGjK7Yig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030544; a=rsa-sha256; cv=none; b=bTsBfb+4xm/rjRaDw68OYtar06gT18LOucy6cHSVBlzeeAa/VIBy4wC12ebwdllMn5ZZXD z80IL2THP6M1XBZxY/mAT3OOgGrgTi8pSOrmxb3o8RenY+VZE/4vhn05kxOn7MxulLJnc0 Rai0OO/KQ9jeTV/DUtWvwnlbg1L/l7qnZAlHanLBgM/eKYBl0AXfRtFT2DVJFZ7fY7+8z0 haxLkPD0B8gM+1pgh5526OsiR4iRrHdgbGpwMo7JKA+qo810wuBQ0gAg3l+6Fe3oBhQTr5 vPMxrlZw833sZZorgK2AnYwkCsAb07xagjK8/z7F2dSdY74Sh95vAjSoUbV1Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QSN8zSwT6l3WmYAQNfus/mkEqy3GDuLbvSMX2HmYv5U=; b=x0z8PFDGo+t6vLDn7vErUDb6vcSYucvXWnZN+yh0ifQYHXjbyw/f0b1vTQTY/JtWiG86Dv AmEgvGu1hDdDpAPDJAvr4cgL27doUuStUvtOv4bq3f9TybKv68ahEydbfvJkyDUOh2EnJ3 QcB5om9m7M28BKGoL64158TSYtiX0T7c1H1d9GvY30piFaPYHK02xA2vzltxRq9BBFvBZ4 FfhFwS0Cr06l/BpExkQwYVee3HbQlB157yhY0eIlevlRFqbU+fQsJUtZWfZH15Bs7ZG2sO QzJJoe2k6276unURoWxBgKvAT1SCzHf1uXJU/shf5vdNp3f368S+3nNAlnxmYg== 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 4TkYw05Wl8z184M; Tue, 27 Feb 2024 10:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RAgOmE079742; Tue, 27 Feb 2024 10:42:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAgOAM079739; Tue, 27 Feb 2024 10:42:24 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:42:24 GMT Message-Id: <202402271042.41RAgOAM079739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: fe5468bdf404 - stable/13 - kern_racct.c: Don't compile if RACCT undefined 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fe5468bdf404160b05ad892e944161edbd00240c Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=fe5468bdf404160b05ad892e944161edbd00240c commit fe5468bdf404160b05ad892e944161edbd00240c Author: Olivier Certner AuthorDate: 2023-11-21 17:33:08 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:41:54 +0000 kern_racct.c: Don't compile if RACCT undefined Just skip compiling this file if RACCT isn't defined. This allows to skip including headers that no code uses at all, and also to remove the whole file's #ifdef/#endif bracketing. Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (cherry picked from commit 7fa08d415283c9a0c1e2b57edfbb13d722c25735) Approved by: emaste (mentor) --- sys/conf/files | 2 +- sys/kern/kern_racct.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 5feae02ddd82..20495b57b7c0 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3888,7 +3888,7 @@ kern/kern_priv.c standard kern/kern_proc.c standard kern/kern_procctl.c standard kern/kern_prot.c standard -kern/kern_racct.c standard +kern/kern_racct.c optional racct kern/kern_rangelock.c standard kern/kern_rctl.c standard kern/kern_resource.c standard diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c index 435036a63777..41f77f2bcd71 100644 --- a/sys/kern/kern_racct.c +++ b/sys/kern/kern_racct.c @@ -59,8 +59,6 @@ #include #endif -#ifdef RACCT - FEATURE(racct, "Resource Accounting"); /* @@ -1357,5 +1355,3 @@ racct_init(void) prison0.pr_prison_racct = prison_racct_find("0"); } SYSINIT(racct, SI_SUB_RACCT, SI_ORDER_FIRST, racct_init, NULL); - -#endif /* !RACCT */ From nobody Tue Feb 27 11:02:45 2024 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 4TkZMV16Kfz5CxZq; Tue, 27 Feb 2024 11:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkZMV0ZjKz41P3; Tue, 27 Feb 2024 11:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709031766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcLkQA2eVo3Fhv1oj3MGXew4Lc58tiugZxn7oFGf9LU=; b=j/ieNiL3ShuymPsIi/tHiIKs3mhCkhBio54IWpJwGe6FQ2rvyHD/y98YiSsRjUQkJgq9LN iyqbFqyNfrZS0BtGPVqKrvTDItGvN7rYpE18zaNHzKt8oy/gu0kPcLG5a22zeZqR+oLQFk LXEatWgTt6BJAfhCPsG1AyHCvHhKMvyFOgws+lyXnXFlNERWZncNf+x6+5/j5PN8+64hVs wq2QTiVgONNQju7GTWG5Oa8k09tZvsotMvNL1NEGzFetK0or5uf3WxQVnpxPXKIUrWoHiU mim2TxsUl1GjH7cLUsL+xlyLepuMOiPhSPQrICLAfZ6QeKuuIlL+jcv+n+jqCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709031766; a=rsa-sha256; cv=none; b=WtaWcvXHJvdZXDS6wmD5XaKbmfWjCbo7tDgzNJw18mu4eDtEEUVlhXk1HtLx4FARvY9LN7 tUPb+mYMZJ8hMaUVM9/fNMS2QXlpZTQAvj8MmAWRKyhcf8XmhXkNkg8fAEXLDH7Xu+ShZl SsEORuwv2Dyf0DgvzIseJSJvYKo2v4OErzvyaUw+0AzqtF9IXoPZU62amwNsvk+XTfpBuD mTkFx7ktvRb59dz/fADIE5Jy89dQ0NDgzgGxuiFYfaGsxjLlcaxxocwfWflwYuskZwwkv5 LpXgDFplykFtPZjZRB568J+NWxQjOB1C9P58bqR2jUtQLoNIuWXJ7ggGTAjn6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709031766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcLkQA2eVo3Fhv1oj3MGXew4Lc58tiugZxn7oFGf9LU=; b=imPZ7FVUBoHB6SqTgJwZS8hAaro7fdzZlH/8kO/CjNiU3GFHl6LNqlTDruGEzAHS6f9le4 dkEC9THqg118ZJPlHWX2RO9d8Nln2VrLjjAi6Yqg31JdStRRm+SIFksn24CRyfGU+19as1 X1K8CWDaOcF1b+xHDy+Su2B1VL8SxwVrtM2jS5XErhNtCH/9S9bqGtkUPON1EMgMSMQCBT LHQPKZUhuaXQlhtP27kS6M8/GmFCWc+A2e5X1CdR5NOXwf5aKtt2Er33bdzSch4aRlMoB6 bBPxSqEO+IOc3eNi+rrllY3fHYi7bS9GKDuAk7TxBUPwx14zcf6/EutnEGPCkQ== 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 4TkZMT6kbYz18gw; Tue, 27 Feb 2024 11:02:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RB2joZ014244; Tue, 27 Feb 2024 11:02:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RB2jRZ014241; Tue, 27 Feb 2024 11:02:45 GMT (envelope-from git) Date: Tue, 27 Feb 2024 11:02:45 GMT Message-Id: <202402271102.41RB2jRZ014241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 419848219b40 - stable/14 - tcp: prevent div by zero in cc_htcp 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 419848219b408cc52befcaa7849a2905f3812a83 Auto-Submitted: auto-generated The branch stable/14 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=419848219b408cc52befcaa7849a2905f3812a83 commit 419848219b408cc52befcaa7849a2905f3812a83 Author: Richard Scheffenegger AuthorDate: 2024-02-24 15:35:23 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-27 11:00:55 +0000 tcp: prevent div by zero in cc_htcp Make sure the divident is at least one. While cwnd should never be smaller than t_maxseg, this can happen during Path MTU Discovery, or when TCP options are considered in other parts of the stack. PR: 276674 MFC after: 3 days Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43797 (cherry picked from commit 38983d40c18ec5705dcba19ac320b86c5efe8e7e) --- sys/netinet/cc/cc_htcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c index 93720c407d5d..4581b05280e0 100644 --- a/sys/netinet/cc/cc_htcp.c +++ b/sys/netinet/cc/cc_htcp.c @@ -230,9 +230,9 @@ htcp_ack_received(struct cc_var *ccv, uint16_t type) * per RTT. */ CCV(ccv, snd_cwnd) += (((htcp_data->alpha << - HTCP_SHIFT) / (CCV(ccv, snd_cwnd) / - CCV(ccv, t_maxseg))) * CCV(ccv, t_maxseg)) - >> HTCP_SHIFT; + HTCP_SHIFT) / (max(1, + CCV(ccv, snd_cwnd) / CCV(ccv, t_maxseg)))) * + CCV(ccv, t_maxseg)) >> HTCP_SHIFT; } } } From nobody Tue Feb 27 11:02:46 2024 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 4TkZMW21qyz5CxgJ; Tue, 27 Feb 2024 11:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkZMW1W1vz41Jm; Tue, 27 Feb 2024 11:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709031767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YvMoESlDPi1BS63RXWLBnM7GzRofEaYJOoU4DFpqFl0=; b=RkLW3qtmWmTl0u9D1+IiAc30HllUFYSuU8EoGDWPzvGsCQOhLqeEv4afAjWdL74LeZ3GlN bCgC7yMZRcYbHjIMq3kiGRIPoYOubD/gDWVH9nfWVX0dpgI1/nx0KAzie56mQEEXp0gSMc jr6Ptm+0jdcZbXgFLE9Gh+RIKBSOs7rcFDB3b+ueNv4tLeQAy65bdZZkhMaCTVOv4d1Z8d z61BEpKgcD3alKKVEWvly+32Ci0CAafZoTEygbmgjMbHK12FkaYJvxb8isybvC6btLYLTf rno2paMmVCdCzQroxUMAG1h3P1hZktBouY9vSRQqpnfcFZF9unVcwadKThNrng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709031767; a=rsa-sha256; cv=none; b=c+r+ANHsbFNVPgiZoZChQKnhzCZPbiKJwkv/+Pio0LPFvVHSl72VXmXfkcJeb7IFfMVREw oijmt5+6jJYTdWxqZ+VKTsO15cp+Blb8i8WR4T13e62XdPjWSUfGl2vsnVg0t+y+FaWJE1 JdAoet7uPdGwEtBCFR6FEEe5b8u6iZVU5odH9cuS2t+PcrrsQizhNyNNr8Xb7XOz1adu7P bemoETjaXNLR0Uy5dGYtzX+JNNRiCNWZoSgWCsuK2jiPLOqxikUhg8rWFOjkuRSe52QwXr kOu1W0MnnMZ6KUPTgQ6mqnLStlGN+cfYpeWWwGwMjD7krYCLz3IXtKg+xXCxKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709031767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YvMoESlDPi1BS63RXWLBnM7GzRofEaYJOoU4DFpqFl0=; b=HWz9NZMijJPXiob4Fhs8IRmdNhy63f4XRJtIhb0Y6Y3qKmMFM1SRxTlnarqMZfIAETQATj GQvy/NY6exOLJa+fIvPvgn1xwbblQGA0MiIpp5YLbWblFomfrUHMbQ6n0CHJ9+YkVAN1d9 jEVmwzVV03ihHRCi+ouogxP/xcs6f2CyNqwVmTXHjZiQF1cS5wMqU4m15XApSa7mNR2tIp 44tfvRkZdhSmqJJqgaqGWCnVzcskwJFuWKOQR+EhvClhF3MJsXPStvtoGsio7kg/qsi724 404uleYBe1xWqD0hsUfC4myWLx8NAsUW109Mx/TGoXy254O/R0ja804ZgqaOrw== 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 4TkZMW0cJnz18rS; Tue, 27 Feb 2024 11:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RB2kPn014292; Tue, 27 Feb 2024 11:02:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RB2kqP014289; Tue, 27 Feb 2024 11:02:46 GMT (envelope-from git) Date: Tue, 27 Feb 2024 11:02:46 GMT Message-Id: <202402271102.41RB2kqP014289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: f3f559705a05 - stable/14 - tcp: cubic - restart epoch after RTO 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f3f559705a05b65c99bdf02520475d595b111503 Auto-Submitted: auto-generated The branch stable/14 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=f3f559705a05b65c99bdf02520475d595b111503 commit f3f559705a05b65c99bdf02520475d595b111503 Author: Richard Scheffenegger AuthorDate: 2024-02-24 16:07:25 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-27 11:00:56 +0000 tcp: cubic - restart epoch after RTO This is a migitation to avoid sudden extreme jumps in cwnd, as t_epoch can be very out of date after an RTO. Per RFC9438, sec 4.8, t_epoch is to be reset whenever cwnd grows beyond ssthresh (CC phase transitions from slow start to congestion avoidance), to be fixed with the upcoming cc_cubic changes. MFC after: 3 days Reviewed By: cc, #transport Sponsored by: NetApp, Inc Differential Revision: https://reviews.freebsd.org/D44023 (cherry picked from commit 038699a8f18a0a651ee06b85fa1dbbee1eab56f1) --- sys/netinet/cc/cc_cubic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index 031091c3b777..4579e7d3654e 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -271,6 +271,7 @@ cubic_ack_received(struct cc_var *ccv, uint16_t type) cubic_data->flags &= ~(CUBICFLAG_RTO_EVENT | CUBICFLAG_IN_SLOWSTART); cubic_data->W_max = CCV(ccv, snd_cwnd); + cubic_data->t_epoch = ticks; cubic_data->K = 0; } else if (cubic_data->flags & (CUBICFLAG_IN_SLOWSTART | CUBICFLAG_IN_APPLIMIT)) { From nobody Wed Feb 28 00:26:46 2024 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 4TkwCB4DSrz5C1GB; Wed, 28 Feb 2024 00:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkwCB3hcnz4V1c; Wed, 28 Feb 2024 00:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709080006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54tkdpuYt32W0kFh5YZUuE4b2h2KRXQ+gPSvPT3uSiU=; b=QEpVvH2kt7io8zkI9ZWLezALoYtuz3gnCy0uTT87om7i/1oSIUtTRzv10Z3lgXwL3pic/d 5X6m+7zO4n1t/T5GMtzWUu9ctLXxaI4eZxEFumAbJYdeAIe57OhCeUSgmXGkKWaYieUs/k z5nyJ4pQ1ymiffxhKfa8y/YBVR6Jn8VxCEJWDx0OTD3ID5kEOCzOxLCy1jCxChnQ1X00Xp NgHEIodkyf7omUPaE+0wSyDzgvB6DRhn8Rqd3jcKUoe1yX4lTHSMtiJCp8YHbz7bFUN0Ic daC9xwTbFfBsOYqxe8Q8yq2ylg6OhpB1Skw+LnCDJ16416XPfhDXKnHRzLJzMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709080006; a=rsa-sha256; cv=none; b=Jh+QXmf8b9LTov01QCBY6WAtJGwRGe01Z83qHU5BZb6DoS9IOp1WQ8dfUq6KNw/DuNN8Xt YG0q0hOue/+zTmq+qaE+piPJMPk185Ka4e00tMQooscvYHpL/+MmLrWB/m7v4k8Zkx5P8H m00blc0m+p3AWvD+V8DEFa427eohBMH/QBzpVKF0idwnmKWGS1wbOqjteqP75t7FYK3LVH /BWzvqosQpdwHkbpLg1d5cShZERkbLema1UuDbMS5vzeYvBpw8jFMhUdE8SiFtSBGqIiVf ZxFdgBhCN/0X/yNR4OHW4+UhLIbHVFJ7ej57u5CfdMBmX3e6PvFvRa7Se9C0EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709080006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54tkdpuYt32W0kFh5YZUuE4b2h2KRXQ+gPSvPT3uSiU=; b=QUIpbwEvfwlqsCn60I1qmYFPgk6CwWFkkeTiUHx1+s+jpSBdiOLCG+TGEfOnISe/UlKe4M yf5nICDek9JDqPwu6ppwjzKotpMDewUIcyE1NjpUzvGn0bfhGKJwuvrOqbSBUPzC6JTFQS TIQyCSS4sI5t2H857DbsuESIgjq9vj2AixkJMz1fsGL1u2bIoxFulg+HE3TLhfGz8e4Txc dj/9bovFxeQqbyYnu/z+CI4LDnF6ip554WRA2QNkTgWUGDUGZgreJRP94OY/dhXBTpbrDN Qr3BRshkunxHTgp5JLicwPE905vKj1PMYZ3yV62RD7mtmlYncjUW/x4rtaWFTw== 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 4TkwCB2l2JzbFQ; Wed, 28 Feb 2024 00:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41S0QkOg065267; Wed, 28 Feb 2024 00:26:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41S0QkF2065264; Wed, 28 Feb 2024 00:26:46 GMT (envelope-from git) Date: Wed, 28 Feb 2024 00:26:46 GMT Message-Id: <202402280026.41S0QkF2065264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 6e298c3612da - stable/13 - tcp: prevent div by zero in cc_htcp 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6e298c3612da3d04a75d380cf457774cb1a25a47 Auto-Submitted: auto-generated The branch stable/13 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=6e298c3612da3d04a75d380cf457774cb1a25a47 commit 6e298c3612da3d04a75d380cf457774cb1a25a47 Author: Richard Scheffenegger AuthorDate: 2024-02-24 15:35:23 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-28 00:21:47 +0000 tcp: prevent div by zero in cc_htcp Make sure the divident is at least one. While cwnd should never be smaller than t_maxseg, this can happen during Path MTU Discovery, or when TCP options are considered in other parts of the stack. PR: 276674 MFC after: 3 days Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43797 (cherry picked from commit 38983d40c18ec5705dcba19ac320b86c5efe8e7e) --- sys/netinet/cc/cc_htcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c index 70ac0bebffe9..6568c5ae672e 100644 --- a/sys/netinet/cc/cc_htcp.c +++ b/sys/netinet/cc/cc_htcp.c @@ -226,9 +226,9 @@ htcp_ack_received(struct cc_var *ccv, uint16_t type) * per RTT. */ CCV(ccv, snd_cwnd) += (((htcp_data->alpha << - HTCP_SHIFT) / (CCV(ccv, snd_cwnd) / - CCV(ccv, t_maxseg))) * CCV(ccv, t_maxseg)) - >> HTCP_SHIFT; + HTCP_SHIFT) / (max(1, + CCV(ccv, snd_cwnd) / CCV(ccv, t_maxseg)))) * + CCV(ccv, t_maxseg)) >> HTCP_SHIFT; } } } From nobody Wed Feb 28 00:26:47 2024 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 4TkwCC4qYcz5C1GC; Wed, 28 Feb 2024 00:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TkwCC4DL0z4Twc; Wed, 28 Feb 2024 00:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709080007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ysw7Macow30xh6Cg7iYK97U9irZtv0mpsZ4QDfnvSyY=; b=OvLkimkp5d3raEeCspKJ4pShN5bja25xWweNO3I+/12qEkwPpUKPWz1ip/oGjIc2clSedf LdR7KT/cSsEWH6s21I8CDM4TtgjHyKS47Nv5dHGpOvzwfWN5LfQpDVBYRykWW3qd3Ww5vn UoZB0qpyXEUibnfGRW5GKgRa5Si5d5YGbRs6+TaqJ5Z9V73p+iE5mSErSELE8iIGpIXiVh Wt1o7r0mYVV93K4AXeR4SKm4BWdLT3Jwk9g0LLY2wgf3XJSDbO3aO8TFtFbmzOSdEYLpIg bDY1Ng3HTjrfTS0C2Sm4KlTzSQmH62rv+o4iQciv2vU+bmuHf9WjlOMfPmMEqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709080007; a=rsa-sha256; cv=none; b=hLQhHyjBdDhlRHabOYXj2sELi8MdgnWRZN/95hiVOD20HazMfECISecTU27AOZfai8mHXO xULmDT7htzOUpT/YNRA13+1xKOSMrpy10tCFfCBaowyK0snWddXiRDxCncc+z6jITjcQa3 WS7BfT2RWLmCpMa5VlItuuhElGpzJFuMkj71XhnyjRHYzvs61poTRAL+uBNHq1GPivr4FQ iSma8SDZgHf2gwCT++8JEEhZ9pIlD+t4FtU9+0uwMOW0lyQA92bZhH6n6NQItF67L2HGJf QlUY/t46nShac1OsLpGNd0A9HmQtfIuzA8hcpg0MKukhzURJQ3CGsGXNXL+XOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709080007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ysw7Macow30xh6Cg7iYK97U9irZtv0mpsZ4QDfnvSyY=; b=Fzq5hVsGHO95rEBBFK5ZxKqdeNkMGGYBkqHDGVSXrQkiH3Xp5bJAciI32JM8LYf840S6ur XbB2Kj/64dnm8JlRB6rQLVIcUpechBWDzP65DvNUml3AdeukRAHXdMZHKqFog58pMqdT+J 54hlTuJ7YKXXeJd8ZJOZMONTDBI5yhgFrq42hvnBlbjp0eJH7eYPXXMjJHIeNMwzrHY7Y5 hDV8NYZLTLcMY+oKq0ZmEKckXl7dSidX2Z3Me+xuHSYsxZDIMNL7Fp1lQQ20zlkVUChywA LUNDcSbhPT0FjU/oIM1r0iN4Ph5GFXV2aZhNAf1fhLxOQkfgirGLZT3c8Utf/w== 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 4TkwCC3HhtzbPL; Wed, 28 Feb 2024 00:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41S0QlcF065315; Wed, 28 Feb 2024 00:26:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41S0QlxD065313; Wed, 28 Feb 2024 00:26:47 GMT (envelope-from git) Date: Wed, 28 Feb 2024 00:26:47 GMT Message-Id: <202402280026.41S0QlxD065313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: e6e28a73fc21 - stable/13 - tcp: cubic - restart epoch after RTO 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e6e28a73fc2149732b2dfc75d4a565e96b661018 Auto-Submitted: auto-generated The branch stable/13 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=e6e28a73fc2149732b2dfc75d4a565e96b661018 commit e6e28a73fc2149732b2dfc75d4a565e96b661018 Author: Richard Scheffenegger AuthorDate: 2024-02-24 16:07:25 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-28 00:23:48 +0000 tcp: cubic - restart epoch after RTO This is a migitation to avoid sudden extreme jumps in cwnd, as t_epoch can be very out of date after an RTO. Per RFC9438, sec 4.8, t_epoch is to be reset whenever cwnd grows beyond ssthresh (CC phase transitions from slow start to congestion avoidance), to be fixed with the upcoming cc_cubic changes. MFC after: 3 days Reviewed By: cc, #transport Sponsored by: NetApp, Inc Differential Revision: https://reviews.freebsd.org/D44023 (cherry picked from commit 038699a8f18a0a651ee06b85fa1dbbee1eab56f1) --- sys/netinet/cc/cc_cubic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index 884778c13b2a..c2b465abd10d 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -155,6 +155,7 @@ cubic_ack_received(struct cc_var *ccv, uint16_t type) cubic_data->flags &= ~(CUBICFLAG_RTO_EVENT | CUBICFLAG_IN_SLOWSTART); cubic_data->max_cwnd = CCV(ccv, snd_cwnd); + cubic_data->t_last_cong = ticks; cubic_data->K = 0; } else if (cubic_data->flags & (CUBICFLAG_IN_SLOWSTART | CUBICFLAG_IN_APPLIMIT)) { From nobody Wed Feb 28 12:37:15 2024 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 4TlDQ364KRz5DFM5; Wed, 28 Feb 2024 12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlDQ35V8Mz4VkY; Wed, 28 Feb 2024 12: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=1709123835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tiIEgwaomNTEEENFh4k3E7Nn1XmGfIFasUsEkhTHzE=; b=hyH55RhzZAGKF0AYtfatH97wXRH8CpI0n7NKYNuP9ePSIXXeaV35ulkJKMNRwuDHxM5FIX aJ6nSNj2ygdJ0PCWRQYdIwJzJfYjD4M3uaCoLLgXJzY0n+OZolXXx8eBDUqT6PeSkcUOuE OrKqQLOD9puR0G32P6TQgN9iy6DeUm4RSlYZCNimtC2S0usUk8E72N2/UF5TAXE2Wv2qkY +ch+sFMtYZbMxXgEyBa10cFKtvqsUzyF9vi29xT35JiPYcuByQdLaFPapF+vwKWvPGJnYg D3YGVS5TjYkIDi80HGsk066grMgDEmWeGsiumcfcq8Q3N+BJ4JdOa1mpJOdC9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709123835; a=rsa-sha256; cv=none; b=oEDvcZPbKBm8AODNi2ylyvwWDTING9jOWFlvUWPf914cc5CLVGTX1Cc5vWg5alPB6PaOss vtOiIJEuYq8qu3ab5QJUrbQ9lHZQBXnKxHVOAjoeZ1jxRpcYQ7X+nflQayv8h1O32a84dL Q9FDlMdGRpFH/GQhcLO+3tT3IrJEj1I+IzHCqJWCSb2FE0kSCTdcFV5hgOTcSq6aCbutNQ riCSL9vHmdQCGIvQzDeR4goh6LTx7JnBh3651VRVkW//UfkqPQPVxejMgVpq3swG4GWiEn SA3uIRDxrhk1Ghxa+POGimLrptWKjFSdBY37l44ufvHYcZxTjfYxpouMMb/YMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709123835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tiIEgwaomNTEEENFh4k3E7Nn1XmGfIFasUsEkhTHzE=; b=tvL+F1J31PE6wX/rQQnDu/E+o6xOKh9O+cgMHjtvhfXdI+2LVWtSuHAFNinsoBrgCl2h3+ b7E+NWeT56cKtoM48KvcZB1I6OCnJ2kk1iqV7zIX9yPpN+x4E1o4k3MKTR/664J20pDTpd MLs4Y16SPVfViDCQibGos8eHuYloi/g+iBzRQHBP6O/hooBQ/YfBB2pKK9sLFqunx78Ini rUuOwJWeIaLjaNEyChnq2WnuVO12Ljowg2Ynq08MpCQv15OvGBY3fjlxFv/l4ATr1d1DSQ c7evHBeR+WUgyPFTXM0wjyB+5En+XPXr4AYtti3FcHRIUhVIR8SxG9FrKis/yA== 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 4TlDQ34Y3szxdC; Wed, 28 Feb 2024 12:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41SCbFsl095473; Wed, 28 Feb 2024 12:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SCbFKF095470; Wed, 28 Feb 2024 12:37:15 GMT (envelope-from git) Date: Wed, 28 Feb 2024 12:37:15 GMT Message-Id: <202402281237.41SCbFKF095470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e7b055efa743 - stable/14 - tcp: Remove the documented dependency of TCPHPTS for RACK and BBR 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: e7b055efa7436247f2944c0ed09596149f85f0c7 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e7b055efa7436247f2944c0ed09596149f85f0c7 commit e7b055efa7436247f2944c0ed09596149f85f0c7 Author: Gordon Bergling AuthorDate: 2023-12-17 18:31:16 +0000 Commit: Gordon Bergling CommitDate: 2024-02-28 12:36:49 +0000 tcp: Remove the documented dependency of TCPHPTS for RACK and BBR Since TCPHPTS is now included in the GENERIC kernel, remove the documented dependency of it from the tcp_rack(4) and tcp_bbr(4) manual pages. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D43084 (cherry picked from commit 4fb5eda6493c3dada695efbfad0a44d204b7fc5e) --- share/man/man4/tcp_bbr.4 | 8 +------- share/man/man4/tcp_rack.4 | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/share/man/man4/tcp_bbr.4 b/share/man/man4/tcp_bbr.4 index 9944f6127ddd..fb1023dc81c6 100644 --- a/share/man/man4/tcp_bbr.4 +++ b/share/man/man4/tcp_bbr.4 @@ -22,19 +22,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 7, 2022 +.Dd December 17, 2023 .Dt TCP_BBR 4 .Os .Sh NAME .Nm tcp_bbr .Nd TCP Bottleneck Bandwidth and Round-Trip Time Algorithm .Sh SYNOPSIS -To use this TCP stack you have to place the following line in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "options TCPHPTS" -.Ed -.Pp To load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4 index cfdedb9901b8..791b48baf6f6 100644 --- a/share/man/man4/tcp_rack.4 +++ b/share/man/man4/tcp_rack.4 @@ -23,19 +23,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 19, 2023 +.Dd December 17, 2023 .Dt TCP_RACK 4 .Os .Sh NAME .Nm tcp_rack .Nd TCP RACK-TLP Loss Detection Algorithm for TCP .Sh SYNOPSIS -To use this TCP stack, place the following line in the -kernel configuration file: -.Bd -ragged -offset indent -.Cd "options TCPHPTS" -.Ed -.Pp To load the TCP stack as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent From nobody Wed Feb 28 12:37:16 2024 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 4TlDQ50sK4z5DFbF; Wed, 28 Feb 2024 12:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlDQ46RzGz4VbX; Wed, 28 Feb 2024 12:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709123836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVAKi7mXKJw4LkGyDbWQLT5rjvXzb6o0OUUJpAHuyNA=; b=tHltIs5meNykmWsWaHgzciRVKUQHPx9DTriNwCCemhtXN2Qx+VBDWMtaI/snBDpzrnSSQL F7NzNyA5/2TJB1fp7NETFDz5C24BSzr56WuX++pRjQ5NI514gX3+JJhphFCi2verSHhB/d WWesJZ2q5MxBGB/0WaIC7LeDI8yHN8BX/fw7jHFREfOtRgA8pbjFbMUDuUZ4ffJWXGDht/ yUkWy0QqzBuspbrwTpvB0d07x+sk6OQYJIMtydNLa5wI4Y0oju98uC5qBFEX2qyda13kH1 T/ed+usZktvADmcbmEa+GPySM4/zlyJQ3rcDYreEe+35hiymT2ibw+YOdPrKqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709123836; a=rsa-sha256; cv=none; b=BdQDDhINitngbeOInqWx+C5mTOnrbC6JXAOE26FP3WyqOvZEJpQQ8gZmtYNxhQZK5OkHre j2gcyAIvcHrhaZs6YKLQzmO8KiaimSgK4iZg56ghFgK5ANc/xNyF1d06mk7BwvZ9/wlU6i Y3SYdF1+hjtDym4MsNCp+ICC9bMIUY1uhvLbLMTHyDvBvCvEKUrB/KgVDQSkylfG09cUuQ An/1/mJfwoubEZD6PPkILX/FK4/IotwvzukpEhBm9/c95VxARkuqz+SakjHq44PaQLUH5j jOn1qJp7Qmkt2DzWYzE+A2plWKyupHgYA27+7qguSh1cvawXMs3AtVfsEdV61w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709123836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVAKi7mXKJw4LkGyDbWQLT5rjvXzb6o0OUUJpAHuyNA=; b=bj5cU8pM+zU8qDAROp9CsRedBkfLzrgNtjPUORngULL/WcJHoMfmf/Y+p4Th9sFYA+zuAr BhvuQlLvIxhWuL5CIP+7BlXqdutc3ITTT6r98yG+o36YeBcBckwkP85OlG+OF3F0glX0RB jJYwGHtJBTeEcdZWZ7YPNiE0fd6a9NO2snxSQzmpUd2tFwBX/4T9zcKtxO6eRq1wnh8tC6 GmmHKTJZvQFul9jYjc1iljKSud2BZRZHFg5WpqhTHllJjZCj8QiWN6mvtBpMa1868UOizk ffp0iMoS1mzPBBIDeChUqVQgPIDdH9jWQd4D9Tu6aJq/BSN8u3l7NSB6rqkDeA== 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 4TlDQ45XZWzwr1; Wed, 28 Feb 2024 12:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41SCbGdi095530; Wed, 28 Feb 2024 12:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SCbGnE095527; Wed, 28 Feb 2024 12:37:16 GMT (envelope-from git) Date: Wed, 28 Feb 2024 12:37:16 GMT Message-Id: <202402281237.41SCbGnE095527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 72d897c7f410 - stable/14 - tcp_rack.4: Fix a link in the SEE ALSO section 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 72d897c7f410f5a58d9716da4664592554dfa65f Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=72d897c7f410f5a58d9716da4664592554dfa65f commit 72d897c7f410f5a58d9716da4664592554dfa65f Author: Gordon Bergling AuthorDate: 2024-02-25 09:16:25 +0000 Commit: Gordon Bergling CommitDate: 2024-02-28 12:37:07 +0000 tcp_rack.4: Fix a link in the SEE ALSO section The URL of the paper at arxiv.org has changed so link the PDF-file directly. (cherry picked from commit 6e9a71706906b86e627cfdd27bc37b88a796f46e) --- share/man/man4/tcp_rack.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4 index 791b48baf6f6..566834f4283b 100644 --- a/share/man/man4/tcp_rack.4 +++ b/share/man/man4/tcp_rack.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 17, 2023 +.Dd February 25, 2024 .Dt TCP_RACK 4 .Os .Sh NAME @@ -134,7 +134,7 @@ What method should we use for rate sampling 0=high, 1=low .%A "Ahmed M. Abdelmoniem" .%A "Brahim Bensaou" .%T "T-RACKs: A Faster Recovery Mechanism for TCP in Data Center Networks" -.%O "https://arxiv.org/abs/2102.07477" +.%O "https://arxiv.org/pdf/2102.07477.pdf" .%D "February 2021" .Re .Sh HISTORY From nobody Wed Feb 28 12:41:30 2024 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 4TlDVy2BzZz5DG1x; Wed, 28 Feb 2024 12:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlDVy1lvJz4W4D; Wed, 28 Feb 2024 12:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709124090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9GlSIc+Nq6hNrom4gzQvJXwSgZ0sz8pliaUDuDeh1Oo=; b=ra5UTpl8fhlurYmhxKsgcqtWvj5oKzQj/d/M6JY6vXGY9ExEKOwBPgH9owKCNprheKhqj8 g15ebs4g53DYDcIeyyb8DulSBAP+csCL6TThXD+rHzW/K5Twf5YrsGi+osFbO7p+x64WPA 50gfxMkm1To9djxJUFO9WDhbcUDS3NzL6Fy5+6Ace9ZayF0JAROTM/z3k/IRAfvWh0ap6j r5ohg74p2s54JuApHv87e5huc9AKlNUewWDYGp4aaoOdVk5i19bOpBL2S3xpq/A16p4WZw PgAEUQ3SlcFdKawtfcHRo1dmn/f8sl/xY3P9qOA2E92GiWDr+pnZnK4IvRid/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709124090; a=rsa-sha256; cv=none; b=PBSYzax+i7ZkSA0M9eDe7oDDcvA4/OgnMpX2ENzI4Wgy6+R3hUpkmX7pZFISXZsJEEgG5z u0dbYTYlok3xrCuujwUAxKhtWHcCWG7yxQEvisKc5hOrKqMQFxvc9OK4W1GqqmyJ06bOGq jmPBfBS47IEiSbkCPmZJ0N4sO0lWwnsH2zkLd9gkIVWunyEjDRYbe6BxKtkKNwKRkIkfuU zg2NFwVlFLBN6izJ1kSFI0Il+FlvlcOoNEU+J64ix1zO10uEg2m6sTixrXlaJuO31xd9eD XjLm0ljYzRKadmGx5RxITkkZQrzMRjh6hgpPFWfeVv4YpWKFm2he6af3XSM+zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709124090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9GlSIc+Nq6hNrom4gzQvJXwSgZ0sz8pliaUDuDeh1Oo=; b=W6hzyBOiq0NIzBf4z5ICJmSK8GchfBehBAU8Dk2YE4g6l/gSMIaKWVfUQ+hp8Gn1D2l5tv x2Kim1LsqJN17oTq0h3FEfrdJls7EEV+Q8608oWmVKV52iM6jpsUwsGPI4MkANfuNf4jOk /Le9tc+e/3WtdevIXLhKE9gFLqubf64EDjk77rNj+2pgWtJH+0+zxHJWcTE7C5w8BSmsKd 38jwU8p7CPi2P6JeKnA96lXNfagzLlCpcCm7z66PedeT6gUdicnV4D180VrBsUmscCJj4I xLUIEAGMFWOeVbObmT+SYmqdgZmeqWyCVf683sjVkPl/AyZVl4V6SpL3BlyMNg== 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 4TlDVy0pxTzxkS; Wed, 28 Feb 2024 12:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41SCfU6x006721; Wed, 28 Feb 2024 12:41:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SCfU3F006718; Wed, 28 Feb 2024 12:41:30 GMT (envelope-from git) Date: Wed, 28 Feb 2024 12:41:30 GMT Message-Id: <202402281241.41SCfU3F006718@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: e6c0ce9e37f5 - stable/14 - Correct the grammo in "will underlined". 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: e6c0ce9e37f573700df133f4e00f71f0915cc9f0 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e6c0ce9e37f573700df133f4e00f71f0915cc9f0 commit e6c0ce9e37f573700df133f4e00f71f0915cc9f0 Author: Jens Schweikhardt AuthorDate: 2023-09-10 09:00:21 +0000 Commit: Gordon Bergling CommitDate: 2024-02-28 12:40:51 +0000 Correct the grammo in "will underlined". (cherry picked from commit 4fc08109fe32264485a54a7ea45f4ec09a8fcf86) --- bin/ls/ls.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index 17d3f7c8eae4..528ff1594876 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -743,7 +743,7 @@ where is the foreground color and .Ar b is the background color. -When the background color is capitalized, the text will underlined. +When the background color is capitalized, the text is underlined. .Pp The color designators are as follows: .Pp From nobody Wed Feb 28 12:49:05 2024 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 4TlDgj5gl8z5BX66; Wed, 28 Feb 2024 12:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlDgj4z6Xz4X17; Wed, 28 Feb 2024 12:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709124545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wt4tGaSvT9ZZiAYJd+D5XB4gBgp17LS4AoMsnGHW8h0=; b=dfZ3UZA8lsmyIKfe2JFceX+oIiyM8Ys5QFqzgG8HTNv5YnmP/uFtj6tWzArIRIppMmA1nL 2Ke8qdzGutNh0NHleydPiiSXiqQFgF1gRtuTK6r1sQyMToEHiNJgjrWOIkWAZDQM8g6ccL 48I/1Tl5fRf0O2osTsACdJiRybHMkOS+hhAwwVPlOSLqnQpOe+VJCpSf7S8NCoj1Q6AWVb 3EjhFynzb2Obcg/FzcjPKI13w6E848+Pn2Xfr09+Mk92BbdRGeZq2o6BVqin7rXcb128XO PpBOiS/SgaclRnEPH4jYaROmEbqv+3Kh5LvoN7ep2P3cCOLQfv6tEdU9scjaTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709124545; a=rsa-sha256; cv=none; b=X5VFT2CRnev8fm3+HUOBFY8hEGfE706aACZF6n064OpeCNGMBPPoIMdnsyHn3s/zu1VuDX U42h0svtzdr7pumvfvtByqTz2Xz+8b44gOJ+o+3bHPS3KB8um9RjH2IBDEEabb5dp2Zfty FRHjBNVXiJFfZ64f4il99gfaW02EKwec98JkTUcYEXBgEDlhZX08wV3C2rmE/Jq8JrDhNV gtV95XfPYtYsG5QqpsRB9Nnbqgr3+BJmZIULKNn12jrCKbtvgXsuBRnLMEssQ8Sk+0cbuZ 2L4ZCrnbEpxqj3J2bxH6Ml0OuiPX2NLrz+PTaETtIIFp5sMho9HmSEZRk/t2gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709124545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wt4tGaSvT9ZZiAYJd+D5XB4gBgp17LS4AoMsnGHW8h0=; b=dsG4YHf95YhkJVIIgsC7p3FscMDK6ubCNICN3Bss1iwjOiSv6yMWEqdA+8NMgPuR7OHaSP +1Q9NLR+VVmlmWeF7/8QGU5SXagEEnS5K9j+WxZIFRmKm6qJk73PKRKiDJnOadHd23i3QG N4t0NuFTlv5+Xx4GB5UVQpkoQB3jh+hvbWXRs30cXJbyXMKZBERKzOvpPwzNp4yKGw7LJ1 uUUi0hYU3KUYfaUNgv9PmbeEqz4Kd0yZyWS/OjKYNk8CysZnrqrWms46SZ63o2u4x9pS4Y Rm007lBVqVA1AY8/jfeLPsAMWohFYmuwwh61XNGo5o3jlPElIH+L+cstpcb0/Q== 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 4TlDgj41kLzxTn; Wed, 28 Feb 2024 12:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41SCn5AA012756; Wed, 28 Feb 2024 12:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SCn5nl012753; Wed, 28 Feb 2024 12:49:05 GMT (envelope-from git) Date: Wed, 28 Feb 2024 12:49:05 GMT Message-Id: <202402281249.41SCn5nl012753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ff86c97bfa54 - stable/14 - ls: versort incompatible w/ timesort and sizesort 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: ff86c97bfa54f1e305f4ce07e560a4b3780a6477 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ff86c97bfa54f1e305f4ce07e560a4b3780a6477 commit ff86c97bfa54f1e305f4ce07e560a4b3780a6477 Author: Alexander Ziaee AuthorDate: 2024-02-02 20:19:07 +0000 Commit: Gordon Bergling CommitDate: 2024-02-28 12:47:08 +0000 ls: versort incompatible w/ timesort and sizesort ls.1: versort incompatible w/ timesort and sizesort Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/825 (cherry picked from commit d854370fa86b74527e57145955b1fa3ca75643a2) --- bin/ls/ls.1 | 6 +++--- bin/ls/ls.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index 528ff1594876..0d03fce804f2 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -31,7 +31,7 @@ .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" -.Dd July 18, 2023 +.Dd January 12, 2024 .Dt LS 1 .Os .Sh NAME @@ -459,9 +459,9 @@ options all override each other; the last one specified determines the file time used. .Pp The -.Fl S +.Fl S , t and -.Fl t +.Fl v options override each other; the last one specified determines the sort order used. .Pp diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 842364b67f1f..d358ece2d89e 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -325,14 +325,21 @@ main(int argc, char *argv[]) case 'A': f_listdot = 1; break; - /* The -t and -S options override each other. */ + /* The -S, -t and -v options override each other. */ case 'S': f_sizesort = 1; f_timesort = 0; + f_verssort = 0; break; case 't': f_timesort = 1; f_sizesort = 0; + f_verssort = 0; + break; + case 'v': + f_verssort = 1; + f_sizesort = 0; + f_verssort = 0; break; /* Other flags. Please keep alphabetic. */ case ',': @@ -446,9 +453,6 @@ main(int argc, char *argv[]) case 's': f_size = 1; break; - case 'v': - f_verssort = 1; - break; case 'w': f_nonprint = 0; f_octal = 0; From nobody Wed Feb 28 12:49:06 2024 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 4TlDgk68fmz5DFlk; Wed, 28 Feb 2024 12:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlDgk5Qy5z4Wg2; Wed, 28 Feb 2024 12:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709124546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LvbF6Sof0585vc65+UQcRgb7/tyaJtED6HvKVBkHz1Q=; b=CixNlky+ZKsYi3EiUc7pbnjqnLsE+4VDZPpTrZPIVxtSyl0pSjP0X7OvmmNOxX0rg74ZWl 6NOhFJebwd0ywzwm2RrfU74k+/tzc5eN9Pvj0xRnVExKnG1Yjjkui3oVvamKjQ6FiTEiU3 RngGY9V2HRtL6aHc4slj/F+czGjPAVe5GUXh/FE0lCVNmZxxy5L24opXm8hcdhk3uJVWzi dISOCS9DKxrL7Ybfv6Zsc6oef/f6U7wh+4EOgljVCVCvI4uRmEaWYJEfoxDa91MKvIoSoK rCnE8uDe2nS2KXCM9ntU3YKhehJcWul3hODgriRfPhI/x4emDJ0OuPc08TAutw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709124546; a=rsa-sha256; cv=none; b=hg+IpK45gOHOZreiHZPC2EF/IpA9X1/7iPVqbiMpUfgMphIKyJDWJdl9NvP0aDp9LBrSfC NNGw2M4fgLQNf/7bo0vuAxT6ZvBCVN1zwOGlMHw4HI67S0mjVX42lXETvGH6IGO9NZdlUw YjcyQijjQjzJIw/8IA9n5gvDhZzSskoUDwrPYWzfl5j0Hg3gp+ah9aizElF1zPGbg4bqwJ Kx9TbMdbwIJ5trv6CBBlfLuRtPR51msfm1hJsqRpwDtdLge5Gwnr2b/RKaZ4GVewk99O6r ZW/idbhus7ZeymACaMhsECM8w1CJ3BMlLlJo1f+PQ1it2oBPYQxKWX9ENgSJug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709124546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LvbF6Sof0585vc65+UQcRgb7/tyaJtED6HvKVBkHz1Q=; b=ruC/a+siT2BDqx4wwyQpjE+4Tr6Ua7YNm5M9KjWKBhcmCQ86gwawnORTfTNDT+4F0zf9Th dg3jvdVHV68AGIjYW8dorR3BaBaXAcPNFf5sUy6tpWxMNpPz0uTXPgTx7CoSP8ZWat3Kz5 5HYyEqKwTmGy4SRaVZbmUjYOk1LVOZBF+YMbYcR989B2IUD3ZPOE1wmQmmxJhsDf8zOh0j rpMbh58zliwCqs6Fct67JOmu76HO0p0ecIxI39BK90C/FEKRRz+kl74Vtl7zAH2LoyR6L+ Td8Biw1VWIgHcyPHeqF4zR74WP9cVHntVCifFZqCNdSUgn1DtJAjAEwsB5j9QQ== 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 4TlDgk4SKZzxTp; Wed, 28 Feb 2024 12:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41SCn6BO012803; Wed, 28 Feb 2024 12:49:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SCn6pf012800; Wed, 28 Feb 2024 12:49:06 GMT (envelope-from git) Date: Wed, 28 Feb 2024 12:49:06 GMT Message-Id: <202402281249.41SCn6pf012800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fa399b889f70 - stable/14 - ls: Fix -v and associated 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: fa399b889f70dafb429e548919b0677a619677ef Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fa399b889f70dafb429e548919b0677a619677ef commit fa399b889f70dafb429e548919b0677a619677ef Author: Warner Losh AuthorDate: 2024-02-19 16:48:05 +0000 Commit: Gordon Bergling CommitDate: 2024-02-28 12:47:33 +0000 ls: Fix -v and associated test The cleanup of d854370fa86b7 had a cut and paste error (so f_verssort was set to 1 and then to 0 rather thame f_timesort being set to 0). Fixes: d854370fa86b7 Sponsored by: Netflix (cherry picked from commit ef75877fc2d93199aab2b509089136c433af1f20) --- bin/ls/ls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/ls/ls.c b/bin/ls/ls.c index d358ece2d89e..59ff12547787 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -339,7 +339,7 @@ main(int argc, char *argv[]) case 'v': f_verssort = 1; f_sizesort = 0; - f_verssort = 0; + f_timesort = 0; break; /* Other flags. Please keep alphabetic. */ case ',': @@ -578,6 +578,7 @@ main(int argc, char *argv[]) blocksize /= 512; } } + /* Select a sort function. */ if (f_reversesort) { if (f_sizesort) From nobody Wed Feb 28 12:49:07 2024 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 4TlDgm0rvlz5DGBp; Wed, 28 Feb 2024 12:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlDgl6ZwWz4X1Y; Wed, 28 Feb 2024 12:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709124547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YMOtQeuXkmS4tfHyBoqZjTgbnk+WWL3Et28Ssj86us=; b=JHRTicqWJmUPab+GL2KeDDxvwBX0OvJSbsfPltA0ttDQejPaHf5KacAys16TAeBKgof4Xn KcVkqCERHpB7RDDXK2+e04y8BbSzsT2/WdbO25Y76/ve9CvijcAj+3rsWxoGeC4vkIl6I/ DUtrxLlXC07gBGQparoQFLkSE9/r0uN7mpZKawMAgYBQGzxsdVC2+gfbl++PBxr4v4YshO J+yWB5O7CZxnf8FnHXEKzgDUiZlwAugIdnIxnD1pPvJ5x4ynjhPNlqvcU4gebjgCRBj/w4 rOVXeK/9kRJHSuuNHJje5EI1IZl6FWcC/8S/9n+M1FhoKUvsQdKiKB9+Co9HUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709124547; a=rsa-sha256; cv=none; b=lr51iCJVbwA48Py5PsHv0AjsYR2ksh/4ua2MoscOVJF13+i+LqPilgXo+BKbu+XzUMcTYT bk561YYxBSEjM9K6j+dAZEPx5hnPy5pbhEjdq40cpGD50Y8qqtLJ2MGLYVeA8BeMNI8GXk KaomUEwaX7u6x8jUvcmTGjgzJWKoCNy6LsVf849ZBu/xnho0pQCx4x4dc72vNSNBPq9Ufh TbrYeHeiRYMj0mfP57YoVYNC7d798SU1MHs3hG1e1WgiWbryrRg+krS1IvgFbZjai0TyJg +f0aH/O2sKabareifxP+UmLMjD8jE52lcg9BebBBWm17bL2tu8i66BkYzKnlnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709124547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YMOtQeuXkmS4tfHyBoqZjTgbnk+WWL3Et28Ssj86us=; b=JNY49Oj0PfTLkF72vjHIElyw1TvpAStzRKeS025ANljMLqDLo7v6AgJHvQ9dt3zaXY7HRA ufbiSLroW2GXjRPzNq9zw78XmYXsMkxu5GvrZRDvrRHg7ooA3I4QB8ssqyzUolxTpYBqrt mq5DqcM2A/8LRDchTLXyzNt0RlzKC/mcqqeWZaIxmKmUaWcCAE44+V3dhl0cEdBy+/g32u ySUX2FDdgECZStfNzhVgjpKDfGg8DJ/p0zCrLDedcmts+Ku0/a3mOI1qCsBEea33ofAwyR OnOpDQnRxYyd6lgDJXbr8AWhxUT9tvQBmegXCWyt5cMv22is7XP1BvlV8r90kw== 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 4TlDgl5h8lzxnR; Wed, 28 Feb 2024 12:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41SCn7iu012845; Wed, 28 Feb 2024 12:49:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SCn7FD012842; Wed, 28 Feb 2024 12:49:07 GMT (envelope-from git) Date: Wed, 28 Feb 2024 12:49:07 GMT Message-Id: <202402281249.41SCn7FD012842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: d19769300126 - stable/14 - ls.1: Mention CLICOLOR environment 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: d19769300126426cc59b83036d3ba3e3d8425c16 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d19769300126426cc59b83036d3ba3e3d8425c16 commit d19769300126426cc59b83036d3ba3e3d8425c16 Author: Gordon Bergling AuthorDate: 2024-02-21 10:54:58 +0000 Commit: Gordon Bergling CommitDate: 2024-02-28 12:48:42 +0000 ls.1: Mention CLICOLOR environment variable Mention CLICOLOR environment variable in the manual page. PR: 276556 Submitted by: bsdcode at disroot dot org Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43970 (cherry picked from commit ffea732c5192070a6877409428b0a2cc1728aa16) --- bin/ls/ls.1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index 0d03fce804f2..1b0f24593adc 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -31,7 +31,7 @@ .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" -.Dd January 12, 2024 +.Dd February 21, 2024 .Dt LS 1 .Os .Sh NAME @@ -246,9 +246,11 @@ but only if .Dv stdout is a tty and either the .Fl G -flag is specified or the +flag is specified or one of the environment variables .Ev COLORTERM -environment variable is set and not empty. +or +.Ev CLICOLOR +is set and not empty. .Pp .Cm never will disable color regardless of environment variables. From nobody Thu Feb 29 00:24:30 2024 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 4TlX666PVcz5ChsR; Thu, 29 Feb 2024 00:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlX665D6yz53sD; Thu, 29 Feb 2024 00:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GL2WYvXFfop6Kbng38t2dW7bAlniGXk11nEEI/H55Zs=; b=WO8MgPVB8TujI3cIdZxvszygDQephPfmDkvaWJrG9/7tpwKYzEVCLS5B/WOsmVEFbM53IJ Cy0Ca29Ep7RB1LMmiZp8K11X9V9MoZDuGKgoNzpnc9Ap+FFwIej2YgEUARxQEDgdg/Ey8K u+IiN0ilI1Zrimfpf34mfrBLeikeqWEQbJSBXAHgrmnS2bcJocDEhxGzHJhGf1+LfH0h0h PMSy78/xcPrkEV4OdlvfAp3z/9Hbl1yqKzadoSfGB/2RWMx/iCwVwDc04/pfhIC7c7Emuq ZdzARNWAzWhEaIau5IHYVnceyhgJ4A9UIaPUHrCqNoz9F+zuvtpXYgs6eSHR5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166270; a=rsa-sha256; cv=none; b=YUODb/cfJoXS1XSKtT1b7lQF7kn15u3sXZVS/An2fqGyX6x/skc/GvrITqTVpch+GThWND EKVMy+ubdJxJvDgYLdaY8auzIVyAIvmhkhuhkQyUZKlhzmY5Jjt9VAA7M9UoGAIcVFIwHE LnrEg/rVAf7UsDAqNIpGREigqh8zFNdQJSv3l8bfFc2D9XdFq9UOC8EFsUy0Dhf6nWnB+P BkVndN6H0YzL5iUYvKjfPqd5s7LrtHVjBR5bmG4ExCAuoTkTU0nBshsq1vo+hiivYfFiwD T79i5nMpnziRJoJzdcUi8LLQ4EMCazkEV7oQhR8Tu7GT6/zv6/0BRnoagGsoxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GL2WYvXFfop6Kbng38t2dW7bAlniGXk11nEEI/H55Zs=; b=KwSlzGoJEMY14rsmHdTN3kTBTv7rkF7N9hgqrxUf44IS6Dz51iD+le/CYGyOZYbWHE9tZV 6thzh30cfamL2iGclDPFwzXF/QHWc0DujR52g6VNC5US0Nz3qPLKwpk3hHmCWZKcrSvabO Y88rTvX+SXcNjVQaKuxZETe17/o+G08bIcFMr30fBKgMtKQuB1yjrxLk3Dkx1i7ZklmFCu BgzrO7bIky8QvWIUJZM4ivPBuj+cY+fI25NUBAsefnSbLEceQs8+otedjOe/5UxyKFWs58 P3IMnVt9MrKVtn+GkX6h692Oeylxi83ObBVSyEO+fwOn1Ynm7OYXzh9PoYtCrA== 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 4TlX664qMgzJnx; Thu, 29 Feb 2024 00:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0OUCu096165; Thu, 29 Feb 2024 00:24:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0OUpm096162; Thu, 29 Feb 2024 00:24:30 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:24:30 GMT Message-Id: <202402290024.41T0OUpm096162@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: 0a246310f79b - stable/14 - rtld: remove pointless "extern" 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 0a246310f79b26f3c07f342d4eeb682896c2e44f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0a246310f79b26f3c07f342d4eeb682896c2e44f commit 0a246310f79b26f3c07f342d4eeb682896c2e44f Author: Konstantin Belousov AuthorDate: 2024-02-20 14:25:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-29 00:24:06 +0000 rtld: remove pointless "extern" (cherry picked from commit 180df764c4ee570850deb4a910a11780ec3316df) --- libexec/rtld-elf/rtld-libc/rtld_libc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld-libc/rtld_libc.c b/libexec/rtld-elf/rtld-libc/rtld_libc.c index ef61c2b094bc..694aee363506 100644 --- a/libexec/rtld-elf/rtld-libc/rtld_libc.c +++ b/libexec/rtld-elf/rtld-libc/rtld_libc.c @@ -105,7 +105,7 @@ getpagesize(void) return (page_size); } -extern int __sys___sysctl(const int *name, u_int namelen, void *oldp, +int __sys___sysctl(const int *name, u_int namelen, void *oldp, size_t *oldlenp, const void *newp, size_t newlen); int From nobody Thu Feb 29 00:24:31 2024 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 4TlX676r2Fz5ChfC; Thu, 29 Feb 2024 00:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlX6767Cxz53XN; Thu, 29 Feb 2024 00:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7IeSmWu1k2b4eAR8KkG3hUr77O28KK8T9M/3Qe+xAQE=; b=NJ6RBats+pFi3+jKv8Okc1jOFxps7JK5z6jFlPQvAZ+SBMNCOHMg1cNnBKUIxxW2rjBsGL l+k2KJMET2UqAuCWKmIWsq9zAup3+S0z2LuFMPG63kWRvRwRKupEpftET6XeaSzsI8GJnT YVuA3SZVTB6ADTY++/a/XjzCTsSz3GH56Kf5se++GKBkzSiCR0ZtJs3TNY4mOaLxeW8z8X AzBlBw6i+nGK0jMwO2L7dpQYRr4qI3cy6edhsOPxBc6pdkJQdoOp1YEuIoZ4b5bugaXYwR 5QnAiyHzAETi9BbTQgCZDNgIA8+4SE7c1WhZI5xBzI8L1+UWd4JAxRzA0exAkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166271; a=rsa-sha256; cv=none; b=r/vx6WNTQg3uxKW7e5/Awo5iid32QQVfvNrNsqMzBvWKW06VAZWDQ91VnGqO+73r+3potR OJJK5bKgOWApSHVLp14FmSSQqtZWK3kfCxyUGQxI5rAgPl1Rr37OQFLObIM5snwo6OXfqM EWT1FaD7lyycLAqbhOv8zvfxBNOuJT8K3IvC2ktRUJCqN7YedNYaM6eN6iY/rDwAzfL/mt iUjAWky6zTu5bkYVlFvP4ntnsBbFoD4sSfWzDaPEN9m4flEmOE8MOwmEVweINAynM0GDbT dxjRN+8oWTdmhbsnxf4Nl0RXW/yqK3wM7dr8Ad5+2pjOrFRA3Da0+zag9Vs2kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7IeSmWu1k2b4eAR8KkG3hUr77O28KK8T9M/3Qe+xAQE=; b=YFrIGKL+z0NPyw1Q3xHHY2jsKt+wXsyKKxpCwOzfh13VLY4qTCz/WOBptRY2dB+Vo/YpZ/ ZTu88+Aw3tIhBtXlQNv+WHenhadfp3yemQMKbmTCkBgMK+iiTDIF/2lKc4C8EO1f16ydne y08s5+IHiFuGZGtj8DNw1Kq7lSMWgEmLNVVF97houcQoyq76NH1YZ2I6wv8uExO1rtm/ak 52l+BftPbfwdf7Ej8Nt6xbK0MGi09OzUoHHUUk90+zlxWMylLyC22mrJaFeMDrJmPEddt2 //ALtJrv2KqpUJ/aqbxyG1Zt4nPfOVLk7tQxscK3Z4MjwxyPw/xw1UKLszWV9Q== 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 4TlX675jwgzKKj; Thu, 29 Feb 2024 00:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0OVCO096235; Thu, 29 Feb 2024 00:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0OVUH096232; Thu, 29 Feb 2024 00:24:31 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:24:31 GMT Message-Id: <202402290024.41T0OVUH096232@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: 11137153ab90 - stable/14 - fdlopen(3): do not create a new object mapping if already loaded 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 11137153ab90c38cc5e9993f5c65491c47705024 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=11137153ab90c38cc5e9993f5c65491c47705024 commit 11137153ab90c38cc5e9993f5c65491c47705024 Author: Konstantin Belousov AuthorDate: 2024-02-22 01:18:06 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-29 00:24:06 +0000 fdlopen(3): do not create a new object mapping if already loaded PR: 277169 (cherry picked from commit 452c5e9995ab4cd6c7ea230cffe0c53bfa65c1ab) --- libexec/rtld-elf/rtld.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index d32c80debc1d..f11fe8afcc32 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2742,8 +2742,9 @@ load_object(const char *name, int fd_u, const Obj_Entry *refobj, int flags) if (obj->ino == sb.st_ino && obj->dev == sb.st_dev) break; } - if (obj != NULL && name != NULL) { - object_add_name(obj, name); + if (obj != NULL) { + if (name != NULL) + object_add_name(obj, name); free(path); close(fd); return (obj); From nobody Thu Feb 29 00:24:32 2024 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 4TlX691tt9z5Chpl; Thu, 29 Feb 2024 00:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlX690brfz53v0; Thu, 29 Feb 2024 00:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nqr++lQLqne/xURadxtowdFlxGsqF1wWrfD6d0jRwYc=; b=dZv5jiAOM+Zq84YPadloNHQvn4SxlLX5kYZ2m23xAZa7t2MCis9ezC+L1ZNcZaMJaFoUB3 axsfzHNnRlEQxG+joxSzirrEXOPGJIo2cw+ooFa6E1+sD5E2rgDOWw9vkWB+juVq9LSiZk iJiD26UqNjbAmBYx0oAbLYSt5tfB3HcYaLLParQMrBiVDr403acfTlBT13xTv+3SR/p4xW O3Mrrb/TgwKY5WXmlQwhpzQJsg1WD1xMfVwBTE7b/ZlOtsbVHwkiEiQhjw9K+LHefZMlZb HafNzKBoFYMefTbeSFfKCvVfKVsXiJg3nQx0vxHuyl31q8o1a0JdNRxteaYKXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166273; a=rsa-sha256; cv=none; b=n2btqmQ/z476ZdCZmorfNeGUhL5S+H1hvOYnQFS54J9ZfeNl4BrFY9QrzrhHEm6ey2TqhA 6x6UJnwz6JvXG9JdoFyXhkzXjuRYoYxJ7njs7ubZCyPsxsxoraORl/jWD928w1wuymkdxc Vu33NWNx8Xc5Kfl4S0pLkVhO36Qn1+roZkbjI5ezOm6WKk5qumFLGgHjXGCdtYT2Pt6Ilg YSfiDw7f9QoBxWkVR0rIt0Z0NEbrE0R3TqPSPFeGd4m5NNTpNLOSTe7J1Ou0uCwZeCgWHd W3jHPwXTzY3DeJEWUkQPrHj9BjsjpexkwQOrF2PL5M2Z+M+htTMEcq5EVQSRvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nqr++lQLqne/xURadxtowdFlxGsqF1wWrfD6d0jRwYc=; b=Wj5I3hm17Ccgw4RSvcbxS/r6yuTtY6L0H1vA5rWP96XgQVeTMcT3ZNu42W/frmFaj8qJcC X1lF6P9orAbMXZjARpZYIpqp3XPlHmBCAVE37VBFDtPr3bOocjSL4FuC1v4iL6LBHLcQjO cD2AvDM+vahd1n7E9+ku+e2UTMfGijIw/pFabSiEgPWQy3fGLx/dbHTqX0OgwjZc0CrnaH cMlFdG9N9K7VnE29J7VWMauIjh8csuZ+tfFIc1b+5hII/IZtG03vCqEMVfqQvwfIwqCztM SYhalKjevdsbp8GVk4JwdelbcrJGVuDcUh44zQf8DrAzJ5teKwnrpB1lBmBkjQ== 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 4TlX6900jJzJny; Thu, 29 Feb 2024 00:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0OWSL096299; Thu, 29 Feb 2024 00:24:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0OWos096296; Thu, 29 Feb 2024 00:24:32 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:24:32 GMT Message-Id: <202402290024.41T0OWos096296@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: 38595c9d739b - stable/14 - linux_pwd_onexec: do not abort image activation if emul path does not exist 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 38595c9d739bf69ff1270e575b1cbdcfe47284a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=38595c9d739bf69ff1270e575b1cbdcfe47284a7 commit 38595c9d739bf69ff1270e575b1cbdcfe47284a7 Author: Konstantin Belousov AuthorDate: 2024-02-10 05:02:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-29 00:24:06 +0000 linux_pwd_onexec: do not abort image activation if emul path does not exist (cherry picked from commit 99fa799a19abeb70b1034f65407c276b64709bdc) --- sys/compat/linux/linux_util.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index 020eb57ea68e..e0c010cb5e48 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -79,22 +79,14 @@ int linux_pwd_onexec(struct thread *td) { struct nameidata nd; - struct pwd *pwd; int error; NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, linux_emul_path); error = namei(&nd); if (error != 0) { - /* - * Do not bother if we are in chroot or jail. - */ - pwd = pwd_hold(td); - if (pwd->pwd_rdir != rootvnode) { - pwd_drop(pwd); - return (0); - } - pwd_drop(pwd); - return (error); + /* Do not prevent execution if altroot is non-existent. */ + pwd_altroot(td, NULL); + return (0); } NDFREE_PNBUF(&nd); pwd_altroot(td, nd.ni_vp); From nobody Thu Feb 29 00:26:14 2024 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 4TlX862jpSz5ChxP; Thu, 29 Feb 2024 00:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlX862G0Wz54Ss; Thu, 29 Feb 2024 00:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJ7LpQrs3dab8tjAB4T+Hx6cvOoKAISdpjgwbmfkZ4U=; b=LjzKxl0S6nwFZ6i3NsM6VEjPtmZSm3Mu9wQqVBpmpsk0CifXTitlJchncXXV5Y7gMd24/h 0iKBqZwyROo4aP9VO0hRL6taqN7o4grk8HaCjNLzQ+oyvRlp9hpknQ68ULMnFle15eN4HP lTq9Azg5Ac1peTUkDRAAsDYh4rcYNxdS8JWec3fGbk6MMk/O41T74f3aIXa81dzr0IL24d s9i4p0w+ydyCWWCWPvfQTsn9F7bDmdq51zF0D+LjGqQRk0uxtAZGk4N5nClbAF3sl8j8wQ O+XzY+9jxv8ulKpAmPXRj6bwX9+3bwYEHNSklRb8clBoQqn4qF2q7KOwQ2LA0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166374; a=rsa-sha256; cv=none; b=lkaULsI45supG+Umdw1eeJPjHQ/q3TLIJesrr+kvDeSvnu4OwmA0lKSJQWD9zzHRum684j C5rEfDKwYW7+/uW5jqWL0rO0W0YKRGsFxThFr8txHELeJXPWzZvxPEx/WZgGjx0ZcNQ695 KsaEW6ITOYyMMZVRt97FudnGTia9bIGbEa+h6loBgTJad16Ez/WDQ7MAkULMgqI0EuHuul 6co+impaK8Sjl4DU5bwh0OaIxjdzN87AsIjGcikbkJWVs28aOGGODhtCKX6Nv13+7CPId4 TNWOAcSz1Tn3RlBeG5Id4qhRwx9iWlmzhHq46Kl91J/2r/4aZzwNU6uV/oUhlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJ7LpQrs3dab8tjAB4T+Hx6cvOoKAISdpjgwbmfkZ4U=; b=tN+6QxKmaur53T+rhVlvI7DoXUpnnsncs1qrb5IfyVst5aQxXJ8Uz8TMl+S1I3uYlX4Eyx v3eMxNrsVAgfdnTc8rQGYjI7HKOJcmE4iyrEGtiU1/Hyqr8L1j5Yprd4QUGLnDp8CzmnmH Ka5FH0me0ePxRbopaF/i5rRaIgYOk5E6PSlNnLaJZbCc7qh5NOY6cKBa+1Qfd9X5+Fr6cs WRKpmhRd9QkuSfxJNjWjKd+/QkKjN0Ogss5T2iVqziEjhzbyInOYhC5c/Sjvo/nX+TgG8G 5mrIIYlu42P0YgxtBPXZSE0iuSFM0YTb0rSHHjSSgvuvnknN53NPA7JIJzwHTw== 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 4TlX861sFmzK61; Thu, 29 Feb 2024 00:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0QEdu096726; Thu, 29 Feb 2024 00:26:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0QEin096723; Thu, 29 Feb 2024 00:26:14 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:26:14 GMT Message-Id: <202402290026.41T0QEin096723@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: 9ef04f1abe5f - stable/13 - rtld symlook_obj: move common code to check filtees into helper 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 9ef04f1abe5fa1f429509b2287bee2ba715fa12b Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ef04f1abe5fa1f429509b2287bee2ba715fa12b commit 9ef04f1abe5fa1f429509b2287bee2ba715fa12b Author: Konstantin Belousov AuthorDate: 2024-02-13 00:48:42 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-29 00:24:43 +0000 rtld symlook_obj: move common code to check filtees into helper (cherry picked from commit 9ea864b54b57f2d0125860fb923f8db52b20eac2) --- libexec/rtld-elf/rtld.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 218e984bdd88..27958ce00398 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -4724,6 +4724,20 @@ symlook_needed(SymLook *req, const Needed_Entry *needed, DoneList *dlp) return (ESRCH); } +static int +symlook_obj_load_filtees(SymLook *req, SymLook *req1, const Obj_Entry *obj, + Needed_Entry *needed) +{ + DoneList donelist; + int flags; + + flags = (req->flags & SYMLOOK_EARLY) != 0 ? RTLD_LO_EARLY : 0; + load_filtees(__DECONST(Obj_Entry *, obj), flags, req->lockstate); + donelist_init(&donelist); + symlook_init_from_req(req1, req); + return (symlook_needed(req1, needed, &donelist)); +} + /* * Search the symbol table of a single shared object for a symbol of * the given name and version, if requested. Returns a pointer to the @@ -4736,9 +4750,8 @@ symlook_needed(SymLook *req, const Needed_Entry *needed, DoneList *dlp) int symlook_obj(SymLook *req, const Obj_Entry *obj) { - DoneList donelist; SymLook req1; - int flags, res, mres; + int res, mres; /* * If there is at least one valid hash at this point, we prefer to @@ -4753,11 +4766,8 @@ symlook_obj(SymLook *req, const Obj_Entry *obj) if (mres == 0) { if (obj->needed_filtees != NULL) { - flags = (req->flags & SYMLOOK_EARLY) ? RTLD_LO_EARLY : 0; - load_filtees(__DECONST(Obj_Entry *, obj), flags, req->lockstate); - donelist_init(&donelist); - symlook_init_from_req(&req1, req); - res = symlook_needed(&req1, obj->needed_filtees, &donelist); + res = symlook_obj_load_filtees(req, &req1, obj, + obj->needed_filtees); if (res == 0) { req->sym_out = req1.sym_out; req->defobj_out = req1.defobj_out; @@ -4765,11 +4775,8 @@ symlook_obj(SymLook *req, const Obj_Entry *obj) return (res); } if (obj->needed_aux_filtees != NULL) { - flags = (req->flags & SYMLOOK_EARLY) ? RTLD_LO_EARLY : 0; - load_filtees(__DECONST(Obj_Entry *, obj), flags, req->lockstate); - donelist_init(&donelist); - symlook_init_from_req(&req1, req); - res = symlook_needed(&req1, obj->needed_aux_filtees, &donelist); + res = symlook_obj_load_filtees(req, &req1, obj, + obj->needed_aux_filtees); if (res == 0) { req->sym_out = req1.sym_out; req->defobj_out = req1.defobj_out; From nobody Thu Feb 29 00:26:15 2024 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 4TlX873gJsz5Cj0b; Thu, 29 Feb 2024 00:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlX873DlTz54Sv; Thu, 29 Feb 2024 00:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G4gEB4ty9woF0P/0EW6hUK5nCW4U6TdSo1KgvHYTuhA=; b=UWIhPh02syd5lTkaa8DuNMNSfnj3w+m7UBe/nu/ocgkDJoZJghyK1/s1Xzf3yMWd2oJhkx Z/hb4/3P+S2NNmC8TRWAyfyRfOLgp3MEGl6vNoJBTk5zNLJZXXCjg5LYCHhgwClFwTEiWQ qHsd8JX+GuLnQr4UYrHiJVW5zrRZj6DtIr/x/YvG3xRDAW/Bm9QpecBSdFqeuwi36dFQXS GlENHHEGNxjnMZ4wHpP2S47l2cDBlcRF6G3Q5EjTJWPqpfU3fCjg38pnQgSHnbrKU1Cv/y FaGeRczJKC+vOuYm4Xl6mIqDgjU3SQCuSAWEpsteIZUGjQBA0ZrJ7YDA6qwCMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166375; a=rsa-sha256; cv=none; b=Y2BKH4HSD4j9j9P5zB2WbmjHABCYg3mz/xGhshfL7NvX+mErXI54dTpEIRv4bv7bkLxBUs cO3GICqZT1xMF7bVEn5jbEfSvHqr05169tRDdygnolOXulXb9LItJSKg6WBBC2Rf5Wz0hb AatMHdUD7CqtLqF4Dj4DSA6XTpjkeafwAoV9X/YehiEuws1ryE1MHMg/gd4Jp4h3bd7pSW CRxKEIS08y9YosriSrJatIbUgT76oQfgYJwPKpMkkjkgQW1toQoqjXEGqyeudxpmoe9Zil Z0dknw7LlYLX8zLGwl97OJ0yxfhpylsWvRbxrg8AqRbzX+izfi1FKID7St+VrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G4gEB4ty9woF0P/0EW6hUK5nCW4U6TdSo1KgvHYTuhA=; b=bo+flw0v/mJBBqlL7DiJ3zAbu4Wmzs84YjJO2pVxiJeBZRD63mNRX8YSuPkmP16PyIEJAK 8hCwMd71WN67vduMsHAznvsQNcP8ycYzr6dbandcMIfaZAfE48Uu1MZMwTg/xcx+GkLmYF 9GbLeD5huXgdX1+at2y1h/3DNEiS7Bvbfjqqh+BKfIpdkuS4y2xecRGiq7vWLvCjYRq0vh BS5NEPLpJEstiG11XatHLr4nd5biJJRQIpesMjJzxQ6MYYA8jNKkMd4Iuj55STYGt/L4gR YsKDmg44WTJbI8vGtSabddVWkIPnRNNf8mXOGSZsZqy9nhc45jXmbbb6lxW1fw== 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 4TlX872rf4zJGY; Thu, 29 Feb 2024 00:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0QFUp096768; Thu, 29 Feb 2024 00:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0QF4w096765; Thu, 29 Feb 2024 00:26:15 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:26:15 GMT Message-Id: <202402290026.41T0QF4w096765@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: 2d5c2324af33 - stable/13 - rtld-elf: Avoid unnecessary lock_restart_for_upgrade() calls 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 2d5c2324af335541c40bf9ba682283c7e735ef89 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2d5c2324af335541c40bf9ba682283c7e735ef89 commit 2d5c2324af335541c40bf9ba682283c7e735ef89 Author: Mark Johnston AuthorDate: 2024-02-01 22:43:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-29 00:24:43 +0000 rtld-elf: Avoid unnecessary lock_restart_for_upgrade() calls (cherry picked from commit e7951d0b04e6464b37264b8166b1e9ce368a9f1d) --- libexec/rtld-elf/rtld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 27958ce00398..56fca9cd60b2 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2617,8 +2617,8 @@ static void load_filtees(Obj_Entry *obj, int flags, RtldLockState *lockstate) { - lock_restart_for_upgrade(lockstate); if (!obj->filtees_loaded) { + lock_restart_for_upgrade(lockstate); load_filtee1(obj, obj->needed_filtees, flags, lockstate); load_filtee1(obj, obj->needed_aux_filtees, flags, lockstate); obj->filtees_loaded = true; From nobody Thu Feb 29 00:26:16 2024 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 4TlX885ByYz5Cj0c; Thu, 29 Feb 2024 00:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlX88408yz54WL; Thu, 29 Feb 2024 00:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RG57gXjKJxig0QDuWaSRBxU+GLING//AMf+omF6dzDQ=; b=iga2zwDxxuQTfCEkTUkBzb3TbvmTbpMLBfi3OB/CfasUL1u7t52aQI8We+Dt7ZWOqUOKDU rT0qqYMpJLADtSRYdqoxiEKCQanjBlmNBwy1zQcWoIXV2JFmZ0PwIq/JI0eQ74JcPRfOcV fnU/GReGcJOlWmibQSd00SUK6x0jl5zs7rbq4oJ5jHuU1FDqSV83LdHkVhwdWiQAyQPNPp 6kIC5uaLJ9F1BN4WfJ+BtJXkQA7O5ojSIPzvmnTpcPqBTB1kfxOAe/R9kTEJOUaU6vjH6o jBgrqgCuIfv8t9nuw8gAcEp8SAT6R6KSauFCTKKNv5JUzM9voIKk5v6e3ixBhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166376; a=rsa-sha256; cv=none; b=RuqlikgwV57Y7obFWelfRMgpdA4qF8AaUuQwPxy9FsiPdoPkajfKJJlWjryGN1zuyQ6691 vGk26aSBmyGVx02TGbdbZNzCm4KBeJCscP/cOsJW8vBVsDHwGsywSjaX5VXumd+AUSvpVT KxtN4AqvCmZFc7okkar5To44e8ADoaWhRWPIGpBZ/aprxliwvIY/GJFj8XrMBVzKhOK9H1 lnq9KxyrE4ZaOI5l2NGX8mTheGTpf0XRnXfu5F+1rJJSACiax8qTx4aTd1ZHnjdXmUAEYG U51OrpLLmGtbHfZwYiSm8QEcmvwJlwI7dnJxA+C02G+NA9gUlfCJUn2Yvv6PRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RG57gXjKJxig0QDuWaSRBxU+GLING//AMf+omF6dzDQ=; b=iRch6BJnNVcrVLWNqVAVwfiyy/lCnFBXCGIO2jW11KH7LEiFCyRA7ZJQAjw9o7ZSIBw7lr 4vVVARvh6mfzz+CLYpM6NJG+3zx/lVCEGT+bM2VyxZxUhmnACsMU1H31TiB6N/t5pFXnqW gr6azfMOVJPw86Moi8fGD2cte4B4JRBa8YrLWrt8P9WJx0uLfhXV9Zm6nzBl/K+abucLQ/ 1K6Rktqm/dbITiDZngNd8CxRm1912JER5UHlA9sp6MVyeznjd9DOpu2r+XfK1J6ZtxcnpP cJcJorL9QGk9JLECFhHUYDsiPl7T2XbyurkHRcIXds/0mSqNcq0YAnYb/pQ+oA== 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 4TlX883ZB8zKKp; Thu, 29 Feb 2024 00:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0QGWE096816; Thu, 29 Feb 2024 00:26:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0QGiN096813; Thu, 29 Feb 2024 00:26:16 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:26:16 GMT Message-Id: <202402290026.41T0QGiN096813@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: 3d49b2e4d730 - stable/13 - rtld load_filtees(): reindent and reduce block nesting 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 3d49b2e4d730926b47387b93515fc78a478d7ea6 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3d49b2e4d730926b47387b93515fc78a478d7ea6 commit 3d49b2e4d730926b47387b93515fc78a478d7ea6 Author: Konstantin Belousov AuthorDate: 2024-02-13 01:19:43 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-29 00:24:43 +0000 rtld load_filtees(): reindent and reduce block nesting (cherry picked from commit 30b5f6b33b35623e6b6aa1d27a78311e199fa602) --- libexec/rtld-elf/rtld.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 56fca9cd60b2..a4278e70e872 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2616,13 +2616,12 @@ load_filtee1(Obj_Entry *obj, Needed_Entry *needed, int flags, static void load_filtees(Obj_Entry *obj, int flags, RtldLockState *lockstate) { - - if (!obj->filtees_loaded) { + if (obj->filtees_loaded) + return; lock_restart_for_upgrade(lockstate); load_filtee1(obj, obj->needed_filtees, flags, lockstate); load_filtee1(obj, obj->needed_aux_filtees, flags, lockstate); obj->filtees_loaded = true; - } } static int From nobody Thu Feb 29 00:26:17 2024 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 4TlX8B15hxz5ChxW; Thu, 29 Feb 2024 00:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlX894ncQz54kr; Thu, 29 Feb 2024 00:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ExkBwCS32yv1LHCrrw1MkfFNrOMldBhNWTCgV/sdeG4=; b=k0FusDtE6OiSjHfu2cqy91erDzqHxZC1viymU4uErod5a++MlN3SDPe85/9/nsYjPiN3y5 h/1E2tMM40NoMrfXHWjlUth3lVCVMEaS9kjsdx+V8tYMY30CybDi+Yl1EtarHmH83KyU5w 7QO4WsFfiM22+SbUp6D3ETzMmpmVhCfKRwNcf1kYaoFoQaepF8cMs2NGHLgT2cF+aDqwXk xtWY1JcU3PScKDeAxKDFfC6eGWOdjnQREPDfM1gxSuevBI8zQTDuPowrdE1VXEXFqUqSSr FwS4MyyOCBVbeKGmzUypuQgecLwDHstc1lNI9xGTnQp2+6e3S3vcqFmTIuytCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166377; a=rsa-sha256; cv=none; b=auzYMErG8jtiDrI3wBvyqZX38cJPJvdMXTPrMdUQAuvJL7gMgVtyoMqu6qRlj93cJ4tQ2Y 7wcRb2L/T+XqhEok6T4L2+su6zvhMPC2QfHTAjfyT1PsXPmT1lZX7/9Kd7VR3pCe8fD//6 LHifaCOEA5Dmre+hECvhOgZBWD6T/zKlUVhKTrJHoSr7O24HjOQ5DENi/RCkLx+osYkTWV muYJvwhS2WYgBPVOKZz0B1Rpamx6I5uP/yJz2EE3OzoLB+4dBI6w5McH7PH2DjBZSnvRUp qTv9IurfwKu8vc3B13xNmEFMA/110yIHr093Sqw0Jo2ukWPRpAqd6vq0fCkcmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ExkBwCS32yv1LHCrrw1MkfFNrOMldBhNWTCgV/sdeG4=; b=Zr2w+lfQWC76Jl31rKgvyACdsyQuC7azIswOZa6Uww5zQsv9rMeiXmwnkNyLxXRNrtmigw HIn4oNwG5Lstf2dhQnhOTwF59XmLDhJ0rByjBB5ik5tgvA8W0heiCQgb13EAQ/m8Gkxccv fc9hJEbDeYpl9vSVVcfUX/CmsonIu24uGW2eDHR5G0IlHO9DdUKPGd+irrl9laWx2DRJi8 Q/iXoZj8+o5eHvB/z/w/FDgbsX0BTpnoX9eTndvuoqYDBqzTTUhIGl0Yelkf53t4HIPT6j jXdJdr5OjUzh0ao7XFnWsT1FNEYBSZcR5k5lNFnpHK8xiQxmSWq2uJBybByioA== 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 4TlX894MmBzKKq; Thu, 29 Feb 2024 00:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0QHbO096881; Thu, 29 Feb 2024 00:26:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0QHq9096878; Thu, 29 Feb 2024 00:26:17 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:26:17 GMT Message-Id: <202402290026.41T0QHq9096878@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: c4ca9a566068 - stable/13 - rtld: ignore load_filtees() calls if we already loading filtees for the obj 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: c4ca9a5660680109ce0f2fda4f0b5188e979cd67 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c4ca9a5660680109ce0f2fda4f0b5188e979cd67 commit c4ca9a5660680109ce0f2fda4f0b5188e979cd67 Author: Konstantin Belousov AuthorDate: 2024-02-13 01:09:03 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-29 00:24:43 +0000 rtld: ignore load_filtees() calls if we already loading filtees for the obj (cherry picked from commit 968a18975adc9c2a619bb52aa2f009de99fc9e24) --- libexec/rtld-elf/rtld.c | 4 +++- libexec/rtld-elf/rtld.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index a4278e70e872..3ef686441fab 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2616,12 +2616,14 @@ load_filtee1(Obj_Entry *obj, Needed_Entry *needed, int flags, static void load_filtees(Obj_Entry *obj, int flags, RtldLockState *lockstate) { - if (obj->filtees_loaded) + if (obj->filtees_loaded || obj->filtees_loading) return; lock_restart_for_upgrade(lockstate); + obj->filtees_loading = true; load_filtee1(obj, obj->needed_filtees, flags, lockstate); load_filtee1(obj, obj->needed_aux_filtees, flags, lockstate); obj->filtees_loaded = true; + obj->filtees_loading = false; } static int diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 3111e54a2e08..8cf8b2771a24 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -268,6 +268,7 @@ typedef struct Struct_Obj_Entry { bool on_fini_list: 1; /* Object is already on fini list. */ bool dag_inited : 1; /* Object has its DAG initialized. */ bool filtees_loaded : 1; /* Filtees loaded */ + bool filtees_loading : 1; /* In process of filtees loading */ bool irelative : 1; /* Object has R_MACHDEP_IRELATIVE relocs */ bool irelative_nonplt : 1; /* Object has R_MACHDEP_IRELATIVE non-plt relocs */ bool gnu_ifunc : 1; /* Object has references to STT_GNU_IFUNC */ From nobody Thu Feb 29 00:26:18 2024 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 4TlX8B74nNz5Cj5W; Thu, 29 Feb 2024 00:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlX8B5cS5z54hd; Thu, 29 Feb 2024 00:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=txYz55puojzWoEPiJ8Vc6lctg6TIsFv7RBFbYhuGPNE=; b=i/ywGKdv9YH6SXuEjdB8dGo6h2wevivN8eRrN6fOMJHfUgGl/ycublpUVvJbCcdUH2dfxx kWQS1+a8iIvYH2FVqnorlu3ZwgXHpFbiXNmeBsc73A41DxLMKS7DVjjmlwBNDL/zLAXYtA mb3vFXVAc6XRhz8PJKUMd6gppKwEvImehkslVKJbE3BBNsplR8O+q6MMwN0k/w0dyQFGf2 4DbSPHRRvQWJOrmnQdfFsKxcP9ep/KjHP84mvgnvFHBgWMkG3dIFWx7RA8G578cXb2ykip NnszLJP86k54gpeEj9kH8lfkXxrl8MkbDvabtJU6Ytvlcq1V7LevSxkzgHDddQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166378; a=rsa-sha256; cv=none; b=kXfNmxhYeNpp6iSjOuiHSabFx9/yW+yTb0D2AbwH42xTTEdeCDYlV2V25RFzpRz5wGKcE3 389d9ER+r4SiX1T/T7MuIZ8E/caanYvbmwPXL7pTuX+IUrCQulcRzTu96ySTw2DmsQyXgC tEML0uxs/iEv7qMbAveQsp9gWuPxeH1A4ghBmNkmWdmYn8uC0QFssY0Q8ChB6Q0sS0/FIi Qr6hZy7tTsLihI17XxeSxpj+sPfHbYE/CQpkD36pFniA6E8PeHDLg8cvcP9G1bSLeIzuIC jqeiTgBDn0nSswLohKeWqSQt9gchI4cWCVcXmNbNjz+lFvBnWlT/aKDM3XQX8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=txYz55puojzWoEPiJ8Vc6lctg6TIsFv7RBFbYhuGPNE=; b=GRwZYwUI0JAqpByUxQbg3YczfO8UyCcNEN2+mqfemIWJIfFdt6zSlP2ZndEe95z8/15Dq2 1MpuQXpyE3LhIJSheuL2BYuj2bMsj3RuMTGKJrWjT9oe/n8PEftqGC1ijDRR/5ticAwqlr qcxkIr/xz9+mrpV6r70Wm4bT1GXmv9QdsZqPPq8PCLG9Ox5SDY7QSOSSngPMBtnzvglveA 2LBZZ9PTfJlhA90X2WdArXM6lVNDv4lBqMG1XRViaXSyOQ8zQcUSEaY0cBQPf99Ijinn+V R3eySPDLGqQPvC2hqdsEt/ZYzsvk1hrsgr2yRO7B9/fX9BtzpEhW8OmlTm49IQ== 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 4TlX8B59d2zKKr; Thu, 29 Feb 2024 00:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0QIgH096942; Thu, 29 Feb 2024 00:26:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0QIqQ096938; Thu, 29 Feb 2024 00:26:18 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:26:18 GMT Message-Id: <202402290026.41T0QIqQ096938@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: 1545d8732d2e - stable/13 - fdlopen(3): do not create a new object mapping if already loaded 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 1545d8732d2e076d085c08a13d3b6fc981b7f7fb Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1545d8732d2e076d085c08a13d3b6fc981b7f7fb commit 1545d8732d2e076d085c08a13d3b6fc981b7f7fb Author: Konstantin Belousov AuthorDate: 2024-02-22 01:18:06 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-29 00:24:43 +0000 fdlopen(3): do not create a new object mapping if already loaded PR: 277169 (cherry picked from commit 452c5e9995ab4cd6c7ea230cffe0c53bfa65c1ab) --- libexec/rtld-elf/rtld.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 3ef686441fab..e66e2f7f0f3b 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2786,8 +2786,9 @@ load_object(const char *name, int fd_u, const Obj_Entry *refobj, int flags) if (obj->ino == sb.st_ino && obj->dev == sb.st_dev) break; } - if (obj != NULL && name != NULL) { - object_add_name(obj, name); + if (obj != NULL) { + if (name != NULL) + object_add_name(obj, name); free(path); close(fd); return (obj); From nobody Thu Feb 29 00:26:19 2024 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 4TlX8D3TM7z5Cj3D; Thu, 29 Feb 2024 00:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlX8C6vXtz54hr; Thu, 29 Feb 2024 00:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XldZCWxbv7DCcGh+dJ3Awa9NPnRAI+oEKeJbIi5U0uw=; b=VBRbb+h/p389ZCai84rTKGmMM9Q4ws9mIZvDfHLsoSFTiO7WTf3AZgi8NJSrt+MOQx4ke7 gjBVGCC8aO4VjX2aaePPlQ7kde+m0w5DWgaLpP5bclRNlQtf4wmQynsfkIhdlGW0PMUWjN 6ooe4bYEHM0424jSbz4xo+wc0fhCsfQIarH8cpMNtmQ2wp1Vl7FhR/q3jeeM8CSqvnc74l Lkfr+qxMatVKpEymzXYT2JMt6kcWoHYZ5S7J/RcUN24mtKJodSyC8uiJl5yQhw7S8oqipL 0VghK7ZH3EHABV8FLYQ6h9AerFwudgkKNJl8PzhX3Pc6mSeUCpBBnfPr/31hyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166380; a=rsa-sha256; cv=none; b=bmDzwLvXbK6f97IDHjL0pzPXvYkSooTEx2CKPo1Wj8qFoqXoz5+KhAk3bkikUWwdjFExJf XPSkSoNR9NYfRl1mn6VsOZJBf35X3aBiStdwMsuCVajG03VXNOv7Xjj5UTkEcYvad8g9vk W5yzdFUwe0C42kGG0FRy7gywGT35E1R2l7md+rVUTzolq3mV3N8EsgEN89rf8YRt3tt6FK LEwEzzA7BDsWTdtsztOAlqBsJ9vdXeR7L3pHQcwrH7VlAXDGHFMFj9szaN82G3f137wzZp 09jCELQHt0DY+imEtgHNuRk/lyWoX9U4cNgC0j2mUcA+yZ9x+uK+yBhBbFhlpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XldZCWxbv7DCcGh+dJ3Awa9NPnRAI+oEKeJbIi5U0uw=; b=xmgSHiZU6JhL/R1phspA2W3/sKKrBszr/lmqv90s4j7ouENzEFev5gUenCihwBRRlJ0Mjg AhnCMYzit1o82nN6c/I3lF9aCcNbtPNrr9PawjpCJbfXmV4yXRi8C0qCx0umd8UvJ6xdnC cG+aIfuUOjio+ZMegNw/MSfAkKpfkX/RSuYzUCAe29qDskuTiA/+Kf5TmwQgydrhRqNqPw vutGVhwszDC4zeOhX54LHv/3uDs8wzh+6Igpnw8ZTL2vftJwKtfyzfvXhz2JSMM9RAEOt2 VYBcet3cO5Rax1Et37ctKnij4EZNBGf1fOZTcHLmkFli5svj6s27E/J/a2GZJg== 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 4TlX8C6SnDzK75; Thu, 29 Feb 2024 00:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0QJSY096990; Thu, 29 Feb 2024 00:26:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0QJ8Z096987; Thu, 29 Feb 2024 00:26:19 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:26:19 GMT Message-Id: <202402290026.41T0QJ8Z096987@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: af4c7ac93b45 - stable/13 - rtld: remove pointless "extern" 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: af4c7ac93b456d6f0cabfb6523aa309276b599e4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=af4c7ac93b456d6f0cabfb6523aa309276b599e4 commit af4c7ac93b456d6f0cabfb6523aa309276b599e4 Author: Konstantin Belousov AuthorDate: 2024-02-20 14:25:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-29 00:24:43 +0000 rtld: remove pointless "extern" (cherry picked from commit 180df764c4ee570850deb4a910a11780ec3316df) --- libexec/rtld-elf/rtld-libc/rtld_libc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld-libc/rtld_libc.c b/libexec/rtld-elf/rtld-libc/rtld_libc.c index ef61c2b094bc..694aee363506 100644 --- a/libexec/rtld-elf/rtld-libc/rtld_libc.c +++ b/libexec/rtld-elf/rtld-libc/rtld_libc.c @@ -105,7 +105,7 @@ getpagesize(void) return (page_size); } -extern int __sys___sysctl(const int *name, u_int namelen, void *oldp, +int __sys___sysctl(const int *name, u_int namelen, void *oldp, size_t *oldlenp, const void *newp, size_t newlen); int From nobody Thu Feb 29 00:29:43 2024 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 4TlXD73HSSz5Cj1J; Thu, 29 Feb 2024 00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlXD72QPyz57gP; Thu, 29 Feb 2024 00: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=1709166583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RuEqcybfvJaYB9zdkXc+td10Zib1IlPC/Es8RBJ9Vw=; b=qIGhikT9eF2ZFIo0UpFvOoFXw7x0CFg+m2e8UQA4m282MXcSSLuQ4Gkwd7gHeC646L66AI WkcxsAYVOV+xDHT5NwodS6HUttrmJ5KvoIWthB57+9IE7MFLXPCKjXaoQEf2BEqvX3joBv N8FTw+YLF8+l5ogCd1zEQ1QAZuVkdGYhJn1mNwqE/itslhF3vt1bsp6QuLNyHSYmLfSiyj vsJ8nOFD7MSqJ3Q4fEW+1fL+qyT+/GRJVHrQp45kmk/PO4xuGm7EGpik7YvgcxpBCwGt24 h9IETyM+mC3MHYQlqsawcCA5Fo+6W16uTFgCFHwvF7fhgJwbSP7hfKD+hsuZwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166583; a=rsa-sha256; cv=none; b=S6njsEF/aszQo9iZRqHLA1qCOk+DdVJO1ok6DVjtvRFyZ7oQIYZp2ycfoCbEuj2sc2/ynU rpuJT1rIOlN5gSYdULU3ofmf5F7/iZhhPeQxyH/4jpqsuPHB03h32pdmUxaKo92bTihVgt eHy1ody05fjI+ROKmSnNGXR616B9xwnJKqmCaHFKWHlSRNEOnokBW9CYo8V836i04ozzDB 6kXVxh+TX3l3ZiWdbFUXE6tz9Zfak27j5UTtoKseez/R5DgnHTZgdQscx4d/2/wsdSS8V4 U9S2QG87Va9nMxRycNPOhp5BK9pV6fc6uBg5XVteX/iGWyVWA03984BsJiwHGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RuEqcybfvJaYB9zdkXc+td10Zib1IlPC/Es8RBJ9Vw=; b=FIvIbYPu7lJY8x/cmhcRHCr+nucTBT2UpVMZzL6lkikls/qLe7nGFWnHLKnW2Hs5rzI48d /QE8U+SkQ8lNTtzyXCsAjq0AuljnhloraUPbv/aMOliH+qT1Wr+dWOSYfZFR6X1ipMzoiY ZhLuuhzJhkj35zVcVxS7jl/S6XkWuC7vfRwFbze56wksWz8amGOC1Xr/eG+SJ/hGGUr1aR mDaBVwlM5AT44FFZQrRsa1VTONqM+Uh6o81u6fHg+SXCl+H9x2EFf86RcIefS4SDS7ifjd tpbg/geOSwKgECmPkeJ15/xaO/FTJ0HKlIhZrMiRNLsXiXop6QZinLAX0esNVw== 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 4TlXD722NczK9R; Thu, 29 Feb 2024 00:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0Th8g097583; Thu, 29 Feb 2024 00:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0ThmN097580; Thu, 29 Feb 2024 00:29:43 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:29:43 GMT Message-Id: <202402290029.41T0ThmN097580@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: 8d22744f5be1 - stable/14 - kern: fix panic with disabled ttys 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 8d22744f5be165a2a82a2a204789e44bbdc5a2ee Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8d22744f5be165a2a82a2a204789e44bbdc5a2ee commit 8d22744f5be165a2a82a2a204789e44bbdc5a2ee Author: Ed Maste AuthorDate: 2024-02-26 15:38:45 +0000 Commit: Ed Maste CommitDate: 2024-02-29 00:29:13 +0000 kern: fix panic with disabled ttys PR: 277240, 277329 Reviewed by: kib (earlier version) Fixes: f1d0a0cbecf2 ("jail: Fix information leak.") MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44086 (cherry picked from commit 975d7730828a8bde28c2a0092b6e95c4c4e22f34) --- sys/kern/tty.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index eaf6fe98fe2e..6848fbf558b0 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1313,7 +1313,8 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) struct xtty *xtlist, *xt; struct tty *tp; struct proc *p; - int cansee, error; + int error; + bool cansee; sx_slock(&tty_list_sx); lsize = tty_list_count * sizeof(struct xtty); @@ -1326,8 +1327,8 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) TAILQ_FOREACH(tp, &tty_list, t_list) { tty_lock(tp); - if (tp->t_session != NULL) { - p = tp->t_session->s_leader; + if (tp->t_session != NULL && + (p = atomic_load_ptr(&tp->t_session->s_leader)) != NULL) { PROC_LOCK(p); cansee = (p_cansee(td, p) == 0); PROC_UNLOCK(p); From nobody Thu Feb 29 00:31:14 2024 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 4TlXFt5v6vz5Cj9N; Thu, 29 Feb 2024 00:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlXFt5PnXz57tV; Thu, 29 Feb 2024 00:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2fdBd1r1cxhmjdf2r3vrTGw1ux4j96cMGBacXIckVW0=; b=e5118036T0lTbFtnlt2KrREqQ/Q7d3ijvJwXZT1Antm2hXpUx9MbTBhzdjnDdAWYfVeB2Z q8h08xydfRWDvzI0GnuQO7iCzotJlQNI72W+ernYw5y8j1sdPA05Hx+qNOO5QfNDFj/QxJ OAtOwT6zqPq3/kCchFUk4pIx/nlEew6Xqpvh/1xqKFUV3T8zK5+oijl0cIyWDwGrYXfmU2 GQ7RDFps5d+U7VKa7fs6GCM2gZSd8+HKTh3+XTdzU2pVRLbMKcC7xQDuC3sCzfwfn8T1zE B9FLRV1ZggcyAB/WGM3u5MM+qLgvCNTkdb/s7Jp8lCPg1hvNMi8vtfeggZjskg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709166674; a=rsa-sha256; cv=none; b=AEXMQUQHo+y7j0iNyL+FEprOklRs/mm3qj/sGlb3PqgEhPkrPRW9OZrY7co5fB0g7uB9ak jmsK8kz33zylAt6KNR7zk8g4oY9p7+ZlDPUI6DkG10m+AuIXFAKW9YsOmyzbqvshx9Jidg jjaJow+hfv1L5r5Q/GKLz6PvcY5n8i8ILOcfFX0re7/csqcqqPqK/6rMHcpqCfsYstKMYe 5ysQQk8ysEAse1GQOtSqRvCS0MZj8Rm34Qy6+3KJZNU9N7DxUFJmnMe4X5zwJZ9/4oeo5u +RIDWrSxuESCf99vQRCQZZNenuluCVZunt7s5kvHZv8tnESQjKzQBU+g7Tw53w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709166674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2fdBd1r1cxhmjdf2r3vrTGw1ux4j96cMGBacXIckVW0=; b=FdIEBf4dgKQOqLui3+pMQWnf9PuOOEcQSztnjUpdWRApY+wRaQOZ1spZ9rlpmcHRkiKvnI 5FdjVf9lEMsLY6aJElonWyPtPQxZYEcx9ze4G4bzaeJ7DQ8xE6NQnyeQQp/aczuRdUWN1Y QDXSkitxPfuLHZ4G5RQ25FFoYbXmjYnbkvnf1bfuNox3mlY4zJ+7yrsrw2wb5xn8iLBh6K bGkDLH8aq1t9qQkH8Ge/yjDvr9jCmTaD5t+yVocTbsSSsrEBapZRSuYH3hYklY/+pzqIaU xxBozlp7sQ8p9kgcFKkhZ8VhZsZZvp7Ifo8639zw4i88bmhFX7G6mOQJkgRLDA== 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 4TlXFt51jJzJqd; Thu, 29 Feb 2024 00:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T0VEgb010997; Thu, 29 Feb 2024 00:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T0VExS010994; Thu, 29 Feb 2024 00:31:14 GMT (envelope-from git) Date: Thu, 29 Feb 2024 00:31:14 GMT Message-Id: <202402290031.41T0VExS010994@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: a60220bbb551 - stable/13 - kern: fix panic with disabled ttys 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: a60220bbb5511469fe53fd4290713ba891f8f48a Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a60220bbb5511469fe53fd4290713ba891f8f48a commit a60220bbb5511469fe53fd4290713ba891f8f48a Author: Ed Maste AuthorDate: 2024-02-26 15:38:45 +0000 Commit: Ed Maste CommitDate: 2024-02-29 00:30:12 +0000 kern: fix panic with disabled ttys PR: 277240, 277329 Reviewed by: kib (earlier version) Fixes: f1d0a0cbecf2 ("jail: Fix information leak.") MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44086 (cherry picked from commit 975d7730828a8bde28c2a0092b6e95c4c4e22f34) (cherry picked from commit 8d22744f5be165a2a82a2a204789e44bbdc5a2ee) --- sys/kern/tty.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 508c0f14b861..8ed59fd166fa 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1313,7 +1313,8 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) struct xtty *xtlist, *xt; struct tty *tp; struct proc *p; - int cansee, error; + int error; + bool cansee; sx_slock(&tty_list_sx); lsize = tty_list_count * sizeof(struct xtty); @@ -1326,8 +1327,8 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) TAILQ_FOREACH(tp, &tty_list, t_list) { tty_lock(tp); - if (tp->t_session != NULL) { - p = tp->t_session->s_leader; + if (tp->t_session != NULL && + (p = atomic_load_ptr(&tp->t_session->s_leader)) != NULL) { PROC_LOCK(p); cansee = (p_cansee(td, p) == 0); PROC_UNLOCK(p); From nobody Thu Feb 29 06:54:23 2024 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 4Tlhlz5Z0wz5CKh7; Thu, 29 Feb 2024 06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tlhlz2jRBz4f6K; Thu, 29 Feb 2024 06: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=1709189663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VIKBXBa/PQV8ZNkVR5q+on+oV0wTA771NBd/0GBsjR0=; b=c9YVGU+AdBnmlTKcnzDngbmmGWbHf/Ylki7egrA3TVA5mzJT3gcoDiz1G9Ea1qYepudtok dRDRIEoKnXWWkYNp4tt7AeHSRFvvKrLYQdM0sJ5qxPfH2Y5VszMcLNHGPqPoNMwZn4XHX1 CpUWFPqcmiYNo0VVVK+29hWb6k6+xdtafzyTs23mc+OCIDMixMC4/O8fzZe3uZrAIVNw2s Q+YVE0kWUIJktTCfFIsb4fmxso52ki5rXndEqCIQGVW9eWDx9S9IGV+Vr9iR7qXyAPjeAr Tb7CC1ysSJ76E+kzGFgUNFvI+jeWRHUURTn8VXGhQ64fv7jcWyeFS7uW2yeeEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709189663; a=rsa-sha256; cv=none; b=a7rZ86K7lgJB+cm6megjM9kwuieJmlgdZm9BfgMVFnC0+sBmUaWpmjnuGmB9jF1Tp9f8o8 sIoN6rRntPKq/Yu59kkhYmMmIyJj18GkoRgTRUjErNQOpi5uuCQ8rOagKUhfzvCzIU3sAo CGcC0curcm3C4jJjUJlCHlShzXeCF8I3DAWWFy8U/IJpRt4Vu/1PRJir5AnLpUa/Pz/807 BgA/D14TEBgGP/Tw4W0Tm77+UrlALEHJivMQklwQ0o+racPRdT9UvZrr04Imqj+TAB9gnP 39SIsKUa5011t7svtkxFAtWSsYkwxqKGLuuyB8+T6mbz+SI323baaLsbxLsHXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709189663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VIKBXBa/PQV8ZNkVR5q+on+oV0wTA771NBd/0GBsjR0=; b=xbV7XYDDXXM59lVwYJc8LISMvldE1F4pkp3pqnVRLO0jGBJ1mHkboQz3UgQOu/3ki4fxrl Pj8F5FYElmIc7Zo6uHYulSDTJvt5NKgjDqvEgJLKwVwJ+rFPr5gO1MgxQSYeIzAlLmkAXE 4koPQ/W5gkbCwTiWAnIg7cjdrkIP+IVVv08Gp9yrMkQuGK4EWPvAhWgRixZJIpolwx9POl bUvLJdhDuM9D5gQ1mQ5b7lF9xLrti7pKvoTw1ADThSCCOaR4YIsZPsnJ0bxYEno+qUX0Mp NwM93WR8UzMN+SU5qoogUWJjnhfHJR9OJdICgeD4Favr0a6H0DqLKQb5p9Nx5w== 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 4Tlhlz2JtmzX6w; Thu, 29 Feb 2024 06:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T6sNkf057304; Thu, 29 Feb 2024 06:54:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T6sNM3057301; Thu, 29 Feb 2024 06:54:23 GMT (envelope-from git) Date: Thu, 29 Feb 2024 06:54:23 GMT Message-Id: <202402290654.41T6sNM3057301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: dda1c30ffe54 - stable/14 - mana: fix leaking pci resource problem detaching mana deivces 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dda1c30ffe5433952c8d7597ed05c74d1721a73a Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=dda1c30ffe5433952c8d7597ed05c74d1721a73a commit dda1c30ffe5433952c8d7597ed05c74d1721a73a Author: Wei Hu AuthorDate: 2024-02-13 09:21:14 +0000 Commit: Wei Hu CommitDate: 2024-02-29 06:37:23 +0000 mana: fix leaking pci resource problem detaching mana deivces Fixing the error messages when detaching the mana gdma devices showed in dmesg: "Device leaked memory resources". Reported by: NetApp MFC after: 3 days Sponsored by: Microsoft (cherry picked from commit 47e99e5bc5bcfa621fe6a3e62386f227c47e8cff) --- sys/dev/mana/gdma_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mana/gdma_main.c b/sys/dev/mana/gdma_main.c index a601873876cb..e09918496b03 100644 --- a/sys/dev/mana/gdma_main.c +++ b/sys/dev/mana/gdma_main.c @@ -1562,7 +1562,7 @@ alloc_bar_out: static void mana_gd_free_pci_res(struct gdma_context *gc) { - if (!gc || gc->dev) + if (!gc || !gc->dev) return; if (gc->bar0 != NULL) { From nobody Thu Feb 29 13:17:45 2024 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 4TlsGL10GNz5C9WR; Thu, 29 Feb 2024 13:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlsGL0Y1hz4Z2p; Thu, 29 Feb 2024 13:17:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709212666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L7o94gMPU78ROKa8/EAN1YhX5gPAo1NvLmYPZLHGP3k=; b=WbWOYY58eZYzYz5Jkk9HmN2R1JJCM2Z94OhtJQw85PsRI4FZFfLPReBXcvjm7IrVYl6cNr AoUK0TkKiqf9O2mmc9m4B7eA4MNmOOYYXfY69iT4as/zF1P9Q03IBx1UgjHP9SgjSGcS0D Bav4O47CLaiyUjX+GrPNdhLZSjqnq8JO12hoOS344tsWFM0PDhktvuFW8cRoxbs1gkTDR0 qixIst9EwlYLxaBSyIEPHCYDmOx5EjamQiO0bi3FR5Dk7Boou2AQHJVK5JdJwKVVfjNKAu 8sudTf7GKZhL53GhL3HTqimH12PT6uLzWUq1o4xsATepIByJuRIzX2IWeH/rww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709212666; a=rsa-sha256; cv=none; b=D973mnBVx7KDBqd5fULln9q6UhgQuJkmusF2HX26y8fwkN8a1qDfEv9utjQWnkxjhGS7Zm Qa85Jr9p8n0ZR2gLIWTysPVw5EFGgydphkHQyHui2gW8/99bko1KQHwX6/nBeH+2p6zbgi NrguWDbmxCievz/MlbjxMl87pwEc31jacbm/aMyu31vdxLQkqjuIufYmpz1n3NDcTv3p64 3NGanm9/sOlgzPUArtKmAkbQJWK6Zhar3TOzcW97wF0fwD+/Y1F6mYefh0oe5h24ulsVcW PDHg7WfmQVTINzZDtVkNa09F7JY7pnmOvQWegHGu39l8XvrFa99M2gI1u81CLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709212666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L7o94gMPU78ROKa8/EAN1YhX5gPAo1NvLmYPZLHGP3k=; b=p2jy7MGVbqAhmj1MmXh5F7V95A2+b0PnPWDzTYcEO8q1j/SloTTcRTi2FtPiDxI3OQbBWb BKTdjvoQxN+GULCpfjr8Qp612MUtV+TVeKSHa+0cZYi094qonIOl1BATU/H5isjyFQbrP1 FHU+q/mjPFPe//trRGXlu3vurh9NyEupVmMrHVdIxXFLViS5uiEgWs76yyVHPZyzynZdTq XGze4qbzhF0dseG9kEczetEgOOVKdSQCX5KtmvClyfu8EJj5dGKjfCykTuymyrICovyBfc OF+nj8dXeX/jQBBe9ZmXt9IlYegLxc4TmzLZx0hmWz1lyvxHx/3kE3xttERqEQ== 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 4TlsGL09PVzjmQ; Thu, 29 Feb 2024 13:17:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41TDHjKs004410; Thu, 29 Feb 2024 13:17:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41TDHjKr004407; Thu, 29 Feb 2024 13:17:45 GMT (envelope-from git) Date: Thu, 29 Feb 2024 13:17:45 GMT Message-Id: <202402291317.41TDHjKr004407@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: 784695750ef3 - releng/13.3 - jail: Fix information leak. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 784695750ef3f73dec38150617684b9f757c787d Auto-Submitted: auto-generated The branch releng/13.3 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=784695750ef3f73dec38150617684b9f757c787d commit 784695750ef3f73dec38150617684b9f757c787d Author: Pawel Jakub Dawidek AuthorDate: 2024-01-17 17:43:55 +0000 Commit: Ed Maste CommitDate: 2024-02-29 13:16:30 +0000 jail: Fix information leak. There is a lack of proper visibility checking in kern.ttys sysctl handler which leads to information leak about processes outside the current jail. This can be demonstrated with pstat -t: when called from within a jail, it will output all terminal devices including process groups and session leader process IDs: jail# pstat -t | grep pts/ | head LINE INQ CAN LIN LOW OUTQ USE LOW COL SESS PGID STATE pts/2 1920 0 0 192 1984 0 199 0 4132 27245 Oi pts/3 1920 0 0 192 1984 0 199 16 24890 33627 Oi pts/5 0 0 0 0 0 0 0 25 17758 0 G pts/16 0 0 0 0 0 0 0 0 52495 0 G pts/15 0 0 0 0 0 0 0 25 53446 0 G pts/17 0 0 0 0 0 0 0 6702 33230 0 G pts/19 0 0 0 0 0 0 0 14 1116 0 G pts/0 0 0 0 0 0 0 0 0 2241 0 G pts/23 0 0 0 0 0 0 0 20 15639 0 G pts/6 0 0 0 0 0 0 0 0 44062 93792 G jail# pstat -t | grep pts/ | wc -l 85 Devfs does the filtering correctly and we get only one entry: jail# ls /dev/pts/ 2 Approved by: mzaborski, secteam MFC after: 1 week Sponsored by: Fudo Security (cherry picked from commit f1d0a0cbecf2c688061f35adea85bfb29c9ec893) (cherry picked from commit a376108029a20f4ce51476d98f2483a7008ce7b5) (cherry picked from commit 41ac0b4ce00bae061164384f23356a4df6e0e695) (cherry picked from commit 9bff7ec98354a76c171905ce9530f85685725ee7) Approved by: re (cperciva) --- sys/kern/tty.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index d7f9a914166a..508c0f14b861 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -44,6 +44,7 @@ #ifdef COMPAT_43TTY #include #endif /* COMPAT_43TTY */ +#include #include #include #include @@ -1308,9 +1309,11 @@ static int sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) { unsigned long lsize; + struct thread *td = curthread; struct xtty *xtlist, *xt; struct tty *tp; - int error; + struct proc *p; + int cansee, error; sx_slock(&tty_list_sx); lsize = tty_list_count * sizeof(struct xtty); @@ -1323,13 +1326,28 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) TAILQ_FOREACH(tp, &tty_list, t_list) { tty_lock(tp); - tty_to_xtty(tp, xt); + if (tp->t_session != NULL) { + p = tp->t_session->s_leader; + PROC_LOCK(p); + cansee = (p_cansee(td, p) == 0); + PROC_UNLOCK(p); + } else { + cansee = !jailed(td->td_ucred); + } + if (cansee) { + tty_to_xtty(tp, xt); + xt++; + } tty_unlock(tp); - xt++; } sx_sunlock(&tty_list_sx); - error = SYSCTL_OUT(req, xtlist, lsize); + lsize = (xt - xtlist) * sizeof(struct xtty); + if (lsize > 0) { + error = SYSCTL_OUT(req, xtlist, lsize); + } else { + error = 0; + } free(xtlist, M_TTY); return (error); } From nobody Thu Feb 29 13:17:47 2024 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 4TlsGM2LZxz5C9dG; Thu, 29 Feb 2024 13:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlsGM19lHz4YvV; Thu, 29 Feb 2024 13:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709212667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gbri9yeVAnZr0JuagjLD6aSlHJRcpyb8r29eg3up1w=; b=UP8yHipFJ76dFGy/vhPDzavCPeE6EWd7jY4hH38osHNo7qFqhRrr81LUzmFrvG3xHz3cN7 i1mOIwVtetpoCAjaw1zT47dU+zlf+gq/ce7/dCkwtWjifwWBmY3xO+1FJOiDhP52kVra+2 i0zAYHjISGlq4fQ2N01h+IkJUVozMhmIsXurJH4Rm0LtN3APGJnI7bwGr9fydAWiCjWpE5 pV1f8Mcm4Vduwsc7xAGJlhKeJkBuKx+LvSCNo6sgUmtGzo/TXNhbloKCQoNgAhOjK/fgil C4VmkQdAh25ZZtxPxHcSuRrYzlns1XoLeJLG/3Cf1V9jz8BIdpD897QW79+Eyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709212667; a=rsa-sha256; cv=none; b=r0UH4wjsOja7b2qUF1JQizXrPlD5o5E3nF1+ukRvxsyw2CKmRk7tqwpHssUnpxjXcRStGy SmBV9be+RMEfGDkVHdwPU5jT2hgo7V68LUlHhstBhU6yUUNBhUUIfNZioM8gfwVtdjoznb 8UJMFNPYutaTQ6nS01dOx3+naLYDg3wi2Sv8I/2CMYcqTQxaEHmzmLMXlOmjjEBqPMD2i+ UoQFGsgsz4nS6uPHKV5LH2nlAO6CbxERpci+lH+4HILWGRkg+i6iOZUb3dlRtiBWSsDOeW XzEjw0Fl1sLKHL77dK1HiD0G6WmkfDPwpYuIkBil2prI5MOgcdV6sm/CxxUViA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709212667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gbri9yeVAnZr0JuagjLD6aSlHJRcpyb8r29eg3up1w=; b=l+x9I8CE7360vYtnmB7MqUjNcek+TcN4ta+1yEbIPXNzicaLZK1Dd8JhlsWSJaIdWCqqgn OJWHrHvOFa2qaU5Q77Enr+Qq3JVuX/YLVBwRBVTkvt8g90nZjJAz8AAzABOz1JYDHNNBPs wmT8P0BD93BacKr8nrYXZSwo6B/eVLDgJ5llobsCSM4lUFNL8MpsmvdVrP74CBDdrlGocD pU8vIsqApJuR6vyq2jR2M6UEkHNAEbpHXfnh/dbDsCR8gJItFYNTUOsFu+aAVsLT1CTdxl hF2M3X8OPvqAuaOIY6DWWPRMVnaBbbHbMFXLcx+PJea0jo/CYyZ4E/Okrg2diA== 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 4TlsGM0n7TzkGc; Thu, 29 Feb 2024 13:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41TDHlaI004455; Thu, 29 Feb 2024 13:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41TDHlle004452; Thu, 29 Feb 2024 13:17:47 GMT (envelope-from git) Date: Thu, 29 Feb 2024 13:17:47 GMT Message-Id: <202402291317.41TDHlle004452@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: 814761540eb9 - releng/13.3 - kern: fix panic with disabled ttys 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 814761540eb9d1e52d6210bf0468d379a9459be9 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=814761540eb9d1e52d6210bf0468d379a9459be9 commit 814761540eb9d1e52d6210bf0468d379a9459be9 Author: Ed Maste AuthorDate: 2024-02-26 15:38:45 +0000 Commit: Ed Maste CommitDate: 2024-02-29 13:16:47 +0000 kern: fix panic with disabled ttys PR: 277240, 277329 Reviewed by: kib (earlier version) Fixes: f1d0a0cbecf2 ("jail: Fix information leak.") MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44086 (cherry picked from commit 975d7730828a8bde28c2a0092b6e95c4c4e22f34) (cherry picked from commit 8d22744f5be165a2a82a2a204789e44bbdc5a2ee) (cherry picked from commit a60220bbb5511469fe53fd4290713ba891f8f48a) Approved by: re (cperciva) --- sys/kern/tty.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 508c0f14b861..8ed59fd166fa 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1313,7 +1313,8 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) struct xtty *xtlist, *xt; struct tty *tp; struct proc *p; - int cansee, error; + int error; + bool cansee; sx_slock(&tty_list_sx); lsize = tty_list_count * sizeof(struct xtty); @@ -1326,8 +1327,8 @@ sysctl_kern_ttys(SYSCTL_HANDLER_ARGS) TAILQ_FOREACH(tp, &tty_list, t_list) { tty_lock(tp); - if (tp->t_session != NULL) { - p = tp->t_session->s_leader; + if (tp->t_session != NULL && + (p = atomic_load_ptr(&tp->t_session->s_leader)) != NULL) { PROC_LOCK(p); cansee = (p_cansee(td, p) == 0); PROC_UNLOCK(p); From nobody Fri Mar 1 04:12:33 2024 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 4TmF6n25XBz5BnZf; Fri, 1 Mar 2024 04:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TmF6n1bXtz4V9V; Fri, 1 Mar 2024 04:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z9Dxar9HL+1eZ3D6X9Sc2/b7ei8mpyk+q+K4JwWpNVg=; b=XMBfduJTMaYVqhHkkYgMXo0j5q1t8myWvub6jFpKZT2kb1MWZ93PSAFzmuqd+hHMysAYGL 2I1yWgWyZYkhBohBCuivmASOG4x9fNKZMrh2YJgzAdHBnGprag4Boa/kGFDDL2O6gd6i0r NX7h9R7GLIivbS100Nx7ZQ4htYeXpf7fL9ofmuenATWjG1KUFgpBR7KwYSg5ICLuF6NbZl gLnZJcG9Iywv2LFgiYovQBcISnMrZY08kmk6spF5LgDAHnxDzimc3Zg8HqyaKZoAeOY8d4 D+k0OTuHUzyoEYrj7Nfhb3YEPLZ4Ggd+XuBc8+gd7T8Xqsnh9daNW5WM3sQQOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709266353; a=rsa-sha256; cv=none; b=usspPG+MnoE+MO7NsD4XAy8ESqpuBW2e4FuobGTEIiH3jk9qlmIjj5LVgeYLTnCyJGy1W6 XMxvuJbsjtwcz11cpBq+UsB6aX7COhkJhJniaIvaBK90zA3B13BKdsoMF6CFRc5VQ6DCwh 00aPaPOSVePwqEv6f4vdelRnVisMAuz5ahka59hKPKcU9ur/hA5qe0aIjexbMJd2ZLZL/Y 1BqsZ5byEY2nNLHJ8IzphskU0NEicjeYsrCN9azoSA9K4Jmq9qewl8SFX94if63VdAWRCD gG/RaMEVxHoKglA5xuOq2bMT0TLh48/JFhPFjaUH1ztdccEg0eR6K07LhKNVmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z9Dxar9HL+1eZ3D6X9Sc2/b7ei8mpyk+q+K4JwWpNVg=; b=ajMDLXUbJFFVnSZ2waW+qNkplCG/UpP1ACSdxXiy4MNwoGlk99FuRRYL9BfilrUbzr6o8e /LNerC+Rmi/24H4p2mk/p9ZDq1bGB6D4OdPl98jkYBnhPHD26wMmzXv+YfAtYlY/MuTr4Z alN9Ra0GKEFwf+p/OGMk6vOhIDpPehsjYlXH46akQIIUDF3WGOiy7/+bCEhza6/rB2GPnl cEZgG49stxL1+Rvn/8UWs5SklqUVmjQ6VTw95UvuXTnYCtgHBse4+9grCOFC5dlcuLoKMd MHKbIbUyGEd0ZotWQfWiivWYhoCOl48IRXR6fmz/INyyp3lLX8CidBW+hnx7VQ== 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 4TmF6n1C2nz19SQ; Fri, 1 Mar 2024 04:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4214CXpN026276; Fri, 1 Mar 2024 04:12:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4214CXE5026273; Fri, 1 Mar 2024 04:12:33 GMT (envelope-from git) Date: Fri, 1 Mar 2024 04:12:33 GMT Message-Id: <202403010412.4214CXE5026273@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: b2c9d403d5a6 - stable/14 - fs/msdosfs fatblock: use ulmin() rather than min() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: b2c9d403d5a6d4a8eaaeff0005e48c6d107dba31 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c9d403d5a6d4a8eaaeff0005e48c6d107dba31 commit b2c9d403d5a6d4a8eaaeff0005e48c6d107dba31 Author: Konstantin Belousov AuthorDate: 2024-02-23 17:30:10 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-01 04:12:02 +0000 fs/msdosfs fatblock: use ulmin() rather than min() PR: 277237 (cherry picked from commit 0085afdceb17cb7d4e41f9073299f688372c6a0f) --- sys/fs/msdosfs/msdosfs_fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c index 4a7faa9e1f05..bfaff417f677 100644 --- a/sys/fs/msdosfs/msdosfs_fat.c +++ b/sys/fs/msdosfs/msdosfs_fat.c @@ -97,7 +97,7 @@ fatblock(struct msdosfsmount *pmp, u_long ofs, u_long *bnp, u_long *sizep, fatblocksec /= 2; } bn = ofs / pmp->pm_fatblocksize * pmp->pm_fatblocksec; - size = roundup(min(fatblocksec, pmp->pm_FATsecs - bn) * DEV_BSIZE, + size = roundup(ulmin(fatblocksec, pmp->pm_FATsecs - bn) * DEV_BSIZE, pmp->pm_BlkPerSec * DEV_BSIZE); bn += pmp->pm_fatblk + pmp->pm_curfat * pmp->pm_FATsecs; From nobody Fri Mar 1 04:12:34 2024 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 4TmF6p4jfQz5BnpK; Fri, 1 Mar 2024 04:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TmF6p272Nz4VMD; Fri, 1 Mar 2024 04:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0w4mWDOluAd4JKecgkV4IQdSoJzG6eECtWJNXbhrCWs=; b=uhn2nMrIWlev+f/T+UXYlodDlM/sj22yH1M0OFPEToy5VMqF9Nh/Ior7phYaVjY2F8lFTy MlRZVFCMSwBRWUlyaNsj/O7xmQuwPflHDD5TFTvbLXs8MMEQSuVOhoxVVqFDMofO2Sd0oL hHsqcHLt9c4RHiWAnXxnyyRNuwTY0yDq73fGxoD+PD3eW1EJdE8WcZTVXO4R/9Ncb1zOBR 5ZVzimG+D5QgskyGZcXALhAUgSmmQBG8e07f3HSuuPwxSptTPTOlb/XPmez4c7/0CpNCwD P1aGCop6qCyxhGG5XbJfS/L6+HCxJ+FzNDWE2X7VcEssfhUqeQtYubOTB32SWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709266354; a=rsa-sha256; cv=none; b=WZzS4D5ZnymuFR9fSPVhV+YZUWvtFEQpeFZxKzJFSvDMp5qEfl6kn3gIklhLTWGCMxiyXZ sit3lTF8vlQr14y5j9dyJb9uH/QzT6T5bwNXFlChB7ZsPH4ruqT93IdQcKZqT/DbQCO+0b PhkaNjUHN9Ah1QCypAYTcKQJAopEUsZ+07argeexUV85mBXkHnYiCXw+bqnwblzEHgNa3+ yEQaq2QEA9yDHFwwxhZqXavKRyyPM1Yzpq1aZm8zeMQqLAbQ0N8O28XNkRFX7C2dssQ/NL 4WsmEc6RVj53b8OKT/6PdG/J+mFXO7dDInZKUahGL3vjd5/ARmd3b9AKFD4BXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0w4mWDOluAd4JKecgkV4IQdSoJzG6eECtWJNXbhrCWs=; b=CjQ7ew30Eg97mhxkW13sj5bSQdq4gbe64l58urM5ktXWKvX/9l/1Mzw2vQHQ0TF1AqahrP ObAwtEmj5gBUrGxt5uceZB1p7CUcYf3xJoAjuSIXQ0ahKU/F/OjI+8kV40pw9ojhXeILVD JAc7/kkhiV6f1XrdOT/momegPxAD3wzRLf6wULi0NVu/SyBLjMZcy3f88+rT5LCcMZQ2ua bTqt3dQmRCEwmqE75RiVfxnPkvG08Bup1Ca479XE4LUXEqk1+1WCu5XxBrE+1k/tyMlPPN WrYyXWPzcdoMhUlXI6wHLGzOKDip5YDtw2lA/40C607BvlIJ3UbomFNKukI92Q== 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 4TmF6p1kg8z1B18; Fri, 1 Mar 2024 04:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4214CYo7026322; Fri, 1 Mar 2024 04:12:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4214CYRA026319; Fri, 1 Mar 2024 04:12:34 GMT (envelope-from git) Date: Fri, 1 Mar 2024 04:12:34 GMT Message-Id: <202403010412.4214CYRA026319@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: e38dee6120d5 - stable/14 - posixmqcontrol(1): manage posix message queues 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: e38dee6120d5a88d7165aaccd8dab2f45068f921 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e38dee6120d5a88d7165aaccd8dab2f45068f921 commit e38dee6120d5a88d7165aaccd8dab2f45068f921 Author: Rick Parrish AuthorDate: 2024-02-22 12:33:12 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-01 04:12:02 +0000 posixmqcontrol(1): manage posix message queues (cherry picked from commit 0112f8c4a88e75342bdb6b9815fa220c5f645aa0) --- usr.bin/Makefile | 1 + usr.bin/posixmqcontrol/Makefile | 4 + usr.bin/posixmqcontrol/posixmqcontrol.1 | 180 +++++ usr.bin/posixmqcontrol/posixmqcontrol.c | 924 +++++++++++++++++++++++ usr.bin/posixmqcontrol/posixmqcontroltest8qs.sh | 50 ++ usr.bin/posixmqcontrol/posixmqcontroltest8x64.sh | 99 +++ usr.bin/posixmqcontrol/posixmqcontroltestsane.sh | 28 + 7 files changed, 1286 insertions(+) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 8e82e773e6b0..4e48c18d5e81 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -111,6 +111,7 @@ SUBDIR= alias \ patch \ pathchk \ perror \ + posixmqcontrol \ posixshmcontrol \ pr \ printenv \ diff --git a/usr.bin/posixmqcontrol/Makefile b/usr.bin/posixmqcontrol/Makefile new file mode 100644 index 000000000000..3cbfa8557625 --- /dev/null +++ b/usr.bin/posixmqcontrol/Makefile @@ -0,0 +1,4 @@ +PROG= posixmqcontrol +LIBADD= rt + +.include diff --git a/usr.bin/posixmqcontrol/posixmqcontrol.1 b/usr.bin/posixmqcontrol/posixmqcontrol.1 new file mode 100644 index 000000000000..ec60230aac6e --- /dev/null +++ b/usr.bin/posixmqcontrol/posixmqcontrol.1 @@ -0,0 +1,180 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024 Rick Parrish . +.\" +.\" 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 AUTHORS 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 AUTHORS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd February 19, 2024 +.Dt POSIXMQCONTROL 1 +.Os +.Sh NAME +.Nm posixmqcontrol +.Nd Control POSIX mqueuefs message queues +.Sh SYNOPSIS +.Nm +.Ar create +.Fl q Ar queue +.Fl s Ar size +.Fl d Ar depth +.Op Fl m Ar mode +.Op Fl g Ar group +.Op Fl u Ar user +.Nm +.Ar info +.Fl q Ar queue +.Nm +.Ar recv +.Fl q Ar queue +.Nm +.Ar rm +.Fl q Ar queue +.Nm +.Ar send +.Fl q Ar queue +.Fl c Ar content +.Op Fl p Ar priority +.Sh DESCRIPTION +The +.Nm +command allows separating POSIX message queue administration from application +stack. +Defining and adjusting queue attributes can be done without touching +application code. +It allows creating queues, inspecting queue metadata, altering group and user +access to queues, dumping queue contents, and unlinking queues. +.Pp +Unlinking removes the name from the system and frees underlying memory. +.Pp +The maximum message size, maximum queue size, and current queue size are +displayed by the +.Ic info +subcommand. This output is similar to running +.Ic cat +on a mqueuefs queue mounted under a mount point. +This utility requires the +.Ic mqueuefs +kernel module to be loaded but does not require +.Ic mqueuefs +to be mounted as a file system. +.Pp +The following subcommands are provided: +.Bl -tag -width truncate +.It Ic create +Create the named queues, if they do not already exist. +More than one queue name may be created. The same maximum queue depth and +maximum message size are used to create all queues. +If a queue exists, then depth and size are optional. +.Pp +The required +.Ar size +and +.Ar depth +arguments specify the maximum message size (bytes per message) and maximum queue +size (depth or number of messages in the queue). +The optional numerical +.Ar mode +argument specifies the initial access mode. +If the queue exists but does not match the requested size and depth, this +utility will attempt to recreate the queue by first unlinking and then creating +it. +This will fail if the queue is not empty or is opened by other processes. +.It Ic rm +Unlink the queues specified - one attempt per queue. +Failure to unlink one queue does not stop this sub-command from attempting to +unlink the others. +.It Ic info +For each named queue, dispay the maximum message size, maximum queue size, +current queue depth, user owner id, group owner id, and mode permission bits. +.It Ic recv +Wait for a message from a single named queue and display the message to +standard output. +.It Ic send +Send messages to one or more named queues. +If multiple messages and multiple queues are specified, the utility attempts to +send all messages to all queues. +The optional -p priority, if omitted, defaults to MQ_PRIO_MAX / 2 or medium +priority. +.El +.Sh NOTES +A change of queue geometry (maximum message size and/or maximum number of +messages) requires destroying and re-creating the queue. +As a safety feature, +the create subcommand refuses to destroy a non-empty queue. +If you use the rm subcommand to destroy a queue, any queued messages are lost. +To avoid down-time when altering queue attributes, consider creating a new +queue and configure reading applications to drain both new and old queues. +Retire the old queue once all writers have been updated to write to the new +queue. +.Sh EXIT STATUS +.Ex -std +.Bl -bullet +.It +EX_NOTAVAILABLE usually means the mqueuefs kernel module is not loaded. +.It +EX_USAGE reports one or more incorrect parameters. +.El +.Sh EXAMPLES +.Bl -bullet +.It +To retrieve the current message from a named queue, +.Pa /1 , +use the command +.Dl "posixmqcontrol recv -q /1" +.It +To create a queue with the name +.Pa /2 +with maximum message size 100 and maximum queue depth 10, +use the command +.Dl "posixmqcontrol create -q /2 -s 100 -d 10" +.It +To send a message to a queue with the name +.Pa /3 +use the command +.Dl "posixmqcontrol send -q /3 -c 'some choice words.'" +.It +To examine attributes of a queue named +.Pa /4 +use the command +.Dl "posixmqcontrol info -q /4" +.El +.Sh SEE ALSO +.Xr mq_open 2 , +.Xr mq_getattr 2 , +.Xr mq_receive 2 , +.Xr mq_send 2 , +.Xr mq_setattr 2 , +.Xr mq_unlink 2 , +.Xr mqueuefs 5 +.Sh BUGS +mq_timedsend and mq_timedrecv are not implemented. +info reports a worst-case estimate for QSIZE. +.Sh HISTORY +The +.Nm +command appeared in +.Fx 15.0 . +.Sh AUTHORS +The +.Nm +command and this manual page were written by +.An Rick Parrish Aq Mt unitrunker@unitrunker.net. diff --git a/usr.bin/posixmqcontrol/posixmqcontrol.c b/usr.bin/posixmqcontrol/posixmqcontrol.c new file mode 100644 index 000000000000..c965b41a1dfb --- /dev/null +++ b/usr.bin/posixmqcontrol/posixmqcontrol.c @@ -0,0 +1,924 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Rick Parrish . + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct Creation { + /* true if the queue exists. */ + bool exists; + /* true if a mode value was specified. */ + bool set_mode; + /* access mode with rwx permission bits. */ + mode_t mode; + /* maximum queue depth. default to an invalid depth. */ + long depth; + /* maximum message size. default to an invalid size. */ + long size; + /* true for blocking I/O and false for non-blocking I/O. */ + bool block; + /* true if a group ID was specified. */ + bool set_group; + /* group ID. */ + gid_t group; + /* true if a user ID was specified. */ + bool set_user; + /* user ID. */ + uid_t user; +}; + +struct element { + STAILQ_ENTRY(element) links; + const char *text; +}; + +static struct element * +malloc_element(const char *context) +{ + struct element *item = malloc(sizeof(struct element)); + + if (item == NULL) + /* the only non-EX_* prefixed exit code. */ + err(1, "malloc(%s)", context); + return (item); +} + +static STAILQ_HEAD(tqh, element) + queues = STAILQ_HEAD_INITIALIZER(queues), + contents = STAILQ_HEAD_INITIALIZER(contents); +/* send defaults to medium priority. */ +static long priority = MQ_PRIO_MAX / 2; +static struct Creation creation = { + .exists = false, + .set_mode = false, + .mode = 0755, + .depth = -1, + .size = -1, + .block = true, + .set_group = false, + .group = 0, + .set_user = false, + .user = 0 +}; +static const mqd_t fail = (mqd_t)-1; +static const mode_t accepted_mode_bits = + S_IRWXU | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISTXT; + +/* OPTIONS parsing utilitarian */ + +static void +parse_long(const char *text, long *capture, const char *knob, const char *name) +{ + char *cursor = NULL; + long value = strtol(text, &cursor, 10); + + if (cursor > text && *cursor == 0) { + *capture = value; + } else { + warnx("%s %s invalid format [%s].", knob, name, text); + } +} + +static void +parse_unsigned(const char *text, bool *set, + unsigned *capture, const char *knob, const char *name) +{ + char *cursor = NULL; + unsigned value = strtoul(text, &cursor, 8); + + if (cursor > text && *cursor == 0) { + *set = true; + *capture = value; + } else { + warnx("%s %s format [%s] ignored.", knob, name, text); + } +} + +static bool +sane_queue(const char *queue) +{ + int size = 0; + + if (queue[size] != '/') { + warnx("queue name [%-.*s] must start with '/'.", NAME_MAX, queue); + return (false); + } + + for (size++; queue[size] != 0 && size < NAME_MAX; size++) { + if (queue[size] == '/') { + warnx("queue name [%-.*s] - only one '/' permitted.", + NAME_MAX, queue); + return (false); + } + } + + if (size == NAME_MAX && queue[size] != 0) { + warnx("queue name [%-.*s...] may not be longer than %d.", + NAME_MAX, queue, NAME_MAX); + return (false); + } + return (true); +} + +/* OPTIONS parsers */ + +static void +parse_block(const char *text) +{ + if (strcmp(text, "true") == 0 || strcmp(text, "yes") == 0) { + creation.block = true; + } else if (strcmp(text, "false") == 0 || strcmp(text, "no") == 0) { + creation.block = false; + } else { + char *cursor = NULL; + long value = strtol(text, &cursor, 10); + if (cursor > text) { + creation.block = value != 0; + } else { + warnx("bad -b block format [%s] ignored.", text); + } + } +} + +static void +parse_content(const char *content) +{ + struct element *n1 = malloc_element("content"); + + n1->text = content; + STAILQ_INSERT_TAIL(&contents, n1, links); +} + +static void +parse_depth(const char *text) +{ + parse_long(text, &creation.depth, "-d", "depth"); +} + +static void +parse_group(const char *text) +{ + struct group *entry = getgrnam(text); + + if (entry == NULL) { + parse_unsigned(text, &creation.set_group, + &creation.group, "-g", "group"); + } else { + creation.set_group = true; + creation.group = entry->gr_gid; + } +} + +static void +parse_mode(const char *text) +{ + char *cursor = NULL; + long value = strtol(text, &cursor, 8); + + // verify only accepted mode bits are set. + if (cursor > text && *cursor == 0 && (value & accepted_mode_bits) == value) { + creation.set_mode = true; + creation.mode = (mode_t)value; + } else { + warnx("impossible -m mode value [%s] ignored.", text); + } +} + +static void +parse_priority(const char *text) +{ + char *cursor = NULL; + long value = strtol(text, &cursor, 10); + + if (cursor > text && *cursor == 0) { + if (value >= 0 && value < MQ_PRIO_MAX) { + priority = value; + } else { + warnx("bad -p priority range [%s] ignored.", text); + } + } else { + warnx("bad -p priority format [%s] ignored.", text); + } +} + +static void +parse_queue(const char *queue) +{ + if (sane_queue(queue)) { + struct element *n1 = malloc_element("queue name"); + + n1->text = queue; + STAILQ_INSERT_TAIL(&queues, n1, links); + } +} + +static void +parse_single_queue(const char *queue) +{ + if (sane_queue(queue)) { + if (STAILQ_EMPTY(&queues)) { + struct element *n1 = malloc_element("queue name"); + + n1->text = queue; + STAILQ_INSERT_TAIL(&queues, n1, links); + } else + warnx("ignoring extra -q queue [%s].", queue); + } +} + +static void +parse_size(const char *text) +{ + parse_long(text, &creation.size, "-s", "size"); +} + +static void +parse_user(const char *text) +{ + struct passwd *entry = getpwnam(text); + if (entry == NULL) { + parse_unsigned(text, &creation.set_user, + &creation.user, "-u", "user"); + } else { + creation.set_user = true; + creation.user = entry->pw_uid; + } +} + +/* OPTIONS validators */ + +static bool +validate_always_true(void) +{ + return (true); +} + +static bool +validate_content(void) +{ + bool valid = !STAILQ_EMPTY(&contents); + + if (!valid) + warnx("no content to send."); + return (valid); +} + +static bool +validate_depth(void) +{ + bool valid = creation.exists || creation.depth > 0; + + if (!valid) + warnx("-d maximum queue depth not provided."); + return (valid); +} + +static bool +validate_queue(void) +{ + bool valid = !STAILQ_EMPTY(&queues); + + if (!valid) + warnx("missing -q, or no sane queue name given."); + return (valid); +} + +static bool +validate_single_queue(void) +{ + bool valid = !STAILQ_EMPTY(&queues) && + STAILQ_NEXT(STAILQ_FIRST(&queues), links) == NULL; + + if (!valid) + warnx("expected one queue."); + return (valid); +} + +static bool +validate_size(void) +{ + bool valid = creation.exists || creation.size > 0; + + if (!valid) + warnx("-s maximum message size not provided."); + return (valid); +} + +/* OPTIONS table handling. */ + +struct Option { + /* points to array of string pointers terminated by a null pointer. */ + const char **pattern; + /* parse argument. */ + void (*parse)(const char *); + /* + * displays an error and returns false if this parameter is not valid. + * returns true otherwise. + */ + bool (*validate)(void); +}; + +/* + * parse options by table. + * index - current index into argv list. + * argc, argv - command line parameters. + * options - null terminated list of pointers to options. + */ +static void +parse_options(int index, int argc, + const char *argv[], const struct Option **options) +{ + while ((index + 1) < argc) { + const struct Option **cursor = options; + bool match = false; + while (*cursor != NULL && !match) { + const struct Option *option = cursor[0]; + const char **pattern = option->pattern; + + while (*pattern != NULL && !match) { + const char *knob = *pattern; + + match = strcmp(knob, argv[index]) == 0; + if (!match) + pattern++; + } + + if (match) { + option->parse(argv[index + 1]); + index += 2; + break; + } + cursor++; + } + + if (!match && index < argc) { + warnx("skipping [%s].", argv[index]); + index++; + } + } + + if (index < argc) { + warnx("skipping [%s].", argv[index]); + } +} + +/* options - null terminated list of pointers to options. */ +static bool +validate_options(const struct Option **options) +{ + bool valid = true; + + while (*options != NULL) { + const struct Option *option = options[0]; + + if (!option->validate()) + valid = false; + options++; + } + return (valid); +} + +/* SUBCOMMANDS */ + +/* + * queue: name of queue to be created. + * q_creation: creation parameters (copied by value). + */ +static int +create(const char *queue, struct Creation q_creation) +{ + int flags = O_RDWR; + struct mq_attr stuff = { + .mq_curmsgs = 0, + .mq_maxmsg = q_creation.depth, + .mq_msgsize = q_creation.size, + .mq_flags = 0 + }; + + if (!q_creation.block) { + flags |= O_NONBLOCK; + stuff.mq_flags |= O_NONBLOCK; + } + + mqd_t handle = mq_open(queue, flags); + q_creation.exists = handle != fail; + if (!q_creation.exists) { + /* + * apply size and depth checks here. + * if queue exists, we can default to existing depth and size. + * but for a new queue, we require that input. + */ + if (validate_size() && validate_depth()) { + /* no need to re-apply mode. */ + q_creation.set_mode = false; + flags |= O_CREAT; + handle = mq_open(queue, flags, q_creation.mode, &stuff); + } + } + + if (handle == fail) { + errno_t what = errno; + + warnc(what, "mq_open(create)"); + return (what); + } + +#ifdef __FreeBSD__ + /* + * undocumented. + * See https://bugs.freebsd.org/bugzilla//show_bug.cgi?id=273230 + */ + int fd = mq_getfd_np(handle); + + if (fd < 0) { + errno_t what = errno; + + warnc(what, "mq_getfd_np(create)"); + mq_close(handle); + return (what); + } + struct stat status = {0}; + int result = fstat(fd, &status); + if (result != 0) { + errno_t what = errno; + + warnc(what, "fstat(create)"); + mq_close(handle); + return (what); + } + + /* do this only if group and / or user given. */ + if (q_creation.set_group || q_creation.set_user) { + q_creation.user = + q_creation.set_user ? q_creation.user : status.st_uid; + q_creation.group = + q_creation.set_group ? q_creation.group : status.st_gid; + result = fchown(fd, q_creation.user, q_creation.group); + if (result != 0) { + errno_t what = errno; + + warnc(what, "fchown(create)"); + mq_close(handle); + return (what); + } + } + + /* do this only if altering mode of an existing queue. */ + if (q_creation.exists && q_creation.set_mode && + q_creation.mode != (status.st_mode & accepted_mode_bits)) { + result = fchmod(fd, q_creation.mode); + if (result != 0) { + errno_t what = errno; + + warnc(what, "fchmod(create)"); + mq_close(handle); + return (what); + } + } +#endif /* __FreeBSD__ */ + + return (mq_close(handle)); +} + +/* queue: name of queue to be removed. */ +static int +rm(const char *queue) +{ + int result = mq_unlink(queue); + + if (result != 0) { + errno_t what = errno; + + warnc(what, "mq_unlink"); + return (what); + } + + return (result); +} + +/* Return the display character for non-zero mode. */ +static char +dual(mode_t mode, char display) +{ + return (mode != 0 ? display : '-'); +} + +/* Select one of four display characters based on mode and modifier. */ +static char +quad(mode_t mode, mode_t modifier) +{ + static const char display[] = "-xSs"; + unsigned index = 0; + if (mode != 0) + index += 1; + if (modifier) + index += 2; + return (display[index]); +} + +/* queue: name of queue to be inspected. */ +static int +info(const char *queue) +{ + mqd_t handle = mq_open(queue, O_RDONLY); + + if (handle == fail) { + errno_t what = errno; + + warnc(what, "mq_open(info)"); + return (what); + } + + struct mq_attr actual; + + int result = mq_getattr(handle, &actual); + if (result != 0) { + errno_t what = errno; + + warnc(what, "mq_getattr(info)"); + return (what); + } + + fprintf(stdout, + "queue: '%s'\nQSIZE: %lu\nMSGSIZE: %ld\nMAXMSG: %ld\n" + "CURMSG: %ld\nflags: %03ld\n", + queue, actual.mq_msgsize * actual.mq_curmsgs, actual.mq_msgsize, + actual.mq_maxmsg, actual.mq_curmsgs, actual.mq_flags); +#ifdef __FreeBSD__ + + int fd = mq_getfd_np(handle); + struct stat status; + + result = fstat(fd, &status); + if (result != 0) { + warn("fstat(info)"); + } else { + mode_t mode = status.st_mode; + + fprintf(stdout, "UID: %u\nGID: %u\n", status.st_uid, status.st_gid); + fprintf(stdout, "MODE: %c%c%c%c%c%c%c%c%c%c\n", + dual(mode & S_ISVTX, 's'), + dual(mode & S_IRUSR, 'r'), + dual(mode & S_IWUSR, 'w'), + quad(mode & S_IXUSR, mode & S_ISUID), + dual(mode & S_IRGRP, 'r'), + dual(mode & S_IWGRP, 'w'), + quad(mode & S_IXGRP, mode & S_ISGID), + dual(mode & S_IROTH, 'r'), + dual(mode & S_IWOTH, 'w'), + dual(mode & S_IXOTH, 'x')); + } +#endif /* __FreeBSD__ */ + + return (mq_close(handle)); +} + +/* queue: name of queue to drain one message. */ +static int +recv(const char *queue) +{ + mqd_t handle = mq_open(queue, O_RDONLY); + + if (handle == fail) { + errno_t what = errno; + + warnc(what, "mq_open(recv)"); + return (what); + } + + struct mq_attr actual; + + int result = mq_getattr(handle, &actual); + + if (result != 0) { + errno_t what = errno; + + warnc(what, "mq_attr(recv)"); + mq_close(handle); + return (what); + } + + char *text = malloc(actual.mq_msgsize + 1); + unsigned q_priority = 0; + + memset(text, 0, actual.mq_msgsize + 1); + result = mq_receive(handle, text, actual.mq_msgsize, &q_priority); + if (result < 0) { + errno_t what = errno; + + warnc(what, "mq_receive"); + mq_close(handle); + return (what); + } + + fprintf(stdout, "[%u]: %-*.*s\n", q_priority, result, result, text); + return (mq_close(handle)); +} + +/* + * queue: name of queue to send one message. + * text: message text. + * q_priority: message priority in range of 0 to 63. + */ +static int +send(const char *queue, const char *text, unsigned q_priority) +{ + mqd_t handle = mq_open(queue, O_WRONLY); + + if (handle == fail) { + errno_t what = errno; + + warnc(what, "mq_open(send)"); + return (what); + } + + struct mq_attr actual; + + int result = mq_getattr(handle, &actual); + + if (result != 0) { + errno_t what = errno; + + warnc(what, "mq_attr(send)"); + mq_close(handle); + return (what); + } + + int size = strlen(text); + + if (size > actual.mq_msgsize) { + warnx("truncating message to %ld characters.\n", actual.mq_msgsize); + size = actual.mq_msgsize; + } + + result = mq_send(handle, text, size, q_priority); + + if (result != 0) { + errno_t what = errno; + + warnc(what, "mq_send"); + mq_close(handle); + return (what); + } + + return (mq_close(handle)); +} + +static void +usage(FILE *file) +{ + fprintf(file, + "usage:\n\tposixmqcontrol [rm|info|recv] -q \n" + "\tposixmqcontrol create -q -s -d " + "[ -m ] [ -b ] [-u ] [ -g ]\n" + "\tposixmqcontrol send -q -c " + "[-p ]\n"); +} + +/* end of SUBCOMMANDS */ + +#define _countof(arg) ((sizeof(arg)) / (sizeof((arg)[0]))) + +/* convert an errno style error code to a sysexits code. */ +static int +grace(int err_number) +{ + static const int xlat[][2] = { + /* generally means the mqueuefs driver is not loaded. */ + {ENOSYS, EX_UNAVAILABLE}, + /* no such queue name. */ + {ENOENT, EX_OSFILE}, + {EIO, EX_IOERR}, + {ENODEV, EX_IOERR}, + {ENOTSUP, EX_TEMPFAIL}, + {EAGAIN, EX_IOERR}, + {EPERM, EX_NOPERM}, + {EACCES, EX_NOPERM}, + {0, EX_OK} + }; + + for (unsigned i = 0; i < _countof(xlat); i++) { + if (xlat[i][0] == err_number) + return (xlat[i][1]); + } + + return (EX_OSERR); +} + +/* OPTIONS tables */ + +/* careful: these 'names' arrays must be terminated by a null pointer. */ +static const char *names_queue[] = {"-q", "--queue", "-t", "--topic", NULL}; +static const struct Option option_queue = { *** 370 LINES SKIPPED *** From nobody Fri Mar 1 04:12:35 2024 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 4TmF6q4TtBz5BnpL; Fri, 1 Mar 2024 04:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TmF6q3FMpz4VXQ; Fri, 1 Mar 2024 04:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ygx9Jcna8nCeg+w00vuYS/V+tSUiSJgyL/T/zLbOIQw=; b=wKlN6FS+iuyqmw5gfOuTgC/Wg0wcnCWmThIB6t/uPpgjm1cTCNmvqVhQQFSmMchhr/MHUH Za88q53H9Iz5GGHBuRIA4wngBr0fcpeURbn0SHoY3BAB3rrlTwDVePLg1eDBEGuIzqaXCs Om7lDSMdbs8tG8sZTiyfW2YfbNehrs0w0+rofEMBLMrOnCxSw0jp8O4KLl/OYQOEvFcXav qfwXz806jaU7UpNTBOCNMoFemoW+AE9xbdVz4rSBsHmHr9VUsG4asWsaBOSjJrv80QvTR9 ACkfgREt6UW3fVtx6ytXRmBTGw/ak1CVfugEu2Ia4iQ4emPJaki8ug8zHhUwkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709266355; a=rsa-sha256; cv=none; b=Uod//3TXDAoEPed7gkkTBNVRl7iCvJtZwsoAjJ0satv6t6vdqIOPdDTgx2DVI7rdMf5Obi 3QYWPredvgTsxu11vp7bGtivLeSwPgHLYL895XPpdP546iRVjmjIhfxNEjR0R/gD7TmTrh gwFqVlB4adA3dARrGR3PZdw+VVxPSAMI3i24K2RkPJj2rH7Y7FSBjjxHrznNxtvr2aVWjs Fnxl4xlmT1yimMRFW/OSSdLYwXy9oBVk31OVFNGIkBws1UW1Ez6RzaN7xDQEnNuTXUkMX+ dZJqhdPxkQ1YDm9V2Gep+WxhciJHwB1CQGMfcrt7Q+eQ0pd0Dbme/IP2VcFxDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ygx9Jcna8nCeg+w00vuYS/V+tSUiSJgyL/T/zLbOIQw=; b=B95nOLA9O0Ri+jxUqdl8FGwnNadpMLLjtD95uOSSpdVyWpBkab/nxASPGAgRaVtayFyB4d b3etOh+zYDHZGKXiJ6NXCPOIxbcuNxgITtJ8s19q7iSWnxQp6N2wCCkVWhTS7HxJrRYINu 0Cug/Ww3XjoWbM0yHkKBsDBy5IgsFtZlqrHPfCIr68eEZOoKGQEJLQvQ9tBu2CuV5+sYZ+ NJcONRQQrwU7jixypXOJf37YJtmA4i93Wi0eDSfsCYdq8sJED6SpcuAcEY6CnhI5K6oYfU m5ZGmvwP7dA/jDf61QzTQfxNzFeAwclG43KHD/d/7K33BawXN6NwfVoONJWA0A== 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 4TmF6q2m2pz19xs; Fri, 1 Mar 2024 04:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4214CZoo026370; Fri, 1 Mar 2024 04:12:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4214CZBj026368; Fri, 1 Mar 2024 04:12:35 GMT (envelope-from git) Date: Fri, 1 Mar 2024 04:12:35 GMT Message-Id: <202403010412.4214CZBj026368@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: acb407522ca7 - stable/14 - sigsys test: correct count of delivered signals 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: acb407522ca7fde1c0b06a05b5905b750b54e4eb Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=acb407522ca7fde1c0b06a05b5905b750b54e4eb commit acb407522ca7fde1c0b06a05b5905b750b54e4eb Author: Konstantin Belousov AuthorDate: 2024-02-25 01:36:27 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-01 04:12:02 +0000 sigsys test: correct count of delivered signals (cherry picked from commit 09dd7240acf1fc50061246013ce318404d70c4e0) --- tests/sys/kern/sigsys.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sys/kern/sigsys.c b/tests/sys/kern/sigsys.c index 8554a646ebc6..14cdcd6a8362 100644 --- a/tests/sys/kern/sigsys.c +++ b/tests/sys/kern/sigsys.c @@ -41,23 +41,23 @@ sigsys_test(int knob) ATF_REQUIRE(syscall(273) == -1); /* reserved */ ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(1 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(1 * knob, sigsys_cnt); ATF_REQUIRE(syscall(440) == -1); /* SYS_kse_switchin */ ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(2 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(2 * knob, sigsys_cnt); /* Hope this is enough for say next two months */ ATF_REQUIRE(syscall(3000000) == -1); ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(3 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(3 * knob, sigsys_cnt); ATF_REQUIRE(syscall(SYS_afs3_syscall) == -1); ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(4 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(4 * knob, sigsys_cnt); } static void From nobody Fri Mar 1 04:13:14 2024 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 4TmF7Z6t4kz5Bnh3; Fri, 1 Mar 2024 04:13: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TmF7Z64qTz4WmY; Fri, 1 Mar 2024 04:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=If2Kwj4yBKRMchXJdrZ8tAOz5prkXuAIduGH2+Slj0A=; b=IAncZY8SBxKL8LtWKbGpfvN4gC+UOBqAd+fKb0aimd/YVD4PB8I1/hfjtxUSY2Eja7v4vk 1o3/hVlZPFu0Pe+5HpK9sZrbiSCc+HsHo/IvImDIMqjNRxX4f0hwHHVrvj0FafyK+iIPDY BOp8cZCgGawZL7GWfNWGwBdM9wUDtpn2Sn7e0sUXcjKkAtrcYpqRch6/ODXmROFjUClKUn +FjlMlLRNZ2mQvr/hblaNJkwM3nKY5Nm9SIJGYnPkTYzd128H3ffDK+j1Se5c8Ap+ZcEF4 kUzDwG9r7vXFp+R0Xo/pu1rl3iQj/p6u/vVKat9fxYwHb6auwxCvPodjkVDsPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709266394; a=rsa-sha256; cv=none; b=ihFZMWILhsGj7VHR4ULw9kgVbEk0XcQo36juAyA6MWNBEDK+g/OaDzizX/YaG7HjebUdvF BHHMZHYbQSv827LIGxfU708rNpzUY4vFOBjOlSLG6vmgtrdvnl0Buw85oEfhaW1SrvWdg4 QHojLABmZigW7CyxvO+ZKXl9swI9tA3Xl45LvvplYcXWBr4G9DD1/PsfhMyejGDkyeBApf f2X7wISdolT2g+PzteUm1QXDVe5aqlR/zZnk8TlHGaqC7oDEpUnBbk/I15PEFz/neYIcnP aEIH2MDkJPWI6SxXsCzeJ4RT/S1rVWDC1wHzPC7PCNYscbEBjAQ68SSvbZa/dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=If2Kwj4yBKRMchXJdrZ8tAOz5prkXuAIduGH2+Slj0A=; b=XJF6EUFvOCsjTeXejCeV0ErHA7nxUY7n2VzZJjhAlhWJ6Yt73Gud0et3/PJ60dbqd/vgvw mt43fXDMwq/9A0miIxP4sD3K7ML61RQZR7rVRR/BNDs0oZwwUbU6ustvxWwmWd/NqUaH8v 5oqiQ8y1Pj/mPcchVKF/IbHhRBwjPg0w3t7X41VK3sm7NrCzw3+eGpplKcwWwb1BRWgZFG 3WfgkYDcwn8exuQZRPafZsUjFkv0Mwku1/Mre0Pfh2M78J7Pg+C63GWMCHCNBH7md/OLu2 Mz+opXauOSMUF1YpVWpp1UHHkLLmwPoL20IimH19L64qS9wE+T6MyviBCB+DmA== 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 4TmF7Z5hJcz19P1; Fri, 1 Mar 2024 04:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4214DEkR026620; Fri, 1 Mar 2024 04:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4214DExp026617; Fri, 1 Mar 2024 04:13:14 GMT (envelope-from git) Date: Fri, 1 Mar 2024 04:13:14 GMT Message-Id: <202403010413.4214DExp026617@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: 846bf43ca4a2 - stable/13 - fs/msdosfs fatblock: use ulmin() rather than min() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 846bf43ca4a2b42f2751df935de6d3257c6169ae Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=846bf43ca4a2b42f2751df935de6d3257c6169ae commit 846bf43ca4a2b42f2751df935de6d3257c6169ae Author: Konstantin Belousov AuthorDate: 2024-02-23 17:30:10 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-01 04:12:45 +0000 fs/msdosfs fatblock: use ulmin() rather than min() PR: 277237 (cherry picked from commit 0085afdceb17cb7d4e41f9073299f688372c6a0f) --- sys/fs/msdosfs/msdosfs_fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c index 4a7faa9e1f05..bfaff417f677 100644 --- a/sys/fs/msdosfs/msdosfs_fat.c +++ b/sys/fs/msdosfs/msdosfs_fat.c @@ -97,7 +97,7 @@ fatblock(struct msdosfsmount *pmp, u_long ofs, u_long *bnp, u_long *sizep, fatblocksec /= 2; } bn = ofs / pmp->pm_fatblocksize * pmp->pm_fatblocksec; - size = roundup(min(fatblocksec, pmp->pm_FATsecs - bn) * DEV_BSIZE, + size = roundup(ulmin(fatblocksec, pmp->pm_FATsecs - bn) * DEV_BSIZE, pmp->pm_BlkPerSec * DEV_BSIZE); bn += pmp->pm_fatblk + pmp->pm_curfat * pmp->pm_FATsecs; From nobody Fri Mar 1 04:13:15 2024 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 4TmF7c0Y2nz5Bn63; Fri, 1 Mar 2024 04: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TmF7b73l7z4WlY; Fri, 1 Mar 2024 04:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i5GgWJJAHAnNSTL9T2sOKmLbitqa8/JJ2UCkk3ZedgA=; b=KWp3J8F46l76RE+gEtfSqKV2nB+v39Hbg+rosnazSe//KCFTn3lN1hXP5rLBg7N+iP4zvW LEuX5fBQgA992B922x1y9RIF2Y8Kl+Adct4c4ubDkcIiytNGWD0PlZZYvC66gQOVAFwcR2 eWJuszTOePcfO2bwz/58Eflds+HN56c5BeTkRzmZyrSqnxeVYQ2B26qZWSOid3lj89VAmH 8bv8uxNsyg6oL6QoF4vrf0JIM9CvYdsGcz0Mn5VIsxnbWHQHsocDpUdGvx6t5veXQo03GX aBdi1Khm/4bEidIFMa9C8t0Lzfk/rwVav9Jk4d2spwgwN0rxQwq25MNbMoVIoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709266396; a=rsa-sha256; cv=none; b=h8ZJHeGos/kPtGe3MhUXKfTOEkgNDBtwjDLt59CQ6xyzuBKX/mTsgPk8bNF7OFJD7bO0Im aWcKs9j6Q2MLRv/qYCWDt4ndDTFtmKlbjIpl0UOaum75KHirqBvBdg8vQWxRVzJJY6VjUL 7jPdwVG3TEJ82SpAu1233SElWiFH1ix0QJXWJL9Yr2RBc8+qdYqNmFHSjk7LCmprPsPdEn 0v3nSIvVxlIDxGXGv4G3P5I2jV1Eh56jk90b8Hz+itfu1GCRm/Xaw91y2A3UKocUDLAkpZ ydmBSXMNXaHnn8ZyGOlE3+gLnHqpP9E3yF+SHIdtNujMAHwkvrjPE7LeVHUjnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i5GgWJJAHAnNSTL9T2sOKmLbitqa8/JJ2UCkk3ZedgA=; b=AemvfnPNSvepZiTAFWR66gtjBrpONQQCVuHwMkVq2E3EagH+v7PXzATUIvMgmq7pgJc30A EUeBvjkqfKUZyL23cdrNkRHHD3oeh5OEExrB5v5M8c4zQrVDDt6OlSTi19ORwXe+sNAK2c 7aS9ByGfX0867qfsBktM97K4X6lNP9eYWZ5gJOF5mXqNCoXIMfKegN8x5gQQwI0vVx51vz C8jbQuX5ShX0lTN1K6G1E8+uNaU4dbDno6iZD4awCs9uQENaJF+HIQMxClsK5tvyophGLD SvDhKI+7IvUKqI94Jt4gXWb12fX7JcCMpKDw3plawN7qFgfNhoDYGg7hKITKRg== 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 4TmF7b6g7rz1B19; Fri, 1 Mar 2024 04:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4214DFb7026674; Fri, 1 Mar 2024 04:13:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4214DF7B026671; Fri, 1 Mar 2024 04:13:15 GMT (envelope-from git) Date: Fri, 1 Mar 2024 04:13:15 GMT Message-Id: <202403010413.4214DF7B026671@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: b9880e247b26 - stable/13 - sigsys test: correct count of delivered signals 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: b9880e247b26c84a5800b7cba514a65843d55e2e Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b9880e247b26c84a5800b7cba514a65843d55e2e commit b9880e247b26c84a5800b7cba514a65843d55e2e Author: Konstantin Belousov AuthorDate: 2024-02-25 01:36:27 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-01 04:12:46 +0000 sigsys test: correct count of delivered signals (cherry picked from commit 09dd7240acf1fc50061246013ce318404d70c4e0) --- tests/sys/kern/sigsys.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sys/kern/sigsys.c b/tests/sys/kern/sigsys.c index 8554a646ebc6..14cdcd6a8362 100644 --- a/tests/sys/kern/sigsys.c +++ b/tests/sys/kern/sigsys.c @@ -41,23 +41,23 @@ sigsys_test(int knob) ATF_REQUIRE(syscall(273) == -1); /* reserved */ ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(1 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(1 * knob, sigsys_cnt); ATF_REQUIRE(syscall(440) == -1); /* SYS_kse_switchin */ ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(2 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(2 * knob, sigsys_cnt); /* Hope this is enough for say next two months */ ATF_REQUIRE(syscall(3000000) == -1); ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(3 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(3 * knob, sigsys_cnt); ATF_REQUIRE(syscall(SYS_afs3_syscall) == -1); ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(4 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(4 * knob, sigsys_cnt); } static void From nobody Fri Mar 1 14:30:05 2024 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 4TmVqR6vvXz5CTkc; Fri, 1 Mar 2024 14:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TmVqR6fnxz46nk; Fri, 1 Mar 2024 14:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709303411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NyOjC9x4qvB3XAqYNbB2Y9w0Z40hR7WmpTWCDhjX8X0=; b=kPon8cvyZ6o7llvVhrt6OUDcfApkcbPWPQXk7G/biLMbSW+P42lHnQOwQKJiDiP5QamoVR af+kzUhjpxoDe3pLUYeBYJ1TOKzT659oDJQRFJkzbWFFr/lv2eFtHgQgnWs0FZmrH75Og4 azspWhdFUIiui60h7qkTSD0cfPPjNW8vX6WN3S314XqUieYIAEYBmdzgYevkn2sjJlYazk 8lhgFWbQZ7DpBE94qBuR7WVVKZ6HbcYbZRMv5ZbKHPXgtjgQCt03L+r1Z/axnQnGAbHbM6 JGyw6j0Okfr9686q329bFd5XqZw7FkL7NcLcD5I1P8oG+1qWqR9owoq8Pa27BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709303411; a=rsa-sha256; cv=none; b=uwAos3IMMxEo7KoXwzlPr8LBc5zPBW7WmEXYIOG8HoLja667A4h5pRYO8b1WKPweSXD9ev 6VGt7KMQ2CnwmD6S9DXUak2mCId53lcA+Ut+yP9nmKQTlfTgi7/Vk1fFPD6oCTL7C5zyAP mN8u7K/AtGpC3EwUL2+NGfG3Ps0LOWgspaTCXnnc1Axa7uVf9hed5hrPopMmeQVpAWfqw2 qWvuWVdsM9QY5Jezrsh+zat7URsFpvOO6HCwpdcE/nJhb4Z1Xkl4xehmVG4Tcrtt3py0uZ xyu2EP/qQiKJhKAkx8IK+CLx0yD9r9qKPhwGQFHGB3Xm+HclvFh4bP5aIdlp/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709303411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NyOjC9x4qvB3XAqYNbB2Y9w0Z40hR7WmpTWCDhjX8X0=; b=Hih4HfLAUNqfitFEU1YcT5AaW1ditk9GD2812pcBY6gi8NIWR48KXlMXDdmzxr7CH8SQLq 7p9nbBcGuPw6+umVxJzOKUtM+4lYG1zdHTJnPd3vLE/PAo0tDYF29RfmVYfK11CMkzcjAN ACxRvFd5A1n0XOYVRtDJuyWocDjZ1D8dIKOAsElTUzr1737pJhlYaDh2iw7zbbucD54Qb6 ompAMxfMi1B1FNRAO0LS823DrCmE0w8h3HjmaoihYSseo0IP//1obKhT5LLkd2L041i2k0 UEtxabeM7k7e8scrECA7DNxxL/ZX5wNHDXDeZXomjN7QY8y1rbGiUP4uoY1aIA== 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 4TmVqR6Fd8zTMZ; Fri, 1 Mar 2024 14:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 421EUBiG061804; Fri, 1 Mar 2024 14:30:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 421EU5se059501; Fri, 1 Mar 2024 14:30:05 GMT (envelope-from git) Date: Fri, 1 Mar 2024 14:30:05 GMT Message-Id: <202403011430.421EU5se059501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: b9c2c366db1b - stable/13 - zfs: merge openzfs/zfs@fb6d53206 (zfs-2.1-release) into stable/13 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: b9c2c366db1beb2ed276947056f45938ad8f57ec Auto-Submitted: auto-generated The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c2c366db1beb2ed276947056f45938ad8f57ec commit b9c2c366db1beb2ed276947056f45938ad8f57ec Merge: b9880e247b26 fb6d532066f2 Author: Martin Matuska AuthorDate: 2024-03-01 13:57:40 +0000 Commit: Martin Matuska CommitDate: 2024-03-01 14:16:06 +0000 zfs: merge openzfs/zfs@fb6d53206 (zfs-2.1-release) into stable/13 Notable upstream pull request merges: #13976 3ad882658 Avoid calling rw_destroy() on uninitialized rwlock #15243 11574a793 Add zfs_prepare_disk script for disk firmware install #15331 e1bc32f71 Report ashift of L2ARC devices in zdb #15675 12a031a3f spa: make read/write queues configurable #15719 b4481996b spa: Fix FreeBSD sysctl handlers #15719 8e5298f0a spa: Let spa_taskq_param_get()'s addition of a newline be optional #15769 dfece78a4 Add 'zpool status -e' flag to see unhealthy vdevs #15847 d1ee3d611 LUA: Backport CVE-2020-24370's patch Obtained from: OpenZFS OpenZFS commit: fb6d532066f23458f768a97ae94b158c42cbe484 OpenZFS tag: zfs-2.1.15 cddl/lib/libzfs/Makefile | 2 +- cddl/usr.libexec/Makefile | 4 +- cddl/usr.libexec/zfs_prepare_disk/Makefile | 19 + sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 2 +- sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 47 +- .../openzfs/cmd/zed/zed.d/statechange-slot_off.sh | 6 +- sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 2 +- sys/contrib/openzfs/cmd/zed/zed_event.c | 31 ++ sys/contrib/openzfs/cmd/zfs/zfs_main.c | 2 +- .../openzfs/cmd/zpool/os/freebsd/zpool_vdev_os.c | 21 + .../openzfs/cmd/zpool/os/linux/zpool_vdev_os.c | 255 +++++++++ sys/contrib/openzfs/cmd/zpool/zpool.d/ses | 12 +- sys/contrib/openzfs/cmd/zpool/zpool_iter.c | 40 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 301 +++++++++-- sys/contrib/openzfs/cmd/zpool/zpool_util.h | 7 + sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 47 +- sys/contrib/openzfs/config/Rules.am | 1 + .../openzfs/config/always-compiler-options.m4 | 56 ++ sys/contrib/openzfs/config/kernel-acl.m4 | 14 +- sys/contrib/openzfs/config/kernel-automount.m4 | 2 +- sys/contrib/openzfs/config/kernel-bio.m4 | 2 +- sys/contrib/openzfs/config/kernel-blkdev.m4 | 56 +- .../config/kernel-block-device-operations.m4 | 8 +- .../openzfs/config/kernel-commit-metadata.m4 | 2 +- sys/contrib/openzfs/config/kernel-current-time.m4 | 5 +- .../openzfs/config/kernel-dentry-operations.m4 | 2 +- sys/contrib/openzfs/config/kernel-dirty-inode.m4 | 2 +- .../openzfs/config/kernel-encode-fh-inode.m4 | 2 +- sys/contrib/openzfs/config/kernel-evict-inode.m4 | 2 +- sys/contrib/openzfs/config/kernel-fallocate.m4 | 2 +- sys/contrib/openzfs/config/kernel-fpu.m4 | 39 +- sys/contrib/openzfs/config/kernel-fsync-bdev.m4 | 36 ++ sys/contrib/openzfs/config/kernel-fsync.m4 | 4 +- .../openzfs/config/kernel-generic_fillattr.m4 | 39 +- sys/contrib/openzfs/config/kernel-get-link.m4 | 8 +- sys/contrib/openzfs/config/kernel-inode-create.m4 | 6 +- sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 8 +- sys/contrib/openzfs/config/kernel-inode-lookup.m4 | 2 +- sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 6 +- sys/contrib/openzfs/config/kernel-inode-times.m4 | 121 +++++ .../openzfs/config/kernel-make-request-fn.m4 | 8 +- sys/contrib/openzfs/config/kernel-mkdir.m4 | 6 +- sys/contrib/openzfs/config/kernel-mknod.m4 | 4 +- .../openzfs/config/kernel-proc-operations.m4 | 10 +- sys/contrib/openzfs/config/kernel-put-link.m4 | 4 +- sys/contrib/openzfs/config/kernel-rename.m4 | 6 +- sys/contrib/openzfs/config/kernel-show-options.m4 | 2 +- sys/contrib/openzfs/config/kernel-shrink.m4 | 96 +++- sys/contrib/openzfs/config/kernel-strlcpy.m4 | 47 ++ sys/contrib/openzfs/config/kernel-symlink.m4 | 4 +- sys/contrib/openzfs/config/kernel-timer.m4 | 4 +- sys/contrib/openzfs/config/kernel-tmpfile.m4 | 8 +- sys/contrib/openzfs/config/kernel-vfs-direct_IO.m4 | 8 +- sys/contrib/openzfs/config/kernel-vfs-iterate.m4 | 6 +- .../openzfs/config/kernel-vfs-rw-iterate.m4 | 4 +- sys/contrib/openzfs/config/kernel-writepage_t.m4 | 2 +- sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 24 +- sys/contrib/openzfs/config/kernel.m4 | 6 + sys/contrib/openzfs/config/zfs-build.m4 | 2 + sys/contrib/openzfs/include/libzfs.h | 11 + sys/contrib/openzfs/include/libzutil.h | 59 +++ .../openzfs/include/os/freebsd/spl/sys/mod_os.h | 6 + .../openzfs/include/os/freebsd/spl/sys/vnode.h | 4 + .../include/os/linux/kernel/linux/simd_aarch64.h | 6 + .../include/os/linux/kernel/linux/vfs_compat.h | 6 + .../openzfs/include/os/linux/spl/sys/Makefile.am | 1 + .../openzfs/include/os/linux/spl/sys/kmem_cache.h | 2 +- .../openzfs/include/os/linux/spl/sys/shrinker.h | 66 +-- .../openzfs/include/os/linux/spl/sys/string.h | 50 ++ .../include/os/linux/zfs/sys/zfs_vnops_os.h | 5 + sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 31 ++ sys/contrib/openzfs/include/sys/vdev_raidz_impl.h | 4 +- sys/contrib/openzfs/include/sys/zfs_context.h | 1 + sys/contrib/openzfs/lib/libnvpair/libnvpair.abi | 163 +++--- sys/contrib/openzfs/lib/libnvpair/libnvpair.c | 15 + sys/contrib/openzfs/lib/libshare/os/linux/nfs.c | 47 +- sys/contrib/openzfs/lib/libuutil/libuutil.abi | 155 +++--- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 571 +++++++++++---------- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 49 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 64 ++- sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 193 +++++++ .../openzfs/lib/libzfs_core/libzfs_core.abi | 352 +++++++------ .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi | 35 +- .../lib/libzutil/os/freebsd/zutil_import_os.c | 17 + .../lib/libzutil/os/linux/zutil_import_os.c | 55 +- sys/contrib/openzfs/lib/libzutil/zutil_import.c | 98 ++++ sys/contrib/openzfs/lib/libzutil/zutil_pool.c | 31 ++ sys/contrib/openzfs/man/Makefile.am | 3 +- sys/contrib/openzfs/man/man4/zfs.4 | 10 + sys/contrib/openzfs/man/man8/.gitignore | 1 + sys/contrib/openzfs/man/man8/zfs.8 | 2 +- sys/contrib/openzfs/man/man8/zfs_prepare_disk.8.in | 70 +++ sys/contrib/openzfs/man/man8/zpool-clear.8 | 11 + sys/contrib/openzfs/man/man8/zpool-offline.8 | 18 +- sys/contrib/openzfs/man/man8/zpool-status.8 | 6 +- sys/contrib/openzfs/man/man8/zpool.8 | 19 +- sys/contrib/openzfs/module/icp/Makefile.in | 2 + sys/contrib/openzfs/module/lua/ldebug.c | 7 +- sys/contrib/openzfs/module/lua/ldo.c | 3 +- .../openzfs/module/os/linux/spl/Makefile.in | 1 + .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 1 + .../openzfs/module/os/linux/spl/spl-kstat.c | 1 + .../openzfs/module/os/linux/spl/spl-shrinker.c | 115 +++++ .../openzfs/module/os/linux/spl/spl-thread.c | 1 + sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 26 +- sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 11 +- .../openzfs/module/os/linux/zfs/vdev_disk.c | 151 +++--- .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 6 +- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 10 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 41 +- .../openzfs/module/os/linux/zfs/zfs_znode.c | 39 +- .../openzfs/module/os/linux/zfs/zio_crypt.c | 20 +- .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 11 +- .../openzfs/module/os/linux/zfs/zpl_inode.c | 9 +- .../openzfs/module/os/linux/zfs/zpl_xattr.c | 7 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 6 + sys/contrib/openzfs/module/zfs/Makefile.in | 4 + sys/contrib/openzfs/module/zfs/spa.c | 280 +++++++++- sys/contrib/openzfs/module/zfs/vdev_label.c | 10 + sys/contrib/openzfs/rpm/generic/zfs-dkms.spec.in | 91 +++- sys/contrib/openzfs/scripts/Makefile.am | 3 + sys/contrib/openzfs/scripts/zfs_prepare_disk | 17 + sys/contrib/openzfs/tests/runfiles/common.run | 4 +- sys/contrib/openzfs/tests/runfiles/linux.run | 2 +- .../openzfs/tests/zfs-tests/include/libtest.shlib | 18 + .../zfs_load-key/zfs_load-key_common.kshlib | 5 +- .../functional/cli_root/zfs_share/Makefile.am | 1 + .../cli_root/zfs_share/zfs_share_007_neg.ksh | 2 +- .../cli_root/zfs_share/zfs_share_013_pos.ksh | 80 +++ .../zfs_share/zfs_share_concurrent_shares.ksh | 168 +++--- .../functional/cli_root/zpool_status/Makefile.am | 1 + .../cli_root/zpool_status/zpool_status_002_pos.ksh | 4 +- .../cli_root/zpool_status/zpool_status_008_pos.ksh | 104 ++++ .../zfs-tests/tests/functional/cp_files/.gitignore | 3 +- .../tests/functional/cp_files/Makefile.am | 4 +- .../tests/functional/cp_files/cp_stress.ksh | 73 +++ .../tests/functional/cp_files/seekflood.c | 180 +++++++ .../tests/zfs-tests/tests/functional/ctime/ctime.c | 14 +- .../zfs-tests/tests/functional/io/io_uring.ksh | 7 + sys/modules/zfs/zfs_config.h | 63 ++- sys/modules/zfs/zfs_gitrev.h | 2 +- 142 files changed, 4181 insertions(+), 1142 deletions(-) diff --cc cddl/lib/libzfs/Makefile index b33103a0c0c0,000000000000..3ceee1f9aabd mode 100644,000000..100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@@ -1,109 -1,0 +1,109 @@@ + +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare/os/freebsd +.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib + +PACKAGE= zfs +LIB= zfs +LIBADD= \ + avl \ + bsdxml \ + crypto \ + geom \ + m \ + md \ + nvpair \ + pthread \ + umem \ + util \ + uutil \ + z \ + zfs_core \ + zutil + +INCS= libzfs.h +USER_C = \ + libzfs_changelist.c \ + libzfs_config.c \ + libzfs_crypto.c \ + libzfs_dataset.c \ + libzfs_diff.c \ + libzfs_import.c \ + libzfs_iter.c \ + libzfs_mount.c \ + libzfs_pool.c \ + libzfs_sendrecv.c \ + libzfs_status.c \ + libzfs_util.c + +# FreeBSD +USER_C += \ + libzfs_compat.c \ + libzfs_ioctl_compat.c \ + libzfs_zmount.c + +# libshare +USER_C += \ + libshare.c \ + nfs.c \ + smb.c + + +KERNEL_C = \ + algs/sha2/sha2.c \ + cityhash.c \ + zfeature_common.c \ + zfs_comutil.c \ + zfs_deleg.c \ + zfs_fletcher.c \ + zfs_fletcher_superscalar.c \ + zfs_fletcher_superscalar4.c \ + zfs_namecheck.c \ + zfs_prop.c \ + zpool_prop.c \ + zprop_common.c + + +ARCH_C = +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +ARCH_C += zfs_fletcher_intel.c \ + zfs_fletcher_sse.c +CFLAGS += -DHAVE_SSE2 +.endif +.if ${MACHINE_ARCH} == "amd64" +ARCH_C += zfs_fletcher_avx512.c +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F +.endif +.if ${MACHINE_CPUARCH} == "aarch64" +ARCH_C += zfs_fletcher_aarch64_neon.c +.endif + +SRCS= $(USER_C) $(KERNEL_C) $(ARCH_C) + +WARNS?= 2 +SHLIB_MAJOR= 4 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libshare +CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h +CFLAGS+= -DSYSCONFDIR=\"/etc\" +CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\" - ++CFLAGS+= -DZFSEXECDIR=\"${LIBEXECDIR}/zfs\" + +.include diff --cc cddl/usr.libexec/Makefile index b70b4966ffac,000000000000..b47556264d77 mode 100644,000000..100644 --- a/cddl/usr.libexec/Makefile +++ b/cddl/usr.libexec/Makefile @@@ -1,12 -1,0 +1,14 @@@ + +.include + - SUBDIR= ${_zpool_influxdb} ++SUBDIR= ${_zfs_prepare_disk} \ ++ ${_zpool_influxdb} + +.if ${MK_ZFS} != "no" +_zpool_influxdb= zpool_influxdb ++_zfs_prepare_disk= zfs_prepare_disk +.endif + +SUBDIR_PARALLEL= + +.include diff --cc cddl/usr.libexec/zfs_prepare_disk/Makefile index 000000000000,000000000000..0efb4452829d new file mode 100644 --- /dev/null +++ b/cddl/usr.libexec/zfs_prepare_disk/Makefile @@@ -1,0 -1,0 +1,19 @@@ ++ZFSTOP= ${SRCTOP}/sys/contrib/openzfs ++ ++.PATH: ${ZFSTOP}/scripts ++ ++PACKAGE= zfs ++SCRIPTS= zfs_prepare_disk ++SCRIPTSDIR= ${LIBEXECDIR}/zfs ++ ++.PATH: ${ZFSTOP}/man/man8 ++MAN= zfs_prepare_disk.8 ++ ++CLEANFILES+= zfs_prepare_disk.8 ++ ++zfs_prepare_disk.8: zfs_prepare_disk.8.in ++ sed ${MAN_SUB} ${.ALLSRC} >${.TARGET} ++ ++MAN_SUB+= -e 's|@zfsexecdir@|${LIBEXECDIR}/zfs|g' ++ ++.include diff --cc sys/contrib/openzfs/config/kernel-fsync-bdev.m4 index 000000000000,c47e236f705f..c47e236f705f mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-fsync-bdev.m4 +++ b/sys/contrib/openzfs/config/kernel-fsync-bdev.m4 diff --cc sys/contrib/openzfs/config/kernel-strlcpy.m4 index 000000000000,c31cf52d78b0..c31cf52d78b0 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-strlcpy.m4 +++ b/sys/contrib/openzfs/config/kernel-strlcpy.m4 diff --cc sys/contrib/openzfs/include/os/linux/spl/sys/string.h index 000000000000,f44bf23eb326..f44bf23eb326 mode 000000,100644..100644 --- a/sys/contrib/openzfs/include/os/linux/spl/sys/string.h +++ b/sys/contrib/openzfs/include/os/linux/spl/sys/string.h diff --cc sys/contrib/openzfs/man/man8/zfs_prepare_disk.8.in index 000000000000,2a741531e415..2a741531e415 mode 000000,100644..100644 --- a/sys/contrib/openzfs/man/man8/zfs_prepare_disk.8.in +++ b/sys/contrib/openzfs/man/man8/zfs_prepare_disk.8.in diff --cc sys/contrib/openzfs/module/os/linux/spl/spl-shrinker.c index 000000000000,d5c8da471cbb..d5c8da471cbb mode 000000,100644..100644 --- a/sys/contrib/openzfs/module/os/linux/spl/spl-shrinker.c +++ b/sys/contrib/openzfs/module/os/linux/spl/spl-shrinker.c diff --cc sys/contrib/openzfs/scripts/zfs_prepare_disk index 000000000000,02aa9f8a7728..02aa9f8a7728 mode 000000,100755..100755 --- a/sys/contrib/openzfs/scripts/zfs_prepare_disk +++ b/sys/contrib/openzfs/scripts/zfs_prepare_disk diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_013_pos.ksh index 000000000000,150eddac0ebb..150eddac0ebb mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_013_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_013_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_008_pos.ksh index 000000000000,6be2ad5a7410..6be2ad5a7410 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_008_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_008_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cp_files/cp_stress.ksh index 000000000000,43bb8ab572d2..43bb8ab572d2 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cp_files/cp_stress.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cp_files/cp_stress.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cp_files/seekflood.c index 000000000000,02c2c8e6eca5..02c2c8e6eca5 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cp_files/seekflood.c +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cp_files/seekflood.c diff --cc sys/modules/zfs/zfs_config.h index ac4d2c79268f,000000000000..ce274e79c49d mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1082 -1,0 +1,1139 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + ++/* bdev_open_by_path() exists */ ++/* #undef HAVE_BDEV_OPEN_BY_PATH */ ++ ++/* bdev_release() exists */ ++/* #undef HAVE_BDEV_RELEASE */ ++ +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + ++/* Define if compiler supports -Wformat-overflow */ ++/* #undef HAVE_FORMAT_OVERFLOW */ ++ ++/* fsync_bdev() is declared in include/blkdev.h */ ++/* #undef HAVE_FSYNC_BDEV */ ++ +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + ++/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ ++/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ ++ +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #define HAVE_IMPLICIT_FALLTHROUGH 1 */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + ++/* inode_get_atime() exists in linux/fs.h */ ++/* #undef HAVE_INODE_GET_ATIME */ ++ ++/* inode_get_ctime() exists in linux/fs.h */ ++/* #undef HAVE_INODE_GET_CTIME */ ++ ++/* inode_get_mtime() exists in linux/fs.h */ ++/* #undef HAVE_INODE_GET_MTIME */ ++ +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + ++/* inode_set_atime_to_ts() exists in linux/fs.h */ ++/* #undef HAVE_INODE_SET_ATIME_TO_TS */ ++ ++/* inode_set_ctime_to_ts() exists in linux/fs.h */ ++/* #undef HAVE_INODE_SET_CTIME_TO_TS */ ++ +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + ++/* inode_set_mtime_to_ts() exists in linux/fs.h */ ++/* #undef HAVE_INODE_SET_MTIME_TO_TS */ ++ +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* kernel has asm/fpu/xcr.h */ +/* #undef HAVE_KERNEL_FPU_XCR_HEADER */ + +/* kernel fpu and XSAVE internal */ +/* #undef HAVE_KERNEL_FPU_XSAVE_INTERNAL */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + ++/* Define if compiler supports -Winfinite-recursion */ ++/* #undef HAVE_KERNEL_INFINITE_RECURSION */ ++ ++/* kernel has kernel_neon_* functions */ ++/* #undef HAVE_KERNEL_NEON */ ++ +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + ++/* strlcpy() exists */ ++/* #undef HAVE_KERNEL_STRLCPY */ ++ ++/* strscpy() exists */ ++/* #undef HAVE_KERNEL_STRSCPY */ ++ +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ *** 554 LINES SKIPPED *** From nobody Fri Mar 1 14:47:58 2024 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 4TmWCz0YlKz5CWV2; Fri, 1 Mar 2024 14:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TmWCz01sYz49WJ; Fri, 1 Mar 2024 14:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709304479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njFwKbxE0RqSuUDYCrpsAQBpC3Rrk2+5wreOrZsHcfY=; b=hSk4tBO4MwQ9ySBuKRvJ4AS4eZUmkKNUfLHieIA+fsIRTOpNgLRfrJUeiW+eQSoTWtG1Yn Y+XBhjUQvol03eyE2gtaFftQ5y0k6inss4rIOfCAhV0BoUzn/LhGtwOxrbtQnHE3oa8FY8 IS3DtPogIPBYmU8YXbZX+B5Kq0AMzbOPbVBhVVKgL9kOf4zSXNibbTL2GnRMhTvqQD7GFD T0igGnrIFH121L5AlfU4b8ZanKe3EySHlDDfMsnA6p4U91bTXqL+LOBT45T8xiQTpAPZMU W8u9COKKIZeUKGV4EHW9ZM5JKpnIrC6jGjlzM133QjSGdkjZM1j2rFVqVxA6Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709304479; a=rsa-sha256; cv=none; b=IXcJXOqOcTqGXht5R+xYaf0FO2qQfRk6i+vM3ASn8msJhizay+QsrqyLuC5QcjZ9Kx09hP 0kBXpZckdxuWnew8uiyMZP33njZjCHZR0y223zyYd6b/eTWX8MwZ64pjO/OQ8r4Vxdsw3k Ym9/A0XlTvxzf7pTVHqgkHvxXoaK0QTwO1jRqxY6KF8tB3ClRkne+LTCWEMWQ9vJQxz+IN w9R1PRIdJMN3LPHHW4VSNLGqYP4ihIBLisZMwqb3OkWoNS3HZG2MX2WUGBV/bh3ABP980C cfmNuQyW8KG46A43hqiJXcKRVWLGltMII5OgVbJMcpULZmpPJb84wRSB6iQZhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709304479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njFwKbxE0RqSuUDYCrpsAQBpC3Rrk2+5wreOrZsHcfY=; b=h1RNgkPR3e1KpQwy6wMbdXUgknBKecglK+SldneLSeslo14Rm0rH9DwZeSiiYBzvOjSZC+ QV1s7U2a0y0fA3NwsSNOPFwyP/jOY65aMLg8YeRl7xrRc2APcmXCQDGsIkK/qTVQEwk5c0 t3PoiHzyKxtBZ3QzxP249BfmA5bdnx/HEety+1+DUIQMof+Ln2+qN3wzTBwu3Heuq+PVJ5 ZiiGbRxHf4EHB5XcV4K9BIg1O7FXLjA6b0tW4Bvi2pHua5fpSXPOSypN/CFr290WkV08EG VKhc2/yGH47qUnbCNd9sRFctIOvGxnCa0szX8B9CFdLyfbryzMQbnIrii0ipKA== 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 4TmWCy6gsPzVPN; Fri, 1 Mar 2024 14:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 421Elw3K091018; Fri, 1 Mar 2024 14:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 421Elwmf091015; Fri, 1 Mar 2024 14:47:58 GMT (envelope-from git) Date: Fri, 1 Mar 2024 14:47:58 GMT Message-Id: <202403011447.421Elwmf091015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 22f11923c6c8 - stable/14 - mkimg.1: add new PARTITION SPECIFICATION section 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 22f11923c6c8fe1c7dbf32211695f9594aeb4769 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=22f11923c6c8fe1c7dbf32211695f9594aeb4769 commit 22f11923c6c8fe1c7dbf32211695f9594aeb4769 Author: Eugene Grosbein AuthorDate: 2024-02-27 19:53:31 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-01 14:47:33 +0000 mkimg.1: add new PARTITION SPECIFICATION section The specification follows a commentary to the function parse_part() in the source code and the code itself. (cherry picked from commit d1797fb5bbaeb212501a72b916d647fb2e021d50) --- usr.bin/mkimg/mkimg.1 | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1 index a073265c21ba..28ed0ca03ccf 100644 --- a/usr.bin/mkimg/mkimg.1 +++ b/usr.bin/mkimg/mkimg.1 @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 8, 2020 +.Dd February 28, 2024 .Dt MKIMG 1 .Os .Sh NAME @@ -287,6 +287,42 @@ is moved accordingly. This is typically not part of the conversion process. If possible, use an output format specifically for the environment in which the file is intended to be used. +.Sh PARTITION SPECIFICATION +An option +.Fl p +may be used multiple times to specify a list of created partition entries. +A specification that is a single dash indicates an unused partition entry. +Otherwise, a partition specification has the following format: +.Bd -literal -offset indent + ':' +.Ed +.Bl -tag -width indent +.It Cm type +the partition type alias (f.e.: freebsd-swap) +that may be optionally followed by a '/' separator +and a label for partitioning schemes that feature partition labels +(see the +.Sx EXAMPLES +Section below) +.It Cm kind +the interpretation of the contents specification: +.Bl -tag -width indent +.It Cm ':' +contents holds the size of an empty partition, +a number that may be suffixed with one of K, M, G, T, P or E +(either upper or lower case) following the SI power of two convention +(see also +.Xr expand_number 3 ) +.It Cm '=' +contents holds the name of a file to read +.It Cm '-' +contents holds a command to run; the output of which is the contents +of the partition. +Multi-word strings should be quoted according to the shell rules. +.El +.It Cm contents +the specification of a partition's contents +.El .Sh ENVIRONMENT .Bl -tag -width "TMPDIR" -compact .It Ev TMPDIR @@ -358,6 +394,7 @@ In the following example the file system partition is labeled as 'backup': .Dl % mkimg -s gpt -p freebsd-ufs/backup:=file-system.ufs -o gpt.img .Sh SEE ALSO .Xr dd 1 , +.Xr expand_number 3 , .Xr gpart 8 , .Xr makefs 8 , .Xr mdconfig 8 , From nobody Fri Mar 1 14:49:21 2024 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 4TmWFZ2zmtz5CWXg; Fri, 1 Mar 2024 14:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TmWFZ0f27z4CMR; Fri, 1 Mar 2024 14:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709304562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HnnOzPOjGfCGNE1IvOmFlj4aQvJEiu/DTdFyhh5buc=; b=abdy1hp5so8DkhR32OyQ9JPVlToTgQHvsYNRMeYKk6i7/c0wFn1gIWZdqOopQm3qH3trkv SPW/LYxD78O04gQIBNotPeooIRPtd9a9MtjcVuHemTkFIoO7xXP6r8/HdOX4QYeOx5EioP EcJ4VLPsonnrNTQQQdQ6nKgwl4zIAUkuaJcWhqZ2Re5LgGQF+d+dVUimXqFwLQXBRTylOV lyNv1b2Wb8umEN1b7S2fDNtK0f6VOkXIcvHmtqbKHfNclWUB/xjLe0nj9BzV4eSfLr7ss9 /dmwwpYBT1Fi0T/tDEtNh6ZQI5YVz2OwxblIV18jpUghbkkeyhhqGXNcGOaXpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709304562; a=rsa-sha256; cv=none; b=Z75SNz2uw2aQPqccwV70K4T6X/T8ZFWAUooHUuq12HbIGmxnEZvk5p+obHp1K+QwPSinzF 7C619v5+NgMbfhmRG/kIhwolhXQ6hInCK2xnpaQ2jKTRvVIFz9eDTzrvHbuXFRuCp2XMRV TZMvKOfXQFIMOxAc7bonKGRqaYLuamPE1zElYdh/SflDH+czvkQNJcVkHesGsaaPhmUfTg 85ZtFygT37BmHPZobh+r1ac4hYbsqPrYj1cADZXi7KXMaM7F9xRfcuPCFYipkZt6vpvmbq stOK5cSDcLfVLauGkAUs9CmZzs4fYiFqd3zru0CH4DqraR/Fo2o/p9+h1G7AUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709304562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HnnOzPOjGfCGNE1IvOmFlj4aQvJEiu/DTdFyhh5buc=; b=Lumk1qJJG76sn1TxoKp4sPS1vZuiQBr9tqaB+2WUvCmaZfH+LaQzoDDArb7cxfF7yOsrL0 ioRRbMJr8Cd0w5dXRxoFsbSQtehywgzpoLYhotuoUopeekf7Ewhh5mcaXxw66eJvo0iV9K pzVfXkcAE6kAuTIMNdAGU1Vd/RHOuo7O1JKoFXl6/LnGKLNgez0QcCzFsjQhu2Kth787AN HiRNv+t96zFm4/smMk+HOimBVCKZoOYihCbaERhW4Srdp1WpeodwHJw/NYYayRnyU0FI7m UC80XA8HNQ8JoAgTrwTEmoHqM2ng4H1x8N8Zb0uQIN9b8RFZhLmIJfzJZtG9NA== 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 4TmWFZ06NDzVPQ; Fri, 1 Mar 2024 14:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 421EnLg4091593; Fri, 1 Mar 2024 14:49:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 421EnLDG091590; Fri, 1 Mar 2024 14:49:21 GMT (envelope-from git) Date: Fri, 1 Mar 2024 14:49:21 GMT Message-Id: <202403011449.421EnLDG091590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 2a04785cafe5 - stable/13 - mkimg.1: add new PARTITION SPECIFICATION section 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2a04785cafe5c4da6e83e7936ccaae39f0fc20ea Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=2a04785cafe5c4da6e83e7936ccaae39f0fc20ea commit 2a04785cafe5c4da6e83e7936ccaae39f0fc20ea Author: Eugene Grosbein AuthorDate: 2024-02-27 19:53:31 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-01 14:49:05 +0000 mkimg.1: add new PARTITION SPECIFICATION section The specification follows a commentary to the function parse_part() in the source code and the code itself. (cherry picked from commit d1797fb5bbaeb212501a72b916d647fb2e021d50) --- usr.bin/mkimg/mkimg.1 | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1 index a073265c21ba..28ed0ca03ccf 100644 --- a/usr.bin/mkimg/mkimg.1 +++ b/usr.bin/mkimg/mkimg.1 @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 8, 2020 +.Dd February 28, 2024 .Dt MKIMG 1 .Os .Sh NAME @@ -287,6 +287,42 @@ is moved accordingly. This is typically not part of the conversion process. If possible, use an output format specifically for the environment in which the file is intended to be used. +.Sh PARTITION SPECIFICATION +An option +.Fl p +may be used multiple times to specify a list of created partition entries. +A specification that is a single dash indicates an unused partition entry. +Otherwise, a partition specification has the following format: +.Bd -literal -offset indent + ':' +.Ed +.Bl -tag -width indent +.It Cm type +the partition type alias (f.e.: freebsd-swap) +that may be optionally followed by a '/' separator +and a label for partitioning schemes that feature partition labels +(see the +.Sx EXAMPLES +Section below) +.It Cm kind +the interpretation of the contents specification: +.Bl -tag -width indent +.It Cm ':' +contents holds the size of an empty partition, +a number that may be suffixed with one of K, M, G, T, P or E +(either upper or lower case) following the SI power of two convention +(see also +.Xr expand_number 3 ) +.It Cm '=' +contents holds the name of a file to read +.It Cm '-' +contents holds a command to run; the output of which is the contents +of the partition. +Multi-word strings should be quoted according to the shell rules. +.El +.It Cm contents +the specification of a partition's contents +.El .Sh ENVIRONMENT .Bl -tag -width "TMPDIR" -compact .It Ev TMPDIR @@ -358,6 +394,7 @@ In the following example the file system partition is labeled as 'backup': .Dl % mkimg -s gpt -p freebsd-ufs/backup:=file-system.ufs -o gpt.img .Sh SEE ALSO .Xr dd 1 , +.Xr expand_number 3 , .Xr gpart 8 , .Xr makefs 8 , .Xr mdconfig 8 , From nobody Fri Mar 1 19:05:02 2024 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 4Tmcwb0Ydwz5CtFW; Fri, 1 Mar 2024 19:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TmcwZ6scBz4gv2; Fri, 1 Mar 2024 19:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709319903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S9gV+mu5ILi+kJQ69Lt2NWaod+MeqHuaN7oDewAxa30=; b=hFGlYATvKBflBFm4tY57UssXiCSzV9s0OZlXKQDHqMlUI9hDZ+T9VzIY+2ZU1/eECUlq3g 023oS2jSWhSva5tECa6PDBWS/zvUYaj//TrGyEai2I0B3PJ0H7Oukc6ODFlH/6ypJUAyWM /YRNd1Lc96u6Ud7MiHle0pQGLzESNBB8581AJmy9OaV2OLqNpSb/+GAqmaXDpYogtLXEdM wC6ZTutWlfyPzhmfENjGTQDK0alece7H6QA+gbdnQ+utQrUHomrvl79neRWpUghOUWnE/3 Xa+2zZMNZssL3uc5d1xulmqX1ZHXkZkm03sk/QeBB2AYpax4LW6wuldvtRxqng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709319903; a=rsa-sha256; cv=none; b=gcwUZlsxudzCKbufl/zk5qIvOF3khmQ6hsmRXXIbBqkyN072OrUIMcjcM2zBwm60wbKufg 4YwZ/9TnOQiuxbaFFsonDzehLrFdYfahTTwOPNlzBU02MlTvDtLMbXd0V6Ay7ctgTNLX4X z/4pPG1CD+haKdTT2mgvS6cLFGx6CVw7f6vRfVA8RLKjaytNtvz64f3lZV0sYbOw33rJFw Zh48u2PKZXcmtIicm8hcXCA+ZQ8PKsOt4cwkl6MlMQI9BENlWpROaTSN9B15t55MYa4UwY qG1JnpOBdn2zfpb49Ajfguaht88jk6kzkxKqwsx7aH5Ae8OQDlpaZLjyzCfXwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709319903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S9gV+mu5ILi+kJQ69Lt2NWaod+MeqHuaN7oDewAxa30=; b=U7qiiAnnmVgSLCXCdghTISNhVTDDWIGMSZdVFSAi29WMXX+KHcdUX1HmCBgHzZLucnGF/h 651S3Yt/pK8xWxzSK0jzNOTlL+aM9S1gJW64ZdHPeU4SMv2ZNIY4NavgEbLFNUwdwYfzVp WOg/5zUpEqifPETtF3Hft5T9I0cNm1q7WZTWuW9ugaCuvLZ92edRkcwqlHttIce6MNsdjL IMC7BHe90s9UJj/4KUysiUKt70JeR2/IdhVo7DWCj3nWO7vrMzP6GC2dcGRRo7MWVjlrqW 2VXghUKIl2XoMERnGRNuXL1QhN42GHZLf9Cd4K1aKixpU7NZR+ZkWoWiDCweMQ== 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 4TmcwZ6Llwzf2v; Fri, 1 Mar 2024 19:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 421J52RO031597; Fri, 1 Mar 2024 19:05:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 421J52be031594; Fri, 1 Mar 2024 19:05:02 GMT (envelope-from git) Date: Fri, 1 Mar 2024 19:05:02 GMT Message-Id: <202403011905.421J52be031594@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: 80d2b634ddf0 - releng/13.3 - Update in preparation for 13.3-RELEASE 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13.3 X-Git-Reftype: branch X-Git-Commit: 80d2b634ddf0b459910b54a04bc09f5cbc7185a7 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=80d2b634ddf0b459910b54a04bc09f5cbc7185a7 commit 80d2b634ddf0b459910b54a04bc09f5cbc7185a7 Author: Colin Percival AuthorDate: 2024-03-01 19:00:16 +0000 Commit: Colin Percival CommitDate: 2024-03-01 19:00:16 +0000 Update in preparation for 13.3-RELEASE - Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- UPDATING | 3 +++ lib/csu/common/crtbrand.S | 2 +- sys/conf/newvers.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index 931c58a42ada..dd89cda0dec5 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,9 @@ 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. +20240305: + 13.3-RELEASE. + 20240218: Change 9b998db87c28 changed 'struct ieee80211vap' internals in net80211. Given we do not have enough spares and the struct is allocated by diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S index 0ed86bfba2b2..61a1517125fe 100644 --- a/lib/csu/common/crtbrand.S +++ b/lib/csu/common/crtbrand.S @@ -43,7 +43,7 @@ .4byte NT_FREEBSD_ABI_TAG 1: .asciz NOTE_FREEBSD_VENDOR 2: .p2align 2 -3: .4byte __FreeBSD_version +3: .4byte 1303001 4: .section .note.GNU-stack,"",%progbits diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 8bc10ea021bf..2ef43d273cd0 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="13.3" -BRANCH="RC1" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Sun Mar 3 04:00:01 2024 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 4TnSlP2PHgz5Bqv8; Sun, 3 Mar 2024 04:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TnSlP1wxvz40H8; Sun, 3 Mar 2024 04:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709438401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ongd1C/O9sdzgLyyMUFrWghEDqmzrV1GPnOKg2fWCdA=; b=ja4WifvWeD0hoTq10g6TlaQf+4ccidlJ7UKL8cBZkiJfQnFB7tGazkIA2Rkyrme5WI2tmR hzCVrLZw0ttPo+upID+/bApptLrz+4tesGGuRuzBZEFN23e7c/Bio6GRLIQFdLNQ7auXRP Z1B8LnbpuFBcugo3+j+Oz3Rze93LUtzE0cRpWyiT14CiG2dN2kOK+IdWRtOrTuox+XaPyc ujT+DVae3cpdoxjkHmulaOTkC8BDYoxNPhKzyZG5dWoOtjdwZIdn3YRlObkDHxx9UZ96vb 68rALBsL6DKgvvk9vPLG+UZEJWW9mgYvnmtKHyvgO4pv+ZKPSBgkaEWYZ3a4Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709438401; a=rsa-sha256; cv=none; b=JWDglj7VsLHp8ZAFsJxM6yYvz0ryyyCYOvA9lS2Mah9/FwsvYt2Oz/Olgprx0NDSIEE15y skvai/bwpRFc3UEFqXvlPu1pMrrsZx2mwfEUbn5mcL6c1RAzxENbwLAgGoBO7bRrXnrElS CPS7gDBIbziPeiYWpmAdiym6pvExLdXx4wEAe70ZI0MApcXPHOm4i9pLnGRZebDr5tnY2T 8e2vSfU5CWpJuUlLo7H1avao9O160shZxhuXrKwmc4xBoBrBD54X0BpndJp9nHbdXLHefK D3JVtjamkerW5wpCLwZZtybbz+zCEC37X+x+y0HzOgEqiF9p3TgqgD28HZlwSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709438401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ongd1C/O9sdzgLyyMUFrWghEDqmzrV1GPnOKg2fWCdA=; b=WyySwaCU5KsFifBWFk07kLeWLTGdSuv+R5981h6LzLzwbbHawiVsJILydD5K36Gc+jZ/Ad m2KRP2Pk37pUXhW188QwsZPjpAY5qCDlWo+GOXKtEz4lJOwi2VOpRXVGPCuqC0VZiOiXLP xTls/T0YG3ohipWqCGxQfyROePuqNy573Y+bXgvuUJmdEiSjgIcK9Q+sLPucnIDmZB/5vA AreJnACNegX+BF4yJiLsEsUhl2AO5Fk+z/9SznVQWa40GA2ZO1uWiIO4U/n2FGxBbZEScw gA5czD2SAY7nHwjZQ4azBFKZ1CvgKxX2O+dreJ4O+pn521yvXOkpLQpUsrP8mA== 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 4TnSlP1XWhzNJr; Sun, 3 Mar 2024 04:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423401dm069781; Sun, 3 Mar 2024 04:00:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423401Nn069776; Sun, 3 Mar 2024 04:00:01 GMT (envelope-from git) Date: Sun, 3 Mar 2024 04:00:01 GMT Message-Id: <202403030400.423401Nn069776@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: 8a7d5d73b849 - stable/14 - libc/sys: add errno 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 8a7d5d73b8493d2921d3c8ae13746e481bd51d26 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8a7d5d73b8493d2921d3c8ae13746e481bd51d26 commit 8a7d5d73b8493d2921d3c8ae13746e481bd51d26 Author: Konstantin Belousov AuthorDate: 2024-02-24 23:39:02 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-02 05:05:05 +0000 libc/sys: add errno test (cherry picked from commit 32fdcff8703da6f2795193acc77ec3c1fb8b723d) --- lib/libc/tests/sys/Makefile | 1 + lib/libc/tests/sys/errno_test.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/lib/libc/tests/sys/Makefile b/lib/libc/tests/sys/Makefile index f44cec11225d..380b3b511049 100644 --- a/lib/libc/tests/sys/Makefile +++ b/lib/libc/tests/sys/Makefile @@ -7,6 +7,7 @@ PACKAGE= tests ATF_TESTS_C+= brk_test .endif ATF_TESTS_C+= cpuset_test +ATF_TESTS_C+= errno_test ATF_TESTS_C+= queue_test ATF_TESTS_C+= sendfile_test diff --git a/lib/libc/tests/sys/errno_test.c b/lib/libc/tests/sys/errno_test.c new file mode 100644 index 000000000000..27d0548fc29d --- /dev/null +++ b/lib/libc/tests/sys/errno_test.c @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2024 The FreeBSD Foundation + * + * SPDX-License-Identifier: BSD-2-Clause + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#include +#include + +#include + +ATF_TC(errno_basic); +ATF_TC_HEAD(errno_basic, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Verify basic functionality of errno"); +} + +ATF_TC_BODY(errno_basic, tc) +{ + int res; + + res = unlink("/non/existent/file"); + ATF_REQUIRE(res == -1); + ATF_REQUIRE(errno == ENOENT); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, errno_basic); + + return (atf_no_error()); +} From nobody Sun Mar 3 04:00:26 2024 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 4TnSlt4SlFz5Br2c; Sun, 3 Mar 2024 04:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TnSlt42Szz40Ny; Sun, 3 Mar 2024 04:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709438426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qGp3e38diG7MltYBwksaO1vdI7xtC7gVe7k+DYFlCc=; b=LvshGnW47Q4sBfaFY4xoz6Uc/KzXf2RP7YSXUBcq6TqPVDMUYDYM8U58suqIk6FETDDzO1 AXpNQH9PokXpV2L4y68d6/I53MQG8hxFQJf5lFpH1ueQcdPcfyMcQxofgcDjTiOU8Dmpv7 Hrvhuc7NjM8w4jwRWWmFhA7bs7NTw/yYIrpddb2evIZ2di7g2hu5E2Mt4E0AekEIjw84TY Uhjr4FdujzeHFFc6TSIZORcPUlW07IQMIwyS+xC0gc3o6HnztpnN4YP66zv3JpXjz66c4d GWXypYtzMdsNA2POBHyHrv2bW5ChlAu0pQeTiIOOFdxkV6Tm16DzGZvgk8cQYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709438426; a=rsa-sha256; cv=none; b=ByheXmnKz4G6hg+dRb0noAwnNZa/Hrcyk4KxcagaX5uSeHNGMmJWOmxcCyqZsPLZXuvDid 1Z6FDbFX7s/CQGEaW2erdAogQeaNVKDhl5+j2KlE3J2BOIF/Ez5/KUT9cidmBVhzHwo6+4 H2qRNxi9nQeNpnU52ft+DgBcR00UFwLIUIFrk6QJWZX8O2Ht0045pGSHsDlZc3UJSRoqjA 8lK74UnVxY5Dx6h3gsHerhK8FiT5ZN/9l3n+hdklPBl+j8hVytVAYDNWh/aSUVI7sTnQPJ xjCLR+FFR8TYsa3DNSpE3RUcHuajWyR9EebBlS06+1Hnrf9dHB3ryjnD9ivIAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709438426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qGp3e38diG7MltYBwksaO1vdI7xtC7gVe7k+DYFlCc=; b=mHlyvWlKE9VUnar/uK8MByxsxrYgORTTJc4cklF1LI8s1U29d0zkgD5y8KccmhPxEDNrQY ctMrScAGshsZwa9KnfbiVDGyVC6eP2OQ5sC/M4/n3+58Y9ekyMzgTzotoj9IhfItZb/woe e5WlrTiqvxgCJuh1NuWkC8ypqzdePtY+uVGtXnE41gPHL+cY1ptON5WAAgnH6SqB7RWBHG TsK6MFl/ktoZDSjIFpoaIAGEAK3Uz7ABB99+4Dm1b2bzooQsAh2Cy1zVa8FEi8K1bRzs// bUeb69C2onfgYLUDvB5yv0TU+l9OWCbGSP8Hf+4P5y8qUbedvNR+fFvCGp6Qiw== 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 4TnSlt3dq2zNSC; Sun, 3 Mar 2024 04:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42340Q5P077443; Sun, 3 Mar 2024 04:00:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42340Qb0077440; Sun, 3 Mar 2024 04:00:26 GMT (envelope-from git) Date: Sun, 3 Mar 2024 04:00:26 GMT Message-Id: <202403030400.42340Qb0077440@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: 13ca1f11d6ff - stable/13 - libc/sys: add errno 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 13ca1f11d6ff96a5a1363ff954091ab9e0407e1d Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=13ca1f11d6ff96a5a1363ff954091ab9e0407e1d commit 13ca1f11d6ff96a5a1363ff954091ab9e0407e1d Author: Konstantin Belousov AuthorDate: 2024-02-24 23:39:02 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-02 05:04:50 +0000 libc/sys: add errno test (cherry picked from commit 32fdcff8703da6f2795193acc77ec3c1fb8b723d) --- lib/libc/tests/sys/Makefile | 1 + lib/libc/tests/sys/errno_test.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/lib/libc/tests/sys/Makefile b/lib/libc/tests/sys/Makefile index f44cec11225d..380b3b511049 100644 --- a/lib/libc/tests/sys/Makefile +++ b/lib/libc/tests/sys/Makefile @@ -7,6 +7,7 @@ PACKAGE= tests ATF_TESTS_C+= brk_test .endif ATF_TESTS_C+= cpuset_test +ATF_TESTS_C+= errno_test ATF_TESTS_C+= queue_test ATF_TESTS_C+= sendfile_test diff --git a/lib/libc/tests/sys/errno_test.c b/lib/libc/tests/sys/errno_test.c new file mode 100644 index 000000000000..27d0548fc29d --- /dev/null +++ b/lib/libc/tests/sys/errno_test.c @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2024 The FreeBSD Foundation + * + * SPDX-License-Identifier: BSD-2-Clause + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#include +#include + +#include + +ATF_TC(errno_basic); +ATF_TC_HEAD(errno_basic, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Verify basic functionality of errno"); +} + +ATF_TC_BODY(errno_basic, tc) +{ + int res; + + res = unlink("/non/existent/file"); + ATF_REQUIRE(res == -1); + ATF_REQUIRE(errno == ENOENT); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, errno_basic); + + return (atf_no_error()); +} From nobody Sun Mar 3 13:18:25 2024 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 4Tnj7j56Zfz5CmbV; Sun, 3 Mar 2024 13:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tnj7j4Hn6z41L9; Sun, 3 Mar 2024 13:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709471905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bR9o+XLfB+oH1LMtMQSSrxnmm3csvO0suk+E2tZsyHg=; b=vi0LpPZxgbdYTL9tn0XajQWaWhUHpExjq9XmVq5O5orGPCmNEsdMjCfzymUW5w7dUnTCSY hofLmFtIxJ93QDG0qIF9SaNNpboPClmXVLLipzKAO5tF3ElwayGNuroxW8hbOahydeEoba ngjwO/PMyqDxSomV3UJg81jZuGTNATM17tytfSyxVipzGLS91IfrQg7AOk7V+rND57xnC1 PEHLyFGxyK4JlS4/2gxNTxn1Cg5nJhZWlU3vGXjtMj3bp4FXnAahgLBHfSQZBdESg9FPTG +FSrGcsrR+PNfh179Yo8U6824tIyj6OMAWCdlmrECh+tEGiy19BXex0tBT7ZQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709471905; a=rsa-sha256; cv=none; b=F68W5SQ8m9pURlH0znw9LSdpLYn3wEVYPH8Q3bGvE3TEiijgte7g91j3I06kcAawcr5VP6 ffTMQCEc7+5RpfjzJAntawxsOKedTrWaaXjxswG9noHZjQmQAgll1y/SDtniBqT5AorgnN vIglVyhn0BXQvGcmgmggzDipwlpKXa1SwUcntusGJz+xHbU9MuepejRg9/JgGptnzUYEr+ 9uK5EcI7+JGTTcjosdOX2ydt/JYoYlx7CrgYhwDEsvsjEAhtlIG4oxYQKKKE9pmHv4Rtzr lFFn0ln5FCtb+/7uKfcJMfCJkymQdWV5aKEAloIVwRjgm+iZpHgwJ7Q4I8gGyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709471905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bR9o+XLfB+oH1LMtMQSSrxnmm3csvO0suk+E2tZsyHg=; b=s/ewhA9ESfbC8NTtQ2/yyXA4eb7yMogt5H92ju7QhAaALrRD9sbGh3HnOA1XvSJp18hpSe z6IXENa8w+FDFNvalPpuf/Xa6F2igo5YsObvVUNVlTwkTNNCDpiCLBvGgV13RHwFxkNBza YjeP11Nrr+BIASD3Jc259OxcO7WATbGv7Zs0PKj021wawVP2o2wkPcGn6VdZLpzrDBIJSf gYYpuld7zQT6DKfp12vn6alWfRVFZww7zpUnrFiaYhisFSkpw7AtosUR6OpWT7Hig+/LVr +ipo0mlnDWYvm2FCKRGCStGqpMZRqmuiYhdHHtK87iNHVg2eXmMI13oH/IJQwQ== 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 4Tnj7j3lFVzftW; Sun, 3 Mar 2024 13:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423DIPts013174; Sun, 3 Mar 2024 13:18:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423DIPTw013171; Sun, 3 Mar 2024 13:18:25 GMT (envelope-from git) Date: Sun, 3 Mar 2024 13:18:25 GMT Message-Id: <202403031318.423DIPTw013171@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: 2d694deca985 - stable/14 - snd_hda: Add patches for the Lenovo Ideapad 330-15 and ThinkPad X230 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 2d694deca985517c3eab9d51bf4c7cf20dd6bc03 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2d694deca985517c3eab9d51bf4c7cf20dd6bc03 commit 2d694deca985517c3eab9d51bf4c7cf20dd6bc03 Author: Dmitry Lukhtionov AuthorDate: 2024-02-18 17:07:39 +0000 Commit: Christos Margiolis CommitDate: 2024-03-03 13:18:02 +0000 snd_hda: Add patches for the Lenovo Ideapad 330-15 and ThinkPad X230 PR: 259640 MFC after: 2 weeks Reviewed by: delphij, markj Differential Revision: https://reviews.freebsd.org/D43804 (cherry picked from commit 5968e477a560406c480d78ebe438a04f57121119) --- sys/dev/sound/pci/hda/hdaa_patches.c | 20 ++++++++++++++++++++ sys/dev/sound/pci/hda/hdac.h | 2 ++ sys/dev/sound/pci/hda/hdacc.c | 1 + 3 files changed, 23 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 5bb4dcd79af7..3a7dfc63637a 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -338,6 +338,26 @@ hdac_pin_patch(struct hdaa_widget *w) patch_str = "as=3 seq=15 color=Black loc=Left"; break; } + } else if (id == HDA_CODEC_ALC230 && + subid == LENOVO_I330_SUBVENDOR) { + switch (nid) { + case 20: + patch_str = "as=1 seq=0 device=Speaker"; + break; + case 33: + patch_str = "as=1 seq=15 device=Headphones"; + break; + } + } else if (id == HDA_CODEC_ALC269 && + subid == LENOVO_X230_SUBVENDOR) { + switch (nid) { + case 21: + patch_str = "as=1 seq=15"; + break; + case 24: + patch_str = "as=4 seq=15"; + break; + } } else { /* * loop over hdaa_model_pin_patch diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index c3951edd362c..31bdc9130d9b 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -377,6 +377,7 @@ #define LENOVO_L5AMD_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x381b) #define LENOVO_L5INTEL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x380f) #define LENOVO_3000_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x384e) +#define LENOVO_I330_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3808) #define LENOVO_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0xffff) /* Samsung */ @@ -537,6 +538,7 @@ #define HDA_CODEC_ALC221 HDA_CODEC_CONSTRUCT(REALTEK, 0x0221) #define HDA_CODEC_ALC222 HDA_CODEC_CONSTRUCT(REALTEK, 0x0222) #define HDA_CODEC_ALC225 HDA_CODEC_CONSTRUCT(REALTEK, 0x0225) +#define HDA_CODEC_ALC230 HDA_CODEC_CONSTRUCT(REALTEK, 0x0230) #define HDA_CODEC_ALC231 HDA_CODEC_CONSTRUCT(REALTEK, 0x0231) #define HDA_CODEC_ALC233 HDA_CODEC_CONSTRUCT(REALTEK, 0x0233) #define HDA_CODEC_ALC234 HDA_CODEC_CONSTRUCT(REALTEK, 0x0234) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index f815e39392d4..123c64d9c487 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -79,6 +79,7 @@ static const struct { { HDA_CODEC_ALC221, 0, "Realtek ALC221" }, { HDA_CODEC_ALC222, 0, "Realtek ALC222" }, { HDA_CODEC_ALC225, 0, "Realtek ALC225" }, + { HDA_CODEC_ALC230, 0, "Realtek ALC230" }, { HDA_CODEC_ALC231, 0, "Realtek ALC231" }, { HDA_CODEC_ALC233, 0, "Realtek ALC233" }, { HDA_CODEC_ALC234, 0, "Realtek ALC234" }, From nobody Sun Mar 3 17:48:03 2024 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 4Tnq6q3vslz5ByyD; Sun, 3 Mar 2024 17:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tnq6q1ncvz4d7k; Sun, 3 Mar 2024 17:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aqo+vaDkGDt8Tiykc8Nz4k2XV9nD44jXKkoeg9dUoME=; b=Iz42+HhONwtQBubIYWt2lZ+ZL9xNQbCbTI+V96wsT/Wz4j1TcPoVE1E+tfGVqVgrrRbjl1 rnzUOfdtCO7rgkk1Y2w5AGGBb6NQylDV9R67e0ROZnZpBkLhASCVI31I1ZPu/QdN/cD7IP BXOnTRy7PCik6p194EBgq8QDjJVRKERJOTXHeRi3EZRlENQqhSFhjsUgZB2govXO86ZIhf VdHyOAWkMtfHthLb+Uss2h6BCBAglGsL5+h8jd9grP2Y6vN+TEWnAbAISKlfrh3U4qDNOK 9Msb1XF028FOdtDZXn24BH41p6XGUyMU7Kr+ZBoWyqZRQFTN133Cqc2e6EZGwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709488083; a=rsa-sha256; cv=none; b=XxQZTNdKeJBY7IyJ9U1VH5mAuqvcbbOKa6ZvcG8T/8WKW1A/fCNlGNyCkj7HRn1lLFm6Md LhN1MJ0dsbh+2+X4DpyjDEFc532DD8fh3L6r61M71gjGncJ5fwUGu71b4YKagc0vVhi/Fg iIy9+Y018gYG3C04gt7rAfwqvM4PY70eZg3E3fBYRv/2Hzd2RvHlSmlJiewQq0m3O7y5XB iYbRWj8RU6qOXxx6Lvx0+tVNknyreaPDicqxQlRYHOmmzETsBb13gb7yIl3Vg0OhdwMyRq +d7Ogz54R2Z6jrQurru3eHK325+eGJWII3T5iLugBG+2VluRx4EPhLR2OptMlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aqo+vaDkGDt8Tiykc8Nz4k2XV9nD44jXKkoeg9dUoME=; b=u3EnOfGW2bLzireDIG1TXXP/f3xQ//PGKBAfKrCqnHIyQcwBi0DuhfEW23kpg29yvGZIYX xd+6cGYfFbEOalQxpZDNJrgIsDSYSCAwQ6qKTL/YrKMjTPXz8L2E47tIxk1OMFGj+3V3Kd nGHiBd8yeOKbEgPpncITZrB8Lt5BlNZ4xO44klLMuGyMS3+ejOX6Z/lhAZLjJFU2kiT5yg FJEU+cKBlNwIRDYtBoEI9cfH0nd+psGh2vOE+bClvKSNdSSwl5BhWVqZLEKXd4zuFxi8lu dvG4caw6UlJ8WgYij1HyLBlr5hQEZn2negi5RI2KSZC3tPtMJsLMMZ+4Yu3n/Q== 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 4Tnq6q1PzDznyD; Sun, 3 Mar 2024 17:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423Hm3Bn067537; Sun, 3 Mar 2024 17:48:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423Hm3nm067534; Sun, 3 Mar 2024 17:48:03 GMT (envelope-from git) Date: Sun, 3 Mar 2024 17:48:03 GMT Message-Id: <202403031748.423Hm3nm067534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 4d8cc5b78fdf - stable/14 - bxe(4): Fix two typos in a 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 4d8cc5b78fdfcbf4a2f9d4243fcbb0db831210b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=4d8cc5b78fdfcbf4a2f9d4243fcbb0db831210b4 commit 4d8cc5b78fdfcbf4a2f9d4243fcbb0db831210b4 Author: Gordon Bergling AuthorDate: 2024-02-27 16:38:53 +0000 Commit: Gordon Bergling CommitDate: 2024-03-03 17:47:24 +0000 bxe(4): Fix two typos in a kernel messages - s/successfull/successful/ MFC after: 3 days (cherry picked from commit e2f36496136975d4b591b230a71986f1508629c1) --- sys/dev/bxe/bxe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 60450d0a6fbb..86e396bad4ae 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -12516,7 +12516,7 @@ bxe_parity_recover(struct bxe_softc *sc) error_unrecovered++; sc->recovery_state = BXE_RECOVERY_FAILED; sc->state = BXE_STATE_ERROR; - BLOGE(sc, "Recovery is NOT successfull, " + BLOGE(sc, "Recovery is NOT successful, " " state=0x%x recovery_state=0x%x error=%x\n", sc->state, sc->recovery_state, sc->error_status); sc->error_status = 0; @@ -12524,7 +12524,7 @@ bxe_parity_recover(struct bxe_softc *sc) sc->recovery_state = BXE_RECOVERY_DONE; error_recovered++; - BLOGI(sc, "Recovery is successfull from errors %x," + BLOGI(sc, "Recovery is successful from errors %x," " state=0x%x" " recovery_state=0x%x \n", sc->error_status, sc->state, sc->recovery_state); From nobody Sun Mar 3 17:48:01 2024 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 4Tnq6p2mMBz5C04S; Sun, 3 Mar 2024 17:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tnq6p0lh9z4d3j; Sun, 3 Mar 2024 17:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5je7GttmvuRUOsLcb1pau3RW937eKOjbbnKEi3I1q4g=; b=QVpFCm/Fw6ur0WVmruEvHyCwEFHQfXEMKJQdBUNgM+DuCsJQhZ5is6TYkvE5Q+HEQD32s9 TLTRO0Yb5WfLgvZnQf/eJ+N0HREcPqMhjs+7cGvyGaChxgkVryBG4cEVXjG+VtVPmvUabq kmpIew1QwR2FniiaHBzL2ld11IGA84HtLqHUwguF0lDR6DuEK/DwztSOcVabHLdNfmHUS2 FUCe/TxcC10XsUmXqfm2J/DeIBLFWMmJEf8EO5E7cOlIXDgEwHPIV1iaCrP/kSgixlljwQ oFFggJyvAa/sv2QJ5/MXzfnh9dSRqNZdR6/AjB0zUMyePgncYa3z7IghfYCdvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709488082; a=rsa-sha256; cv=none; b=vIq26UsvJyZjEJq9sbR8zleqxzl9rNWZk9EbbuEd8QqnnPQTw7Us+YeJ8bSbietl8nK0n4 F3S5uDLFr5ZzMad5K8RA1FjcKPyp/L43o5IH9TVSlxiWp1com5iMl2QUMT2A1E7AKx7rJ4 bQp225Wj4WoxPhy9Uy8DxiFv7QWLG5vxaf40/w4A3iVjtpkoc2BdZ//YUg3ix1Y1IqGxTO 4nqa+rCUHhrQ27FdkVj+TA4F1CsiIL0oiQaREu7J6zbASJrs/18kW7z/7XD6jLicGO3o6t hEacCt2ivagdTGJ3UztSX2ZRxwV0/vJ3x81sT69XZ2Ee0E9Z/nedQDZH6vdzdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5je7GttmvuRUOsLcb1pau3RW937eKOjbbnKEi3I1q4g=; b=p8hZIjMg5wNvhL5gACPU/iabGkhgFaErLCCQJxniA0DEnFsFw/LEpwbnNxd6DkJkcjKLDG M/jkZHKgLQIF7RdEgSwD2K1AQpP394DsSoQUXa8QmDijOqL+CsXFoyefPgQ1dAel/9o5Dr nAzz5n7HGN4wfXFD9++Pnl/wJU/blqHyZzhi8JnxpUcf4CY0/mrL0RVtJtZdLwGlHZnccu NiVmankkR4woB4GjHkiYyVPBiR7cir003S8kxYbbY/nvfrKC44V/MNR3mK5OzQIKCsPuhx Vl+gfL/gLE1FEIQmDqJEGV6cswHqGoefM1UUThiFAgyZvCSu4FIZJTI0ggBjlg== 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 4Tnq6p0FMyznGG; Sun, 3 Mar 2024 17:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423Hm1Co067484; Sun, 3 Mar 2024 17:48:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423Hm1Na067481; Sun, 3 Mar 2024 17:48:01 GMT (envelope-from git) Date: Sun, 3 Mar 2024 17:48:01 GMT Message-Id: <202403031748.423Hm1Na067481@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 61408fbd360a - stable/14 - vge(4): Fix a typo in a source code comment 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 61408fbd360a9fc86cee6143d57a8ba05b445c1c Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=61408fbd360a9fc86cee6143d57a8ba05b445c1c commit 61408fbd360a9fc86cee6143d57a8ba05b445c1c Author: Gordon Bergling AuthorDate: 2024-02-27 12:42:10 +0000 Commit: Gordon Bergling CommitDate: 2024-03-03 17:47:06 +0000 vge(4): Fix a typo in a source code comment - s/opration/operation/ (cherry picked from commit 04d5a8ae04013fd34e3bde5e401b6eaff46ac9c2) --- sys/dev/vge/if_vge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c index fcc47598454e..37606f28ba17 100644 --- a/sys/dev/vge/if_vge.c +++ b/sys/dev/vge/if_vge.c @@ -1218,7 +1218,7 @@ vge_discard_rxbuf(struct vge_softc *sc, int prod) /* * Note: the manual fails to document the fact that for - * proper opration, the driver needs to replentish the RX + * proper operation, the driver needs to replentish the RX * DMA ring 4 descriptors at a time (rather than one at a * time, like most chips). We can allocate the new buffers * but we should not set the OWN bits until we're ready From nobody Sun Mar 3 17:49:30 2024 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 4Tnq8V5YrZz5C03l; Sun, 3 Mar 2024 17:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tnq8V4hnvz4dSy; Sun, 3 Mar 2024 17:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UZcFm7jvqV3PHGhfcQWEEcBwStBP10ojvfdlXg+ilj0=; b=EWPe48G2YrE6Ett94S400o+EZjaLppPro53+kHBYgOI5WyXpqlLMcr6vYdih0g0Jp88jJi hgT+faQR86ylaJMfNpC5Yon8qUCDrNBPeZ0fUnDOew9D3dUHeM7ayObQyA7D4v/pmqV19t DF1bpD/Ze7H8XzQxd4EtbNq/ssKNkaGSBLa5VLRYfgM/YYLXG/envlTfY1F9PtwXaGCWdN nYW7LfLJPD0U1Zuu3Wc44Cww/CFD0f2apKcyIx9CCMIbnzdCC1aImOcysWq8LhYtUXMsFM w4WXAVasTZ/fwXVRiwqmV2o2LuNmmApPXuP7I/W8IRAwMFBv5zlzjIMTjgeIvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709488170; a=rsa-sha256; cv=none; b=uY/9WWpUlHMraZQGqQTHPa/JLew8DgzWRew1uitYRaSPAVz5DpgWUGXeg07RBd6nGsZ904 vtd5LsZ76IQ/ORXMQDZdVK7G5cnbJ4GNFSAa6HLtAROiIU8WlQKr49pmBFCy6SsN9mlBJ5 k7VjnXArKVNdhcQ+VhJTG1eKJ4xR07554PtnIGYHtWkXA3kkwhYdUeU1THbW5fYG2EosTb L6Hm7rCQPJ3IKIdibihomKDh5PXTT7iy4ftwepAzXtE/u8YFv9buRV4f2SJ7FotdNpQWmM rLTXDIDfEQdI7rW/+eyqdocaZqPDLOFU7lFaaqZVYpFDSvO/BwPdVN0gIjeJxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UZcFm7jvqV3PHGhfcQWEEcBwStBP10ojvfdlXg+ilj0=; b=UNAeEMpx1sc1XTcl+4lVCR6HJOqONcKRcpnW9k1w6haZ8z6V9DsSbuvTriZDAeOfBmqe5c cfs+C0XwvPHxZEpB4eJV6zdViOq/OkqETRH1rcAUBXgL0zp5VKsE/a94RdZHjfTWhZVnVs ZzaekTBsNp4NmzWBUGpNUDnrsQ/XpHQIT5/QJrmpiepQxzqfBI7C5d8kvIuVfB3hHjcqeQ ztji9H3SP+NAoUA6IKqjd6BGoZ4V6rQtLlxyeYbyPndxQz4DpCF3Gt9hrboitiMYtY8Nvd TkabCQCYltnYJ5ET3s37+AZsLPN7g4knrj5B8OPhZXyxrQ3YIpNB2IjW08sRRw== 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 4Tnq8V4JK5zncx; Sun, 3 Mar 2024 17:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423HnUjH067894; Sun, 3 Mar 2024 17:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423HnUTD067891; Sun, 3 Mar 2024 17:49:30 GMT (envelope-from git) Date: Sun, 3 Mar 2024 17:49:30 GMT Message-Id: <202403031749.423HnUTD067891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: cdadccec763d - stable/14 - dumprestore.h: Fix typos in source code comments 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: cdadccec763d0d7b3f4421acd2f964c7b7c3e06f Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=cdadccec763d0d7b3f4421acd2f964c7b7c3e06f commit cdadccec763d0d7b3f4421acd2f964c7b7c3e06f Author: Gordon Bergling AuthorDate: 2024-02-27 12:49:21 +0000 Commit: Gordon Bergling CommitDate: 2024-03-03 17:48:14 +0000 dumprestore.h: Fix typos in source code comments - s/dumpped/dumped/ (cherry picked from commit 8f87d402e32178974038212fbf4b1564447df0e0) --- include/protocols/dumprestore.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h index ea0071525837..39b3143e946c 100644 --- a/include/protocols/dumprestore.h +++ b/include/protocols/dumprestore.h @@ -116,9 +116,9 @@ extern union u_spcl { char c_addr[TP_NINDIR]; /* 1 => data; 0 => hole in inode */ char c_label[LBLSIZE]; /* dump label */ int32_t c_level; /* level of this dump */ - char c_filesys[NAMELEN]; /* name of dumpped file system */ - char c_dev[NAMELEN]; /* name of dumpped device */ - char c_host[NAMELEN]; /* name of dumpped host */ + char c_filesys[NAMELEN]; /* name of dumped file system */ + char c_dev[NAMELEN]; /* name of dumped device */ + char c_host[NAMELEN]; /* name of dumped host */ int32_t c_flags; /* additional information */ int32_t c_old_firstrec; /* first record on volume */ int64_t c_date; /* date of this dump */ From nobody Sun Mar 3 17:49:31 2024 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 4Tnq8W6JShz5C0CB; Sun, 3 Mar 2024 17:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tnq8W5mbkz4dY8; Sun, 3 Mar 2024 17:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=At/uqa5bcvPPyLdkeGO8mpI/BzpJIeZGsTRU9Sl3wgc=; b=lDAn0igh2rdKRbt7aXX8Gc0ExwNXShI55uL61camle5bRR8vMpyInlXXax4/dzG3kn6NGn DIWVvZ5NOCfVw4W7Ee2GjAy7gQdo/qc3BVFjXwCMEaLRq31gX50MRthzV0bAVxtyz3RyZr iPtGIVQMQUxMXyPlQYMTtvhy+ymMThDS2nPCyJrptTNGacQd5jYPJBqEBffxMrfzGWxr2f swOeAtYFzkj6ANnrUWBJJ6Uag7UCUOG37b8qqJXLdcHk7O5ZJnL8eF8av77EcweJJx/7bl B0Kadtha3jVR1L6fEXoFZFunpBdybqvIJ/fYrCqH0uRrrSTQe7Rd0fkObjHmFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709488171; a=rsa-sha256; cv=none; b=Xb9rjmIORJVqj7cQNojOIsns00fQPCelY4E2OxXC07khNWc5kNR9gGxZAacqYFmoO/8eg9 TbgfbWlx+1mO1GlqkNcGwdLIF4y2niiaW7ELAH5bgGmckmwG4zsCG+GnzuvU60w5Ialx3C hieA//MYtgX2jvzwMbTwV99SfB1nTjY/ZPljZexY0vwp3Kt16YCcqyWebTd2JwN/mumUNk iaa4XrTw9jIo5U1CjfuLQhdJnrx9D6PTazZq0btUZrvHITzstUPYH+/wZlig3n/QS2LVLU x4zFEseqDwtf9sUsKPbqMlxZuJOWwnJiFLWOt5gOfwcYNkeBe6W3W7uosVRjkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=At/uqa5bcvPPyLdkeGO8mpI/BzpJIeZGsTRU9Sl3wgc=; b=lWnqewALbJxzuP2fpiWbSjCDigTMhfEwCmxI867eCocuEXUHXtga/XSvgeN1vsRrujk5zy O240cjNKn13pP+Vev4ERzoRHjtKHvmTHx83u6To5rhQL/8VACgORC5ENnqAw/Q0ohYMwYA xIMf7OMmAVkXjLuYeAgG6AL0qhl/kHlEmZ+mZXq0EvkptBPZWMgtkib3dWXb1PnGPUAewk GaluN5G/Fe+N9qxlkDsqCx+VmfcDAOBEF4FATpiYwZATdndv9oaE4+0onB0un+hA9ZtQGa 8b888oNorsHfr7qahjlTgfK1PKGbYbJT9ZU2BwlqBGEl5+I1zHE/9ETPAjoJeg== 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 4Tnq8W5LZkzngQ; Sun, 3 Mar 2024 17:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423HnVpD067949; Sun, 3 Mar 2024 17:49:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423HnVvN067945; Sun, 3 Mar 2024 17:49:31 GMT (envelope-from git) Date: Sun, 3 Mar 2024 17:49:31 GMT Message-Id: <202403031749.423HnVvN067945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 6cf569e659d4 - stable/14 - carp(4): Fix a typo in a source code comment 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 6cf569e659d417ae910fd351d03c1941505726cd Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6cf569e659d417ae910fd351d03c1941505726cd commit 6cf569e659d417ae910fd351d03c1941505726cd Author: Gordon Bergling AuthorDate: 2024-02-27 16:39:57 +0000 Commit: Gordon Bergling CommitDate: 2024-03-03 17:48:32 +0000 carp(4): Fix a typo in a source code comment - s/successfull/successful/ (cherry picked from commit 6bce41a38e32decbce80bb1586cdd9400c83eb97) --- sys/netinet/ip_carp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index b0a422d5060f..335cb42613bf 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -885,7 +885,7 @@ carp_send_ad_error(struct carp_softc *sc, int error) { /* - * We track errors and successfull sends with this logic: + * We track errors and successful sends with this logic: * - Any error resets success counter to 0. * - MAX_ERRORS triggers demotion. * - MIN_SUCCESS successes resets error counter to 0. From nobody Sun Mar 3 17:49:32 2024 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 4Tnq8Y1Mq3z5C03m; Sun, 3 Mar 2024 17:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tnq8X6sTvz4ddg; Sun, 3 Mar 2024 17:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ntIVPkZYOpW7u3EOYWIJ1Ws/h85Ep4uzuJ89mMzCPgE=; b=w0Voli3ySSuW2jJqbgmN8ai4DMTg3JDlSisi2X135j21W4HYdwxRw+3yQvBtA6Pm3Cays5 STKY/MAW6keEXImJFSGyf5Fv0nrCdDY8Eo066zpRQWskRuEPWsE4rQM5IZcuDWbX9PYAOE B+YcRxpSCowbc3KCCdwo9clLfYzirkmAfd6+vgadtJpzrvkGutuXRAOei6fjfhGvW0iDIE YT5R548v9ssbkrzZ6k4ELdhVAdtccYCOGm8mwU/o1PO9vh2YwmzaJEEznsJNUg5NKt27sC dcYGmvuYkQklXvTO/FzXVmTxmpEmp99i9rlQAnEXasIQ6TShtoPkV5+SD1KOMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709488173; a=rsa-sha256; cv=none; b=DQHYX3EoYy0u9t3THePtiBgXZa8LAzZABtU1DCYoMOKOPbC0W4rTFvcNRG2k1DZGSTvtQk K9ST7rlvLVWEdTIcJiKUqWVIzeSkGWzYF2WQ8a0T41qH4WwRaPaM71boYtShwY8sd9/awV zeZ3uab0FfNoIchMYbw7oCqSpYUBNEPzfkUfX9r8G0uCnGdrmcKs9HWAAviCAXlN94YKg3 ZAKRP0cgvRN6IINYE4XCPtD3BUz8R1JRMlmERzTMKWHanv1ef6im0OY33otcXhjuVjxQvL hZKYYj5g+WS98e4HlgaFOpyoixmeKQZwSoWaPGlNHMYzURbjkX/RljGj27tamQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ntIVPkZYOpW7u3EOYWIJ1Ws/h85Ep4uzuJ89mMzCPgE=; b=g3YM7JTsKdzMwoTEIwGJCpz0TVGQ7UMJeV+MVKt0E7emutKv22StUBze/yhH/Kud1nAZAr drd/wPVbrEU6sdmn4KqMsy/lNgfLT3BAIFS5FvPLs7QtptTeync+sbs31nNxcRMSq8RnHs +wPV50vMLPo669DOtR3HufhDd1+nYV+Ng+i4D22luQK4O6XG8ivEraqZ+mjMq0zHmA4ILw tRGFS4tiO8s1qofPceQ0f8pX2zDGmox0jnMvuNKKS07sDqbmXBdCRiitumw5OJgFRMvviE MpmJ7QvoNNxO1ybuNqaglhReoKY4DVdeLj3LZe4QuiS/F+im09GHfA7QLQk7fg== 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 4Tnq8X63LwznsJ; Sun, 3 Mar 2024 17:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423HnWsK068003; Sun, 3 Mar 2024 17:49:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423HnW3Y068000; Sun, 3 Mar 2024 17:49:32 GMT (envelope-from git) Date: Sun, 3 Mar 2024 17:49:32 GMT Message-Id: <202403031749.423HnW3Y068000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ee0ffe0e3e36 - stable/14 - nvmecontrol.8: Fix the SYNOPSIS section 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: ee0ffe0e3e366d3fc919bc4320e5514a44852a76 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ee0ffe0e3e366d3fc919bc4320e5514a44852a76 commit ee0ffe0e3e366d3fc919bc4320e5514a44852a76 Author: Stefan Schlosser AuthorDate: 2024-02-28 08:26:20 +0000 Commit: Gordon Bergling CommitDate: 2024-03-03 17:48:51 +0000 nvmecontrol.8: Fix the SYNOPSIS section The manpage of nvmecontrol(8) has the following SYNOPSIS: nvmecontrol format [-f fmt] [-m mset] [-o pi] [-l pil] [-E] [-C] The correct switch for the pi option is -p according to sbin/nvmecontrol/format.c: OPT("pi", 'p', arg_uint32, opt, pi, "Protective information") So correct the SYNOPSIS section accordingly. PR: 276554 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44099 (cherry picked from commit 77f6c0ce92888d047d91e87b931242403764902b) --- sbin/nvmecontrol/nvmecontrol.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/nvmecontrol/nvmecontrol.8 b/sbin/nvmecontrol/nvmecontrol.8 index c4ab4429f5cd..edeeb9afa10f 100644 --- a/sbin/nvmecontrol/nvmecontrol.8 +++ b/sbin/nvmecontrol/nvmecontrol.8 @@ -33,7 +33,7 @@ .\" .\" Author: Jim Harris .\" -.Dd December 14, 2022 +.Dd February 28, 2022 .Dt NVMECONTROL 8 .Os .Sh NAME @@ -155,7 +155,7 @@ .Ic format .Op Fl f Ar fmt .Op Fl m Ar mset -.Op Fl o Ar pi +.Op Fl p Ar pi .Op Fl l Ar pil .Op Fl E .Op Fl C From nobody Sun Mar 3 17:49:33 2024 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 4Tnq8Z1bM4z5C0L8; Sun, 3 Mar 2024 17:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tnq8Z0bnYz4ddp; Sun, 3 Mar 2024 17:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3cjpKUTfGnI7xbY1XEwIxAMWT3/0jUyAQplm0OL/I8M=; b=oq2d7L1o2mHviN3raEU7AQx373n7fVLKK5kZAhWY94o+RdFTZ93vc1+X9BuMng0ExG5xA7 gNNFr+qShooDvUZaUukkSqX2w2mTgTD/+6XGSBZniVDXjKZB8n7z/N8QTarEuywH2DbGsS dh7HQ3YsQ/tbnHJe3D7sHLH47co2V1hsaoIk0VP5TmcoeqnSWSVJ6nWTjknnU1DvgsTx6s hSwfYYHptDMZg3fdeBe6/mpqZSjMPkrnxDW8waMb73klLCS05U5xEY/Km8kEqps3uJ13PH 9W4uhDS+toVPwwpxQgfl38buQIQgGfwQrMv6Z/aWkKq6aXlkNgp5GyR7i2yqtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709488174; a=rsa-sha256; cv=none; b=stZCx0E0jQjIH36vWvZ12XVP35srwpLqIe2EdWDfFdkfU90b0OEh3GeqYOupPhHyxpZBfc 3pF9Boi8rDgBS7vEwXNrRYPphh3Pb/M7rLcKd4HYKN72Rm9sv7NjV5uY7+u9Sh3qesZD+f mypdAp0tjjGrTRvRR1ydGZHqKNINMEotNxbGgGdBiH40sg7s6hQS+ID1NQEnzYWZl7UtOk jqaPaYNCud2E7i8lA/TrR2GIpoHZSX8iavKYu4r3BPsQNo2gOgpwld4nxq9x7dbXZjrdYL O3JD49O1G0Pk54GCRxoCtBk0TnGggYlGQnbzGSYQP+H6Ft73l76+dG4GFn4K8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3cjpKUTfGnI7xbY1XEwIxAMWT3/0jUyAQplm0OL/I8M=; b=SoSuT2i1k7sYDGAApxRSPcKzPRf6dr+5oXOWptTR4lIhVpf8aPaToFAB0bTRpPHiTBoIB9 MCHlDu/d5o9ZZKxGRHT6rvTYQAFvAcaHCMA1tl5SH+CRs6YjVarFEmMVGjrgCvHIzYa3qF /jhDGIWsmAZrOf1k3iyuGHBKvHrY6v0FLVhAUQIXXV9dXrCPZxYw5BCc3YZKvW3DsPIXQx GSCBjHzSoIbA/I1VWVH2ZVEjVBP2lgMnR7sCVhHsoRCydPGJEgJeGnNnSsMimQSbadM5iI HIcyzYBGPshRgekJJZHSyYT4qNstd8ccl00jCCYgaGDMSHw/a7STMIyKpPA9Dg== 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 4Tnq8Z0CVPzngR; Sun, 3 Mar 2024 17:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423HnXc5068042; Sun, 3 Mar 2024 17:49:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423HnX7f068039; Sun, 3 Mar 2024 17:49:33 GMT (envelope-from git) Date: Sun, 3 Mar 2024 17:49:33 GMT Message-Id: <202403031749.423HnX7f068039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 38a5635de99f - stable/14 - md5.1: Fix an example 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 38a5635de99f3a3ab5f6ec07d2896ee7ffdb8826 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=38a5635de99f3a3ab5f6ec07d2896ee7ffdb8826 commit 38a5635de99f3a3ab5f6ec07d2896ee7ffdb8826 Author: Stefan Schlosser AuthorDate: 2024-02-28 08:31:28 +0000 Commit: Gordon Bergling CommitDate: 2024-03-03 17:49:10 +0000 md5.1: Fix an example The last example in the manpage md5(1) wants to demonstrate GNU mode (md5sum), but uses BSD mode (md5) instead: In GNU mode, the -c option does not compare against a hash string passed as parameter. Instead, it expects a digest file, as created under the name digest for /boot/loader.conf in the example above. PR: 276560 Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D44098 (cherry picked from commit 865baeaf1abeb14327ad6a4a1f8ce722e242ff73) --- sbin/md5/md5.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1 index 0a8dc46f3b1f..88b795da74b1 100644 --- a/sbin/md5/md5.1 +++ b/sbin/md5/md5.1 @@ -1,4 +1,4 @@ -.Dd February 13, 2024 +.Dd February 28, 2024 .Dt MD5 1 .Os .Sh NAME @@ -367,7 +367,7 @@ for .Pa /boot/loader.conf in the example above. .Bd -literal -offset indent -$ md5 -c digest /boot/loader.conf +$ md5sum -c digest /boot/loader.conf /boot/loader.conf: OK .Ed .Pp From nobody Sun Mar 3 17:51:07 2024 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 4TnqBM2BYsz5C06Z; Sun, 3 Mar 2024 17:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TnqBM1m1Gz4gJC; Sun, 3 Mar 2024 17:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4wba8j70cQMAa2sVzkmGMp9sfduJsfs2xws3bGfaHqA=; b=rOAgu+D1IP1qVjM0LpgsNy0F8aW31GEZMdMpk+LvknMgDeC71xRldCNkvhoU9NUUCUWBqW 9G+11yCbhK3bYJbqDQz+jhjLymARu1uhJoBd5rYixk1aVlLkT7UotRluRduG98A71PQqRc CjUm6JHLhcaH+ejwoJeWKyv0q/PzTEKYFVh+1vXj5PDZ4HI70Latgk/nCEN90ZFj6OL/Gt MyelUnL9ozFEXLV6YX8IkkQ3O/B5c4U1nKhVuOFBtPrnJ/GMN6FvRjk5LeuVMODRWec3Y8 9j4tIxeCAImLI3avNnu3/Rm4yDfgwP2taC+eOjMZIEdPJrSjCN5T6qUL/g2wrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709488267; a=rsa-sha256; cv=none; b=XBwGAXXYZQb58k2Ue18Yk8qXU5pjMRcLACEbHNmT1sgb9LxFIzjOoApVUzUMyKWodmRUPb i/D+89fHAdSuZrfGqCMf3aNyCFm052kYrnr8ueuhpFZ9/5wu+wAxl/gs1lRYx5m3TYg3uk suVvkjIQs8CgRHLGtWNQ9Ncl25VdyYzONu8/19s50WrFWIbIyEfWEXGKK3N7CZD2a5D2a2 2p7oHJJiZqG+OC1YcYX1900lmpeJGyi57NG0dNEjNddsHpb1lG5zNDKzQYFaE3imgN+zwy O5BLy3ukVROSABr9jeePNWK03zAGK8InIEvStKZ2GYdbW+fFBSx3qFCgHNCAYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4wba8j70cQMAa2sVzkmGMp9sfduJsfs2xws3bGfaHqA=; b=rd1pJta0Z/82ShUG3qIbhQCv6aCp3/NdcTQ15Dl2e4CHWmu0D9YmD2X6ZelIR3YxTz23q9 YB6YgU9Vel9h3nlzO7QRPBhXm2S40LM/Quz0dfD7yzIygRhfW5TdR06hMHG09kaIdrKp/+ CWLeXcULB9QF2Xz5k5n6wT2pJAxFYWYXjvInD0xKeMdS5/VpeOLlG5vJZgwDUiJkIrfP99 t6wTbp2N7a2Vyi7ZKkLHHG1f16ZRMIE1QZ/DByA6h2AeOdGATNju2Bot6BpeVADiI5DZr3 m5SsBpluiDOvlLm414CG88a3DWazSjW6oPvg3K6PpBn4LyWTxXnOOp37nOE7nw== 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 4TnqBM1MQ8zp6x; Sun, 3 Mar 2024 17:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423Hp7cJ078704; Sun, 3 Mar 2024 17:51:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423Hp7Ek078701; Sun, 3 Mar 2024 17:51:07 GMT (envelope-from git) Date: Sun, 3 Mar 2024 17:51:07 GMT Message-Id: <202403031751.423Hp7Ek078701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ae4f354a8430 - stable/13 - vge(4): Fix a typo in a source code comment 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: ae4f354a84300e4b7b850ff824ee72975b6dc05c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ae4f354a84300e4b7b850ff824ee72975b6dc05c commit ae4f354a84300e4b7b850ff824ee72975b6dc05c Author: Gordon Bergling AuthorDate: 2024-02-27 12:42:10 +0000 Commit: Gordon Bergling CommitDate: 2024-03-03 17:49:50 +0000 vge(4): Fix a typo in a source code comment - s/opration/operation/ (cherry picked from commit 04d5a8ae04013fd34e3bde5e401b6eaff46ac9c2) --- sys/dev/vge/if_vge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c index acb6bbf424c6..ef276c3fe0bc 100644 --- a/sys/dev/vge/if_vge.c +++ b/sys/dev/vge/if_vge.c @@ -1221,7 +1221,7 @@ vge_discard_rxbuf(struct vge_softc *sc, int prod) /* * Note: the manual fails to document the fact that for - * proper opration, the driver needs to replentish the RX + * proper operation, the driver needs to replentish the RX * DMA ring 4 descriptors at a time (rather than one at a * time, like most chips). We can allocate the new buffers * but we should not set the OWN bits until we're ready From nobody Sun Mar 3 17:51:08 2024 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 4TnqBN4G0vz5C0Ph; Sun, 3 Mar 2024 17:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TnqBN2gNfz4g8W; Sun, 3 Mar 2024 17:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Kj2Mn8BNnL7qGicDdpkyjh4H2sdhp4BjFa3SlgnvKQ=; b=DuFoUXm8VuRamESL/Vr7mj+KNNoex4R8YzzqSJbRnbgc49IQxBqYfNPt6ADIkrXN2dHD8J eokdoGP++JVoVSClsdcfA1hErqYqqrHdoBoPI4s+vaGA+ra6OBQNZmYz00MCTv6feb+saK ztQPlSsX7i4grGqzoud1bDXr0fmAG0OJp+rEXJTEQsXbp0DkqwuCWC+oUIfGPfUC/WZzaX ZZPjRwvELZb383yPL/aUPf+MZLzKQkUv6MXoBfEP67AZyjGq2jn9EtGlYcXXRf8SRwtyy4 jcEPMtRdn8D4R9/U0NvlXG0a+/jIGWEHRK0Qi5ud4wVlKWthGSmMp23KFkQcYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709488268; a=rsa-sha256; cv=none; b=VRklWjEo41w76PptsZ2Os7HLPySVTVt9gkNjyLIVTua4ii8r5voymDITvlLAYkvU6NhFyn 1avHnKfh5km1lnZZTZmtP/jDmLNJc00OByMUyNAN8pUr0VuiKigj/lOSrtOGPO+/iOfKpn sjYr8gcJPG6dm+J7d6bqwchbm1stjlv2mh2qFMn8h2RL8+RboI0dMJBvE/Qc/jV2y6B4U9 eupw345jf6V/y5TBjoLieGinaLLX2nmsMS3imrXj9vFOl57JGVfYD5rQdQ2T/jLDB07mmj nzcv6ZoutmS4n+XdGV3nZJ94vHb4sQWyxWzAvtD+fmELIryg0gL9F1aXS6w/EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Kj2Mn8BNnL7qGicDdpkyjh4H2sdhp4BjFa3SlgnvKQ=; b=ZaOsRFvcQf+28HzJ2Cri2YOo9hFf63Wxm9ztU/BEsezHLLxhGjkuSPqzCU8d9QYqM/uaaF 6DSMPfjyglHHT93Ov6vXYw8211zP2n6klmgYSmz61YTPtrlOazhElwaDoEvfhcunnm1Npg pYKwGszuF7FlVwJyZlw2qOR+vvWIsRQmWDm4a4YnmuDTp3Z3THZJav6CXNi1HjFxnvPSkF 3lizFTenV3+cYeLEm1MgHzGH3nGV4zAdId9EIAoBp8IlHim/17DPyGVZprsxSZCZMgLyQQ 7TP2STqLxrHvYYys9nI7Cu7FThoi2jTMYlWRsHTVj2yjEwAt2K1BcJhgfIFGpA== 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 4TnqBN2GkGzndG; Sun, 3 Mar 2024 17:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423Hp8b6078759; Sun, 3 Mar 2024 17:51:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423Hp8Ce078756; Sun, 3 Mar 2024 17:51:08 GMT (envelope-from git) Date: Sun, 3 Mar 2024 17:51:08 GMT Message-Id: <202403031751.423Hp8Ce078756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 5c765273cea5 - stable/13 - bxe(4): Fix two typos in a 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 5c765273cea5154002842adf1889a3ba09bd31aa Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5c765273cea5154002842adf1889a3ba09bd31aa commit 5c765273cea5154002842adf1889a3ba09bd31aa Author: Gordon Bergling AuthorDate: 2024-02-27 16:38:53 +0000 Commit: Gordon Bergling CommitDate: 2024-03-03 17:50:04 +0000 bxe(4): Fix two typos in a kernel messages - s/successfull/successful/ (cherry picked from commit e2f36496136975d4b591b230a71986f1508629c1) --- sys/dev/bxe/bxe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 47d2001e28f9..cfe642eafeb2 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -12531,7 +12531,7 @@ bxe_parity_recover(struct bxe_softc *sc) error_unrecovered++; sc->recovery_state = BXE_RECOVERY_FAILED; sc->state = BXE_STATE_ERROR; - BLOGE(sc, "Recovery is NOT successfull, " + BLOGE(sc, "Recovery is NOT successful, " " state=0x%x recovery_state=0x%x error=%x\n", sc->state, sc->recovery_state, sc->error_status); sc->error_status = 0; @@ -12539,7 +12539,7 @@ bxe_parity_recover(struct bxe_softc *sc) sc->recovery_state = BXE_RECOVERY_DONE; error_recovered++; - BLOGI(sc, "Recovery is successfull from errors %x," + BLOGI(sc, "Recovery is successful from errors %x," " state=0x%x" " recovery_state=0x%x \n", sc->error_status, sc->state, sc->recovery_state); From nobody Sun Mar 3 17:51:09 2024 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 4TnqBP51RCz5C0M4; Sun, 3 Mar 2024 17:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TnqBP3j1Yz4gFw; Sun, 3 Mar 2024 17:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/eOk0/zA+I7i18VuXlCw/ahHud6VYDHrfEt+TqRaK8=; b=Kk1M2Spu+KdfsAsjMzROvOPkYnwXyaLIhPO+yR3UA2XRFt/m99EMzr8QuLLqdMPSdEF/FY P8KGky5OOrZ8iXHr9JJ7LvfJFxN1ABpliHz5GYJ4fojOOMDgtZVsJ/7u29PdYEmo9aN4yw AQA8rN/fM2ehLRKHqvUBzNBJhhykUxBZnQzeI8Tg2cTBXR7CDM8ftB2YcdeTHAwwA2WDeF Bpp5CQoxaSbtnKNdcTt5fwKbU0fgImu+hI76EBp1PyiW7mbfgl/4lSRgB7ABRXjJhGZeqA Gi6j2LSb3/rsaOGBZtwvt29lReYYAFYlmaKwJq2W3rTrYUVfLb31ScJOhYfPwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709488269; a=rsa-sha256; cv=none; b=s04JpSC8ROQp6D6Wt+GD9LVnbqI3a7OCx8uZb0Rnb4SybfN9Mo8H9U3AqAiOoGgucQqPLt rx84x2Hy3WrBjNobXNUH7Phj6Vl1fPRasr5v+LMMfEOpsQbdeSV05z1xIhez4yeS3b0uDY OqPDq5ctkjA4L1SmkGzKdB51LE4lgC0g6Cs6T1a4rSbGJoXwQtC/+6A4jiww/MQ375e3Ii XhZElEEhxR8PQ4pjTyTdC78rfGgK/h0cTlAV3sDfiQQCsm2iBPm3A0hPm+83paKAgtiM+p sHrG6J768mMvTSFUcKymM5SzbttgbjkUq3YmXpeERCQ3c8AKByhoWcfw7c1dkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/eOk0/zA+I7i18VuXlCw/ahHud6VYDHrfEt+TqRaK8=; b=ly5+mmcLxaKII+T0kBD6kKxWyiTaecfjlgepO/fOhygMkXMVTpswsOduC9u/OCzwW11I+f K7HpC+AtkSois+H85WrNEzzk0opoBdGocM4u/UinRItCZIVHqprPO6pRp4OqG65ODnLXiK 16YfJCEVk6MEM5H5TAw2Or+sT8JV6Bb5vxkOB7b95/paB9/fHKNyThWIDTpLIUQxFmFSQR QM/K2R6z6s1ZNv7X7KtzMRggyuyCVDjr8+9s/zmSrci2lJyOIBiitHml0XHser9MN4nU0O sKGOuaJCG5vCaYOS0/7ESHf9mDBOCtmCFBj1IQt1eH4C3hSU8wEgELC6WV7Rmw== 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 4TnqBP3JBwznyW; Sun, 3 Mar 2024 17:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423Hp9YA078810; Sun, 3 Mar 2024 17:51:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423Hp9HX078807; Sun, 3 Mar 2024 17:51:09 GMT (envelope-from git) Date: Sun, 3 Mar 2024 17:51:09 GMT Message-Id: <202403031751.423Hp9HX078807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 44f896fc35e3 - stable/13 - dumprestore.h: Fix typos in source code comments 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 44f896fc35e326c661ba199155a08fa3defbd62f Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=44f896fc35e326c661ba199155a08fa3defbd62f commit 44f896fc35e326c661ba199155a08fa3defbd62f Author: Gordon Bergling AuthorDate: 2024-02-27 12:49:21 +0000 Commit: Gordon Bergling CommitDate: 2024-03-03 17:50:16 +0000 dumprestore.h: Fix typos in source code comments - s/dumpped/dumped/ (cherry picked from commit 8f87d402e32178974038212fbf4b1564447df0e0) --- include/protocols/dumprestore.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h index ea0071525837..39b3143e946c 100644 --- a/include/protocols/dumprestore.h +++ b/include/protocols/dumprestore.h @@ -116,9 +116,9 @@ extern union u_spcl { char c_addr[TP_NINDIR]; /* 1 => data; 0 => hole in inode */ char c_label[LBLSIZE]; /* dump label */ int32_t c_level; /* level of this dump */ - char c_filesys[NAMELEN]; /* name of dumpped file system */ - char c_dev[NAMELEN]; /* name of dumpped device */ - char c_host[NAMELEN]; /* name of dumpped host */ + char c_filesys[NAMELEN]; /* name of dumped file system */ + char c_dev[NAMELEN]; /* name of dumped device */ + char c_host[NAMELEN]; /* name of dumped host */ int32_t c_flags; /* additional information */ int32_t c_old_firstrec; /* first record on volume */ int64_t c_date; /* date of this dump */ From nobody Sun Mar 3 17:51:10 2024 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 4TnqBQ6zsWz5C0MT; Sun, 3 Mar 2024 17:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TnqBQ50WDz4gJT; Sun, 3 Mar 2024 17:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hwWP0xczrrXmIB6a0nHaL2qdUe4CL3/67L7Ul8kF5FE=; b=X9WhvxsHNRg1umtccjZZqEENLThPYslu7h08sKvG3QhtJ1av471ym0/RKH7SIuG6EmYOTR 87rc8rcya8bxP7g+Oa4Lw7JmIFbV4WkGXT6HSXVXg5n0vluTqAM4T+KX/mowMP8hT2NDtn ZLNEEvWio6k4GMOMwnbtVR4k4MOPwP82xUUVXnVUbJneOyvxI9+qAGRwZkx8GfJfIY8ArY /CR4I615sEuILFIDUhzUfor5CA9mZ11HLLFbH7M0O85xr6kXXIZSONRC4dGJnGq1ROPyt9 8voAJubB1GcVi/W+bIFTguQBO7IoFM6ypM/IAa+sRXFJzArvYruJBm8NzNIYBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709488270; a=rsa-sha256; cv=none; b=GKmFjSWFRy8MheJpOvDY5GhQhyO5a1AbMwnpVx7TGgjuBdTCsz/oVKQxua30cUm8pyo47L cxUTSEoicu/V1aWr+ZAkcoyupsy2okF0eqk/wYi9TDzbTbgdebaBe9mRrMWYHZ+srZeR7C YqH2oz1MAEjVy54KZHwnRqSzxJh/yTVYSwrMofNnvbLCHsI78kxgwTxhIbmTSOj91kUEko HxtQq3wLKnO1moRZZFMnaxcvglx50/6EYw+THlu6jZ3lYjYqtoZC3FfUG3pmL5n9YCPFvo qgPdS83recIMDZN5bEhBQ9g9kLOIt+UwtjujYUCWcoSMWlc2anwWvOHkVHQvnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709488270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hwWP0xczrrXmIB6a0nHaL2qdUe4CL3/67L7Ul8kF5FE=; b=ucVVysMc/ch0y2LRUS9oPuNt8ZTWIwmFEs0YmlzmMUOX3fIrqHeVXWX+7zIjEaabg1+gcQ RmloY2PfMIj4bnIEXqvsQIRPgc0dzxjANso7s6xDqNM+06uhSYuv7SthgpKkmFIRKME11B J6CO3NbpYU4OHj0o4VB3JhCPEBsknvRbNrL6f+hmLaGFYEySD+XobMyiWG9CTNMjFygBUQ MH+6+15jbqJ7jNZr+JvUDP/eJHA3hKlByqLNxiXigrIumpUjJKtnnD6nHpSUb3mVbJBALU 0P4TjK32UUbfRTpgLaxB5bUZhPXEDK69lxz5+y4rqKe8K56+CqbxxOnJUkKQQA== 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 4TnqBQ4LFXznhF; Sun, 3 Mar 2024 17:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 423HpAO7078864; Sun, 3 Mar 2024 17:51:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 423HpAF2078861; Sun, 3 Mar 2024 17:51:10 GMT (envelope-from git) Date: Sun, 3 Mar 2024 17:51:10 GMT Message-Id: <202403031751.423HpAF2078861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ee1e748d217a - stable/13 - carp(4): Fix a typo in a source code comment 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: ee1e748d217ae80c12d021ac4d463c385dcd15af Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ee1e748d217ae80c12d021ac4d463c385dcd15af commit ee1e748d217ae80c12d021ac4d463c385dcd15af Author: Gordon Bergling AuthorDate: 2024-02-27 16:39:57 +0000 Commit: Gordon Bergling CommitDate: 2024-03-03 17:50:31 +0000 carp(4): Fix a typo in a source code comment - s/successfull/successful/ (cherry picked from commit 6bce41a38e32decbce80bb1586cdd9400c83eb97) --- sys/netinet/ip_carp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index dc3914c6f77a..cc7add7c3d64 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -853,7 +853,7 @@ carp_send_ad_error(struct carp_softc *sc, int error) { /* - * We track errors and successfull sends with this logic: + * We track errors and successful sends with this logic: * - Any error resets success counter to 0. * - MAX_ERRORS triggers demotion. * - MIN_SUCCESS successes resets error counter to 0.