From nobody Mon Aug 25 08:57:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9Pn944XWz65S0q; Mon, 25 Aug 2025 08:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9Pn93GKnz3pds; Mon, 25 Aug 2025 08:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756112237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I8Qk4Tww6ZJ504PBjnVtC+4dosKe6u0QZH0sGRBd/L0=; b=Nj0JSd1ndpNScjSEudEELFQRu8sg6SAgBYdpzkLmAsa11g56WTQP33sBJjgDL+DLGPDlW9 udr6tjDmnPbJOA2rzrib0WhEVcSwpfS3pSPidw3yvhJ/3Xs4pBI1GVkL3nVQ/CAfXt15i4 l8uj7TbujZN+bhAZFpjIJjFlkCwNQat7t50djWyPxFWjMycSRvP4oRRa1lJzUh48qz8VTo EsMFBTJEmosoNc+qtBs1N2sT2YTBo0wKwuNqGkfA74ouTqsgdybuoKl43xQHZ9g2MdjSFC YElkNGLE79GlED0H+GhaoCB9X6YOZoyD4saq2T0rSdmYBqylPlcp1XGyHVmkgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756112237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I8Qk4Tww6ZJ504PBjnVtC+4dosKe6u0QZH0sGRBd/L0=; b=aBr5PaWtlZ85IHfLk2zU4aM+PbHfS81M7yW8v5DvVUnEwef4dCCZ4ZU1XHYu3AY7kI4PdM BQHBGdTaNzdkDljNnZ/a0RQu/jd6znFTF1tlgrkoyqsXitDpj5E0RY7j+k59BuJPRblWNk VjlFkCFotWWifiptWjXafGHpmkdqR513gBrgHjOuh0esClFC6WeYqB2f3G3ChObsNVDS0c pEc46J6zv9XHGrrIuUIyUZsxjUoxvTzPPJ6WLIGWWEpHQ1zS6Xs9VgpDfwCAqRaeaUgP04 4Sa1ZodkLsZiTmfkZlt2UxUwDrZ6Pf60S4PagpaN8RFjDGuKUa1k2IBl/e0Log== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756112237; a=rsa-sha256; cv=none; b=Rlgv1if9zXkeC0WCGRxFtFL7mAWJ2CDkVIzQMBE7HarVzPmigOUMf08Xxrsu4esTEAuQ4q JL/7fPD9KhkWhfTE+WoOFz0aS07eeuKHNsWGteQXh2ogX9Q4xeuxbMJZxp89z59ETXSyel wTfXRlhb3pNB27hCqKG0WxKSftDUht2VGeJAynsA0cvABIzH44hRLmCn1fF7GmMBVOqLgX PW6Urv8z6yOrG+DEur24tcU9Q4ugHuiSuja2s1thumXRSVmfzoUerrj+/Cy0Luui2LQVZU MCs0Jyk1Bhz78Sj0o5StellBpkOy67cQkpIZv0CkjDnGm+NmSbjK5+wOkQkWlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9Pn92rWYzjrY; Mon, 25 Aug 2025 08:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57P8vHRT016541; Mon, 25 Aug 2025 08:57:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57P8vHGS016538; Mon, 25 Aug 2025 08:57:17 GMT (envelope-from git) Date: Mon, 25 Aug 2025 08:57:17 GMT Message-Id: <202508250857.57P8vHGS016538@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: bbb515decc5c - stable/14 - zfsctl_root_readdir(): properly set eof List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bbb515decc5cacefd4e0e053b50712d24df1b56c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bbb515decc5cacefd4e0e053b50712d24df1b56c commit bbb515decc5cacefd4e0e053b50712d24df1b56c Author: Konstantin Belousov AuthorDate: 2025-08-16 02:37:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-25 08:42:16 +0000 zfsctl_root_readdir(): properly set eof PR: 288889 (cherry picked from commit 1031208ebceb8554a0fe9c6d9c4b98a6631d4718) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index 9e8a4d62f641..3f955b296f1e 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -687,6 +687,8 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) * count to return is 0. */ if (zfs_uio_offset(&uio) == 3 * sizeof(entry)) { + if (eofp != NULL) + *eofp = 1; return (0); } From nobody Mon Aug 25 08:57:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9PnB4mpDz65S55; Mon, 25 Aug 2025 08:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9PnB4H8Dz3pXQ; Mon, 25 Aug 2025 08:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756112238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taqcWeRZrwrMkoll1FvfnTU8dnMAoCQ2Yg5TMNmS38Y=; b=cJQi5XNLZ1YuV73JG+McaJpLhzPXJAcgsliOsxYinKuYRPRJ/lavPK+cOrino/CevOlIDC Y2cM6uw8Na4M662FKga+8gIXCJdHFJbXO9tNTn1WRJDLUrQM/n13rgucZTXUOh9+McA6Ys QLDeNaIVzoy0xycElYZ3nhzb0YfsXNztUcoR2tz4iSKqABWfKcTs1aU78ARCw5MS18DhIP ziQJSXOB0/DhoIp2O6y/XQbir6mylMkoxa8i2zu9LV36+JPQmCF7BzEJlNydS9T5/kt7Ce 7CWh8KKCvnQUdkHsgmWiflKverIdzhuKNDF08A1YvENNJAmlbK233/5yJOjrug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756112238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taqcWeRZrwrMkoll1FvfnTU8dnMAoCQ2Yg5TMNmS38Y=; b=YIyA5oas0pxrDgMjrk4cZQvH22v/RwCukUg400nR9pdIQbPjJJvqimt/fnzMTJ/rIvkZ1Y Xt6GeAAJYkDBX92zaPbndL+HDIYHA3wuBdkcr7Dr6L0GVoROpdHaVbpWjMfSEO1uFXUlp+ filyq/IUlS9D2aNefhMpUds9NtDYETZTCftIzZuqqAY6oblPa5yzto4Lwo0YxQxxuGVCw/ qsN/X4VDVe03Lg6+PWO6xN5Y7rc9q461B6kZ2tgRvGg6klWOZCbsQICXmznhJhapUVp4FL NefRE0eVTi3YuAptQxHt0Bz5hbRw7SzbVLxt2y3RlF6FZGrFim5YUpqUCJdUeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756112238; a=rsa-sha256; cv=none; b=p3nb9Zf4F4aInL2VnX2OBtMi9jwATfoi0IwTJ2T9tf76dXcn3SqrdWQZXq42mEd3BODL8/ SlcqhHXRfLUjrVs1dY4RZ6zvYI0h4sQhF1cadtXg+YHFpfqRmklr2CK4h9ThjBwbkaj8m6 Vp0Y0lZyUrz9XM/eD/igfrW6DCLyppjoANRYZCsKeIPZov9hVI45udv9Twj1C4DOaqy/9g T0BncxHSs5G1wqgYLtY1pBRnJuhGYbUyMmMP0tA/HkVrsOorr0CP3BizxYBnQxzc0U6HZ7 ULaBtlmbfWvfHoZYaRppDla0pIs1w38gfrhUbiG8tQ9khT6HBJ86r/eH6ZIaAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9PnB3n0MzjKd; Mon, 25 Aug 2025 08:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57P8vI8j016573; Mon, 25 Aug 2025 08:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57P8vIYp016570; Mon, 25 Aug 2025 08:57:18 GMT (envelope-from git) Date: Mon, 25 Aug 2025 08:57:18 GMT Message-Id: <202508250857.57P8vIYp016570@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: 828b4f1476c2 - stable/14 - zfsctl_root_readdir: if there were no dirents to copy out, return EINVAL List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 828b4f1476c24ee3026d7944646363c49484d9f6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=828b4f1476c24ee3026d7944646363c49484d9f6 commit 828b4f1476c24ee3026d7944646363c49484d9f6 Author: Konstantin Belousov AuthorDate: 2025-08-16 02:40:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-25 08:42:16 +0000 zfsctl_root_readdir: if there were no dirents to copy out, return EINVAL (cherry picked from commit cead6157cc1b748df29b32072f492d4f6afae65a) --- .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 40 ++++++++++++++-------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index 3f955b296f1e..0c0112c29ae7 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -673,6 +673,7 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) zfs_uio_t uio; int *eofp = ap->a_eofflag; off_t dots_offset; + ssize_t orig_resid; int error; zfs_uio_init(&uio, ap->a_uio); @@ -692,13 +693,11 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) return (0); } + orig_resid = zfs_uio_resid(&uio); error = sfs_readdir_common(zfsvfs->z_root, ZFSCTL_INO_ROOT, ap, &uio, &dots_offset); - if (error != 0) { - if (error == ENAMETOOLONG) /* ran out of destination space */ - error = 0; - return (error); - } + if (error != 0) + goto err; if (zfs_uio_offset(&uio) != dots_offset) return (SET_ERROR(EINVAL)); @@ -711,8 +710,11 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) entry.d_reclen = sizeof (entry); error = vfs_read_dirent(ap, &entry, zfs_uio_offset(&uio)); if (error != 0) { - if (error == ENAMETOOLONG) - error = 0; +err: + if (error == ENAMETOOLONG) { + error = orig_resid == zfs_uio_resid(&uio) ? + EINVAL : 0; + } return (SET_ERROR(error)); } if (eofp != NULL) @@ -1057,17 +1059,21 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) zfs_uio_t uio; int *eofp = ap->a_eofflag; off_t dots_offset; + ssize_t orig_resid; int error; zfs_uio_init(&uio, ap->a_uio); + orig_resid = zfs_uio_resid(&uio); ASSERT3S(vp->v_type, ==, VDIR); error = sfs_readdir_common(ZFSCTL_INO_ROOT, ZFSCTL_INO_SNAPDIR, ap, &uio, &dots_offset); if (error != 0) { - if (error == ENAMETOOLONG) /* ran out of destination space */ - error = 0; + if (error == ENAMETOOLONG) { /* ran out of destination space */ + error = orig_resid == zfs_uio_resid(&uio) ? + EINVAL : 0; + } return (error); } @@ -1085,9 +1091,13 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) dsl_pool_config_exit(dmu_objset_pool(zfsvfs->z_os), FTAG); if (error != 0) { if (error == ENOENT) { - if (eofp != NULL) - *eofp = 1; - error = 0; + if (orig_resid == zfs_uio_resid(&uio)) { + error = EINVAL; + } else { + error = 0; + if (eofp != NULL) + *eofp = 1; + } } zfs_exit(zfsvfs, FTAG); return (error); @@ -1100,8 +1110,10 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) entry.d_reclen = sizeof (entry); error = vfs_read_dirent(ap, &entry, zfs_uio_offset(&uio)); if (error != 0) { - if (error == ENAMETOOLONG) - error = 0; + if (error == ENAMETOOLONG) { + error = orig_resid == zfs_uio_resid(&uio) ? + EINVAL : 0; + } zfs_exit(zfsvfs, FTAG); return (SET_ERROR(error)); } From nobody Mon Aug 25 08:57:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9PnD0xYNz65Rk1; Mon, 25 Aug 2025 08:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9PnC5RG4z3q3H; Mon, 25 Aug 2025 08:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756112239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6K7Se2pHbUEx9n95XsYn0B0tGEFHdx6jy65yZ+pfOKA=; b=X4a4zyMm+FWDjlq7xm2J1acCaRKKKgORnaJjLDy+b8fATNAuao0qT+GB0qQrATczDHllDr mNTNXWM/78Ar1rlkp6ULgTOQDdzPydAsI7z3cIY+O46RCzrsfRiiVRyrYYiueKm2RYtd7t 9Bz/uWA6UiiF1hhhp9vT6pTqfTrLpC+2Y9sl238robbN3L13kqe+sfu/2Lz0ACxvyvoijG bQvUqDUsLR8qkMyPdG9c1e6jkaJHsfjG6LuZ8E/+3Y0ciPKIjXQL+DyRwNr1nB7lPdDd78 gg/wWs1Ybns8BmC+2njAJibV96ebqmwSMizSckKaJh33lwUW6ocIrOEQ6+OehA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756112239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6K7Se2pHbUEx9n95XsYn0B0tGEFHdx6jy65yZ+pfOKA=; b=xFDay95oeAIYE90OWGMHkW8QucjFvkctzwVTqYoqfiSvESBot7airQZCVohLfsLtLBfXqC wSvMsYT/pOs5zXUY+SODTKRJU9SKUXHOmd7wi1OsmwMjsFSHj3yQ3FVzfU6IwjQ3+GBaxk tSO/HgfpP8TOziY6X+NtXuvNUJZd5M1Wobsnk9DBeUPW/zRRKPbuOkoJ2HdN9FWepYI+k8 jmDK61arW25LQUX0v21ZFElKO128gzBG0tkdWq0jTElxnhH8vscw3RdgqYmHHPhvcZHLEA QaHeAMys7X7XxG8kNcW/UE8bJA33CdxUTvK0/OScWCD92pqo/CTpbRPW4jAgdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756112239; a=rsa-sha256; cv=none; b=qWN855raGygVUtCHaEpuuPONGVRVwdM4iALd1CM9iqfJ2TgwidCKbfWMdeh57WYXnL5WAf dYvNQUtxfbMmoBPU1aVse8fS7xcvLVad3z6xR27v6FXOfqjWiFhQ056fQNsRj+K2a2zXs2 s8yVu7IpFvoJHytZT39CDxmaaIb3SMZpi2XyVGbZWM3jSw/esMYTwyL0iQpFJKRAzJ+9AZ XthvPKHmN4m1BFX5WymVMvKFyxMIR2HMvbB8/N3ou6zuN/fX+wUvFtZ6PzoHJq2UiZIh6t jilNOhIQs/CtrTeIDME4QTWxBcYcuCQGE3GQveGE3fqx19r4ms9xTtBQYsq2gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9PnC4mWnzjrZ; Mon, 25 Aug 2025 08:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57P8vJXu016608; Mon, 25 Aug 2025 08:57:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57P8vJfQ016605; Mon, 25 Aug 2025 08:57:19 GMT (envelope-from git) Date: Mon, 25 Aug 2025 08:57:19 GMT Message-Id: <202508250857.57P8vJfQ016605@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: d5cd41f2f1cf - stable/14 - zfs readdir: set *eofp to 1 on eof List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d5cd41f2f1cffcf302ff80fc8a6a51ceeb81bfa5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d5cd41f2f1cffcf302ff80fc8a6a51ceeb81bfa5 commit d5cd41f2f1cffcf302ff80fc8a6a51ceeb81bfa5 Author: Konstantin Belousov AuthorDate: 2025-08-16 00:56:15 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-25 08:42:17 +0000 zfs readdir: set *eofp to 1 on eof (cherry picked from commit adba3e087173b8ca6c5e9db7241812d4ac752608) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index d111bb09dc0c..c477ad55dbaa 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -1601,7 +1601,7 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, /* * Quit if directory has been removed (posix) */ - if ((*eofp = zp->z_unlinked) != 0) { + if ((*eofp = (zp->z_unlinked != 0)) != 0) { zfs_exit(zfsvfs, FTAG); return (0); } From nobody Mon Aug 25 08:57:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9PnF1dRzz65Rcx; Mon, 25 Aug 2025 08:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9PnD68MMz3q3j; Mon, 25 Aug 2025 08:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756112240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vo+uT/83u8k0l5w7XymP+wU7K55XenXR3a4gpLmEd9I=; b=Yq03EF4Cal+v345+H2pfVShGg+OfpN7rboUZd1Ldwg23gEujumbx80RzmqRDBSUDJKeCU5 mHYYkfSxUeX+8WVV5fDp8zIQnb5oqYSeWX8vdcDaaNS+d2rVo5YIbLvNN8q8wqycp/t69Q VWANm+IenI8Mg3lboDQvd4fLAXiTC/RWvLJnx6sS2EQzzFeIW4er5XCQ0G93MLovVFoZ04 csOFA53lfQdVyOVgpZu54leCT/StYqIY64klFT1cLixJ9PIW+mHf7SJa1Qun+a/rAcH26S Hx08AAsLH98XI8lndpbMBpu21JhIfs3WX1wsukcGCZzshKfW86Sm38gWF+xZGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756112240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vo+uT/83u8k0l5w7XymP+wU7K55XenXR3a4gpLmEd9I=; b=fUB5Fjzu4RjmmWkSxN4CGSDPH4xq09ELpnmfGfGz8SWQGzuctTzdXgQzcjhLyk/RDnDjBE ts+r+JSEdUZzEk+ZQEJWPB1UYjq520jVdzOLu7z3t8LwKQvuIV11olrb9Aw9ZGX4N50JRy /Vk+sT26bhu1ato9JnrechrkQ5eN5fyHJQpwoP11erE77B7jONGPyi5rc93WhoWsJ9ci02 915Q3FFH9xo8FqS/ZptfjagFzTceWm93pNaWcZmth7gP1aw+N4nbgZhzndZasMlGB2EVdf DX2cATwkcZalcOn4QsQMrwr7hrR5Iy/07dK53CU8ycwUjNbxYsvdsz6mFxyBcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756112240; a=rsa-sha256; cv=none; b=wUkXG60Dvmjmln2SWzuxBVi2orr9DCu1Cbc3qVakaYa8a+4XY4JixU8WAG3sQVZe5qjE4f Hl3NI0J05F4KWhiAa8c3kDA4ZzDS8pQN8qP5+mT7AnX+N7OS8S2Q7iU7nmy+bFVN7KNNal eg+39mv6gNKjs7G2+g14RntD5aEO7xcRKevh8kcH/i4UY3+p3W/HPDdQZKTJ97+EBnqmA4 nNcMPwCaI2SsJcsPLx07FNW/guCDpKx2fH6oWSTVygFRz0A62ZYBKPCA5IxTUxJVudN4yR 4vcjOTa+0x3S0OaHMBoMAw6rHGfM/XbAOVGmSV8T50pm/OPDvCHZrE+AuI441Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9PnD5jw8zjtg; Mon, 25 Aug 2025 08:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57P8vKtR016647; Mon, 25 Aug 2025 08:57:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57P8vKJh016644; Mon, 25 Aug 2025 08:57:20 GMT (envelope-from git) Date: Mon, 25 Aug 2025 08:57:20 GMT Message-Id: <202508250857.57P8vKJh016644@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: 56e00aca338c - stable/14 - zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 56e00aca338cc45c3fbd4f95c2a8bb8dfac1efb7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=56e00aca338cc45c3fbd4f95c2a8bb8dfac1efb7 commit 56e00aca338cc45c3fbd4f95c2a8bb8dfac1efb7 Author: Konstantin Belousov AuthorDate: 2025-08-16 01:33:09 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-25 08:42:18 +0000 zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS (cherry picked from commit 9a3edc8d5dbcb896179cfa7867f961184e146a09) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index c477ad55dbaa..f87182d1c484 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -1561,6 +1561,7 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, objset_t *os; caddr_t outbuf; size_t bufsize; + ssize_t orig_resid; zap_cursor_t zc; zap_attribute_t zap; uint_t bytes_wanted; @@ -1609,6 +1610,7 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, error = 0; os = zfsvfs->z_os; offset = zfs_uio_offset(uio); + orig_resid = zfs_uio_resid(uio); prefetch = zp->z_zn_prefetch; /* @@ -1786,7 +1788,7 @@ update: kmem_free(outbuf, bufsize); if (error == ENOENT) - error = 0; + error = orig_resid == zfs_uio_resid(uio) ? EINVAL : 0; ZFS_ACCESSTIME_STAMP(zfsvfs, zp); From nobody Mon Aug 25 15:22:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZL10P8tz65vxk; Mon, 25 Aug 2025 15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZL06rcWz3XMN; Mon, 25 Aug 2025 15: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=1756135369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aBuQBMZJ9GygwPNDIuUwtQnCZdfqZ3zHJKaDEblL4OI=; b=cATHqrgdPd3UVWlqWYicnQMIyw4YzchiLtNErDEQmlrmBVJOnwxciHp1eZnyPhlXU7NJHv YvDoI72F/+r+X4eUZpHSy3UOiQtO3nGxJ5cZG9yUeqqzXrg/wbfOKzWcxL8QINNwAdBZM2 /PpGTsH8tstHENVEanYucrwDTg2XIxVEOqOeE/93KxKFNGae1zYmZBjXpzI70yjC9qJfXd pPSEVtDhfibiWTOYiJzTSvnptmNogYrnnyQfqIcKpuj7yCmaGoKoMdQtgCCNiZL4vndDNV yzZPLHAtlfanX/6wJGgmZEs1Rd5FSy48qaIiKfXH1fOWJX+6RGeBNpJF6JvqPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aBuQBMZJ9GygwPNDIuUwtQnCZdfqZ3zHJKaDEblL4OI=; b=sQLg14rHA+QWY5SgiBrDs/myb+OMWLvVy4KaLQ+HzCga8/UtaKjFbL2H25tPknRrAfegrJ 4rg6YvKN0V2LvcrUT4B2tw7iofanudvsr10GO3e1dmEqT0Epkl+CQ/sJ4EzICjuwpdWyNp 2tUQDpo5e/epxGloasdvz77YxT4Ch/pSnD5ChUAdfNaKLxVGM+Z9YLw92c35YysZEY7S24 nDTwJCtmXBoEM6bQDYG/LH1t2pkquZ9R1+XjK3Bma7lt7Kgj+opYoFx3i91xxMgt04rfJh dnx5VtzNLLQ7SKJPM0G1J5F9+jIFsgjjPWwIi57q7qBGMKb5VuYfA/S6ME89tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135369; a=rsa-sha256; cv=none; b=EQgEDK5xZRC4BIsR5ZsI34/S58AnxuCe7S7Wr4gfDD1/VeuZ0b2iBZIRG+lmixVCnIvX2j aBIdOm4T4gqCuvCX4dUV7KozqgIzfgVv50BhLSceoZlYRDWM1s/p93ErtAkuyeFFrY2Nfb lCaFhAM8EKkHdk94qSxbstO3N15TaejxkY+69Qmk/uD4hCcivSbra3UHi1GAeq3CvOoyCk d6+3/JNs+XolkO91Flgy2/vVCqePTP3Qr52LqaudpJM67YNs5s5+slcUQzAK8WaBem70pU JBfPvo/YTU/HH75blqVtWmVkgubWH4rLUQojsm0Ha+6YohgX3eaUoCj6WL4q6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZL06QXlzvl6; Mon, 25 Aug 2025 15:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFMmTB053855; Mon, 25 Aug 2025 15:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMmhQ053852; Mon, 25 Aug 2025 15:22:48 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:48 GMT Message-Id: <202508251522.57PFMmhQ053852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 10bb227a7d10 - stable/14 - vfs: Move DEBUG_VFS_LOCKS checks to INVARIANTS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 10bb227a7d10cbdc859473424cc0c1ab0adbf503 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=10bb227a7d10cbdc859473424cc0c1ab0adbf503 commit 10bb227a7d10cbdc859473424cc0c1ab0adbf503 Author: Mark Johnston AuthorDate: 2025-07-17 21:54:32 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:56 +0000 vfs: Move DEBUG_VFS_LOCKS checks to INVARIANTS It is easy to forget to configure DEBUG_VFS_LOCKS, and when one does, no vnode lock assertions are checked when INVARIANTS is configured, so bugs can arise. This has happened to me more than once, and the overhead over DEBUG_VFS_LOCKS does not appear to be high enough to prohibit folding it into INVARIANTS, so let's do that. The change makes vnode lock assertions useful in plain INVARIANTS kernels, and guards VOP debug routines on INVARIANTS rather than DEBUG_VFS_LOCKS. Further, invariants are now checked by plain assertions rather than having various sysctls to finely control what happens the checks fail. The extra complexity didn't seem particularly useful and is at odds with how we handle debugging most everywhere else. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51402 (cherry picked from commit 3bd8fab2415bf517d169fed2aa345ef08a977a98) --- sys/kern/vfs_subr.c | 103 ++++++++++++++----------------------------------- sys/sys/vnode.h | 8 ++-- sys/tools/vnode_if.awk | 6 +-- 3 files changed, 37 insertions(+), 80 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 7ff6ac5f5b44..c0322593dead 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -100,10 +100,6 @@ #include #include -#if defined(DEBUG_VFS_LOCKS) && (!defined(INVARIANTS) || !defined(WITNESS)) -#error DEBUG_VFS_LOCKS requires INVARIANTS and WITNESS -#endif - #ifdef DDB #include #endif @@ -5667,102 +5663,69 @@ extattr_check_cred(struct vnode *vp, int attrnamespace, struct ucred *cred, } } -#ifdef DEBUG_VFS_LOCKS -int vfs_badlock_ddb = 1; /* Drop into debugger on violation. */ -SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_ddb, CTLFLAG_RW, &vfs_badlock_ddb, 0, - "Drop into debugger on lock violation"); - -int vfs_badlock_mutex = 1; /* Check for interlock across VOPs. */ -SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_mutex, CTLFLAG_RW, &vfs_badlock_mutex, - 0, "Check for interlock across VOPs"); - -int vfs_badlock_print = 1; /* Print lock violations. */ -SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_print, CTLFLAG_RW, &vfs_badlock_print, - 0, "Print lock violations"); - -int vfs_badlock_vnode = 1; /* Print vnode details on lock violations. */ -SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_vnode, CTLFLAG_RW, &vfs_badlock_vnode, - 0, "Print vnode details on lock violations"); - -#ifdef KDB -int vfs_badlock_backtrace = 1; /* Print backtrace at lock violations. */ -SYSCTL_INT(_debug, OID_AUTO, vfs_badlock_backtrace, CTLFLAG_RW, - &vfs_badlock_backtrace, 0, "Print backtrace at lock violations"); -#endif - -static void -vfs_badlock(const char *msg, const char *str, struct vnode *vp) -{ - -#ifdef KDB - if (vfs_badlock_backtrace) - kdb_backtrace(); -#endif - if (vfs_badlock_vnode) - vn_printf(vp, "vnode "); - if (vfs_badlock_print) - printf("%s: %p %s\n", str, (void *)vp, msg); - if (vfs_badlock_ddb) - kdb_enter(KDB_WHY_VFSLOCK, "lock violation"); -} - +#ifdef INVARIANTS void assert_vi_locked(struct vnode *vp, const char *str) { - - if (vfs_badlock_mutex && !mtx_owned(VI_MTX(vp))) - vfs_badlock("interlock is not locked but should be", str, vp); + VNASSERT(mtx_owned(VI_MTX(vp)), vp, + ("%s: vnode interlock is not locked but should be", str)); } void assert_vi_unlocked(struct vnode *vp, const char *str) { - - if (vfs_badlock_mutex && mtx_owned(VI_MTX(vp))) - vfs_badlock("interlock is locked but should not be", str, vp); + VNASSERT(!mtx_owned(VI_MTX(vp)), vp, + ("%s: vnode interlock is locked but should not be", str)); } void assert_vop_locked(struct vnode *vp, const char *str) { + bool locked; + if (KERNEL_PANICKED() || vp == NULL) return; #ifdef WITNESS - if ((vp->v_irflag & VIRF_CROSSMP) == 0 && - witness_is_owned(&vp->v_vnlock->lock_object) == -1) + locked = !((vp->v_irflag & VIRF_CROSSMP) == 0 && + witness_is_owned(&vp->v_vnlock->lock_object) == -1); #else - int locked = VOP_ISLOCKED(vp); - if (locked == 0 || locked == LK_EXCLOTHER) + int state = VOP_ISLOCKED(vp); + locked = state != 0 && state != LK_EXCLOTHER; #endif - vfs_badlock("is not locked but should be", str, vp); + VNASSERT(locked, vp, ("%s: vnode is not locked but should be", str)); } void assert_vop_unlocked(struct vnode *vp, const char *str) { + bool locked; + if (KERNEL_PANICKED() || vp == NULL) return; #ifdef WITNESS - if ((vp->v_irflag & VIRF_CROSSMP) == 0 && - witness_is_owned(&vp->v_vnlock->lock_object) == 1) + locked = (vp->v_irflag & VIRF_CROSSMP) == 0 && + witness_is_owned(&vp->v_vnlock->lock_object) == 1; #else - if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) + locked = VOP_ISLOCKED(vp) == LK_EXCLUSIVE; #endif - vfs_badlock("is locked but should not be", str, vp); + VNASSERT(!locked, vp, ("%s: vnode is locked but should not be", str)); } void assert_vop_elocked(struct vnode *vp, const char *str) { + bool locked; + if (KERNEL_PANICKED() || vp == NULL) return; - if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE) - vfs_badlock("is not exclusive locked but should be", str, vp); + locked = VOP_ISLOCKED(vp) == LK_EXCLUSIVE; + VNASSERT(locked, vp, + ("%s: vnode is not exclusive locked but should be", str)); } -#endif /* DEBUG_VFS_LOCKS */ +#endif /* INVARIANTS */ void vop_rename_fail(struct vop_rename_args *ap) @@ -5783,7 +5746,7 @@ vop_rename_pre(void *ap) { struct vop_rename_args *a = ap; -#ifdef DEBUG_VFS_LOCKS +#ifdef INVARIANTS if (a->a_tvp) ASSERT_VI_UNLOCKED(a->a_tvp, "VOP_RENAME"); ASSERT_VI_UNLOCKED(a->a_tdvp, "VOP_RENAME"); @@ -5819,7 +5782,7 @@ vop_rename_pre(void *ap) vhold(a->a_tvp); } -#ifdef DEBUG_VFS_LOCKS +#ifdef INVARIANTS void vop_fplookup_vexec_debugpre(void *ap __unused) { @@ -5932,13 +5895,7 @@ vop_strategy_debugpre(void *ap) if ((bp->b_flags & B_CLUSTER) != 0) return; - if (!KERNEL_PANICKED() && !BUF_ISLOCKED(bp)) { - if (vfs_badlock_print) - printf( - "VOP_STRATEGY: bp is not locked but should be\n"); - if (vfs_badlock_ddb) - kdb_enter(KDB_WHY_VFSLOCK, "lock violation"); - } + BUF_ASSERT_LOCKED(bp); } void @@ -5987,7 +5944,7 @@ vop_need_inactive_debugpost(void *ap, int rc) ASSERT_VI_LOCKED(a->a_vp, "VOP_NEED_INACTIVE"); } -#endif +#endif /* INVARIANTS */ void vop_create_pre(void *ap) @@ -6113,7 +6070,7 @@ vop_mkdir_post(void *ap, int rc) VFS_KNOTE_LOCKED(dvp, NOTE_WRITE | NOTE_LINK); } -#ifdef DEBUG_VFS_LOCKS +#ifdef INVARIANTS void vop_mkdir_debugpost(void *ap, int rc) { @@ -6549,7 +6506,7 @@ vfs_knlunlock(void *arg) static void vfs_knl_assert_lock(void *arg, int what) { -#ifdef DEBUG_VFS_LOCKS +#ifdef INVARIANTS struct vnode *vp = arg; if (what == LA_LOCKED) diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index e32756b906ab..22839659f047 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -533,7 +533,7 @@ extern struct vnodeop_desc *vnodeop_descs[]; #define VOPARG_OFFSETTO(s_type, s_offset, struct_p) \ ((s_type)(((char*)(struct_p)) + (s_offset))) -#ifdef DEBUG_VFS_LOCKS +#ifdef INVARIANTS /* * Support code to aid in debugging VFS locking problems. Not totally * reliable since if the thread sleeps between changing the lock @@ -567,7 +567,7 @@ void assert_vop_unlocked(struct vnode *vp, const char *str); VNPASS(!seqc_in_modify(_vp->v_seqc), _vp); \ } while (0) -#else /* !DEBUG_VFS_LOCKS */ +#else /* !INVARIANTS */ #define ASSERT_VI_LOCKED(vp, str) ((void)0) #define ASSERT_VI_UNLOCKED(vp, str) ((void)0) @@ -578,7 +578,7 @@ void assert_vop_unlocked(struct vnode *vp, const char *str); #define ASSERT_VOP_IN_SEQC(vp) ((void)0) #define ASSERT_VOP_NOT_IN_SEQC(vp) ((void)0) -#endif /* DEBUG_VFS_LOCKS */ +#endif /* INVARIANTS */ /* * This call works for vnodes in the kernel. @@ -949,7 +949,7 @@ void vop_symlink_pre(void *a); void vop_symlink_post(void *a, int rc); int vop_sigdefer(struct vop_vector *vop, struct vop_generic_args *a); -#ifdef DEBUG_VFS_LOCKS +#ifdef INVARIANTS void vop_fdatasync_debugpre(void *a); void vop_fdatasync_debugpost(void *a, int rc); void vop_fplookup_vexec_debugpre(void *a); diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk index b477bbc91c43..e4fb29f4a8f0 100644 --- a/sys/tools/vnode_if.awk +++ b/sys/tools/vnode_if.awk @@ -89,7 +89,7 @@ function add_debug_code(name, arg, pos, ind) function add_debugpre(name) { if (lockdata[name, "debugpre"]) { - printc("#ifdef DEBUG_VFS_LOCKS"); + printc("#ifdef INVARIANTS"); printc("\t"lockdata[name, "debugpre"]"(a);"); printc("#endif"); } @@ -98,7 +98,7 @@ function add_debugpre(name) function add_debugpost(name) { if (lockdata[name, "debugpost"]) { - printc("#ifdef DEBUG_VFS_LOCKS"); + printc("#ifdef INVARIANTS"); printc("\t"lockdata[name, "debugpost"]"(a, rc);"); printc("#endif"); } @@ -342,7 +342,7 @@ while ((getline < srcfile) > 0) { for (i = 0; i < numargs; ++i) printh("\ta.a_" args[i] " = " args[i] ";"); if (can_inline(name)) { - printh("\n#if !defined(DEBUG_VFS_LOCKS) && !defined(INVARIANTS) && !defined(KTR)"); + printh("\n#if !defined(INVARIANTS) && !defined(KTR)"); printh("\tif (!SDT_PROBES_ENABLED())"); printh("\t\treturn (" args[0]"->v_op->"name"(&a));"); printh("\telse"); From nobody Mon Aug 25 15:22:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZL22ZYXz65w1B; Mon, 25 Aug 2025 15:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZL20rvZz3XZn; Mon, 25 Aug 2025 15: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=1756135370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OkDHJzja20DB22lXXnJhCtsw511yQFe+qceDlU1oa5w=; b=vZgyK+cHb1GKgBbMhS3croRlWZrLZIRzS9ZGNWDUe6HOcVZycN9VK0USOVCJhh7gCzOEBN HcKnarUbxwDoPUv814iUjH7/8wPl27MpKU94fGypFLX6D0WPYPhszfNlQDHO69hSgfAtAJ 4eez7ygx4hn3DPqR9Sg9hPd80DEXcK2456PX/REjgL3PaadGh2krQbTPN/AF30I5ng8Ukv lrbzBwGdWG46UXTn+0Nv52j5i3dda0mxeCKW6zHQ/8/p4d7qCXE/K71a9LcbuSvHmR0U/x twrEIdbOzZF7rn9Jc7k5rrbV3oaj0IvNpt2IJzXwlfmGY/a9fZlIGzT1S/Ym1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OkDHJzja20DB22lXXnJhCtsw511yQFe+qceDlU1oa5w=; b=jjpPelPi3n9OqDI1FaIGpDmH3VtFRatayQCIBivXBbVux3GuYmoBUVF+x4doASBgJs1Nol bppWd7pkUkC9El1U/VR93T0RyV3UVEfFP+1YOygUHw2e8pY5+kNUy4Tq6H2xhENZwjLX76 bi2X4JUtIBMKUTp6LYpEm5/cpt/4uqILRp26jxR5D5rExRwo4qXk/A+tN2Q5wvZrFuykYN k9JkO7Z74Valll6ySXK5zjSpvz/rMjBpvPdZYXBlwH1xRms5H/J0V1zXLh9jsv1IS8Yl7r 4G5Fw5lfVLdif+JRDFBKziM/ET24Nfas473JP+fG+T74cU+8PlXCh1BaA3Fr5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135370; a=rsa-sha256; cv=none; b=vfg6tynjJ5hbp5P9vtGG3lieZ8XbsbmDa8ShmiKGoJlXrT1fv3fVrGHIHwggtZO3FRGYJ3 8imNG8WiH5Pf369/0rFIbzk+LpV8den7jfmvbEk2j/fCygANd1sHp/EdO4bCoEXEYaSEjb PzrnBevUsYVJVMKJ/d9TDgBSPddPek3+XwfPKVyoBD86Np17SL/JBUxCnMwgTGivdVh+ZB A5+qr6ASFSIsaRgBCz9D4VLRkMIbzv11+wVM1xzcB03qm3u4bh2aEb0NjIXepHFkI1JFtS eOb+ae1EhyqeOCRYA3wbM/eCruu/NcCdNFeyQj9nzwMlbkSWaakAxh9B+SXb9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZL20CdFzvx4; Mon, 25 Aug 2025 15:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFMnrX053889; Mon, 25 Aug 2025 15:22:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMn9x053886; Mon, 25 Aug 2025 15:22:49 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:49 GMT Message-Id: <202508251522.57PFMn9x053886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a58eb4d233bf - stable/14 - lib: Fix calls that naively set F_SETFD. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a58eb4d233bfdddff243faec071f8dc18d3e5492 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a58eb4d233bfdddff243faec071f8dc18d3e5492 commit a58eb4d233bfdddff243faec071f8dc18d3e5492 Author: Ricardo Branco AuthorDate: 2025-07-14 20:10:38 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:56 +0000 lib: Fix calls that naively set F_SETFD. With the recent inclusion of the FD_CLOFORK and FD_RESOLVE_BENEATH flags, we must avoid clearing them when setting only FD_CLOEXEC. Signed-off-by: Ricardo Branco Reviewed by: kib, markj MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1766 (cherry picked from commit 8768b60de16a3d72a8783ec1241a711a782a36a9) --- lib/libc/gen/fdopendir.c | 10 +++++++++- lib/libc/stdio/fdopen.c | 18 ++++++++++++++---- lib/libc/stdio/freopen.c | 10 +++++++--- lib/libfetch/common.c | 7 +++++-- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/lib/libc/gen/fdopendir.c b/lib/libc/gen/fdopendir.c index 67c0766b6d83..85c4451f9b48 100644 --- a/lib/libc/gen/fdopendir.c +++ b/lib/libc/gen/fdopendir.c @@ -49,8 +49,16 @@ DIR * fdopendir(int fd) { + int flags, rc; - if (_fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) + flags = _fcntl(fd, F_GETFD, 0); + if (flags == -1) return (NULL); + + if ((flags & FD_CLOEXEC) == 0) { + rc = _fcntl(fd, F_SETFD, flags | FD_CLOEXEC); + if (rc == -1) + return (NULL); + } return (__opendir_common(fd, DTF_HIDEW | DTF_NODUP, true)); } diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c index a4f2ac5b699b..59e16c74d51d 100644 --- a/lib/libc/stdio/fdopen.c +++ b/lib/libc/stdio/fdopen.c @@ -49,7 +49,7 @@ FILE * fdopen(int fd, const char *mode) { FILE *fp; - int flags, oflags, fdflags, tmp; + int flags, oflags, fdflags, rc, tmp; /* * File descriptors are a full int, but _file is only a short. @@ -79,9 +79,19 @@ fdopen(int fd, const char *mode) if ((fp = __sfp()) == NULL) return (NULL); - if ((oflags & O_CLOEXEC) && _fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) { - fp->_flags = 0; - return (NULL); + if ((oflags & O_CLOEXEC) != 0) { + tmp = _fcntl(fd, F_GETFD, 0); + if (tmp == -1) { + fp->_flags = 0; + return (NULL); + } + if ((tmp & FD_CLOEXEC) == 0) { + rc = _fcntl(fd, F_SETFD, tmp | FD_CLOEXEC); + if (rc == -1) { + fp->_flags = 0; + return (NULL); + } + } } fp->_flags = flags; diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c index f987d273d116..4d9bd3bd785d 100644 --- a/lib/libc/stdio/freopen.c +++ b/lib/libc/stdio/freopen.c @@ -58,7 +58,7 @@ freopen(const char * __restrict file, const char * __restrict mode, FILE * __restrict fp) { int f; - int dflags, flags, isopen, oflags, sverrno, wantfd; + int dflags, fdflags, flags, isopen, oflags, sverrno, wantfd; if ((flags = __sflags(mode, &oflags)) == 0) { sverrno = errno; @@ -116,8 +116,12 @@ freopen(const char * __restrict file, const char * __restrict mode, (void) ftruncate(fp->_file, (off_t)0); if (!(oflags & O_APPEND)) (void) _sseek(fp, (fpos_t)0, SEEK_SET); - if (oflags & O_CLOEXEC) - (void) _fcntl(fp->_file, F_SETFD, FD_CLOEXEC); + if ((oflags & O_CLOEXEC) != 0) { + fdflags = _fcntl(fp->_file, F_GETFD, 0); + if (fdflags != -1 && (fdflags & FD_CLOEXEC) == 0) + (void) _fcntl(fp->_file, F_SETFD, + fdflags | FD_CLOEXEC); + } f = fp->_file; isopen = 0; wantfd = -1; diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index dfa742577585..22779876ded4 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -278,13 +278,16 @@ conn_t * fetch_reopen(int sd) { conn_t *conn; + int flags; int opt = 1; /* allocate and fill connection structure */ if ((conn = calloc(1, sizeof(*conn))) == NULL) return (NULL); - fcntl(sd, F_SETFD, FD_CLOEXEC); - setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof opt); + flags = fcntl(sd, F_GETFD); + if (flags != -1 && (flags & FD_CLOEXEC) == 0) + (void)fcntl(sd, F_SETFD, flags | FD_CLOEXEC); + (void)setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); conn->sd = sd; ++conn->ref; return (conn); From nobody Mon Aug 25 15:22:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZL36crzz65vmW; Mon, 25 Aug 2025 15:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZL31tp5z3XXn; Mon, 25 Aug 2025 15:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8gOk3yCVK0j9PIfhEUXcGhRce3l0gx8Xt2w6GmwZgBs=; b=M+w0iDsJX0SHDk9gtw6a8IN8Vf7Ksno7FPad/g1LhR/P0pmOxxM4ZG6y6GcKcZVnQh+Dj3 SvZ9RBSmd1eZfHhrA4BWcqU7LtBRPXvZoFijmAgUVb8n4t8MsKZxKat/iQDFnM31aIdTzE RAXS2/QiRbSXmQFG8M5+gVPlfylyzSSPMTLgR3Uib6qrFAsDOgP8zlL29xwiSNdQCE561f XxrrSm8iy7NpQDPaQCyMmp9nf93Q6dlkEFEFzuYQMEH3xkPiSo4WfKJJ9f+BTyzSVMf2nY BVKRTW0/S//2Tb/DM2FXnWNJYQU4CM/vB+4uy00xb08po3ZgSPqRyheSxx8Tig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8gOk3yCVK0j9PIfhEUXcGhRce3l0gx8Xt2w6GmwZgBs=; b=ftClG2Bt64jXTuE8Q0yLkYPW01XMLDdRg/z6LMCm6y01zKydnduQnYHxgJLeXpFEliXYoe dYJd3vcQO/yHZ6TNOBvLDjlSh/5yaeIxoOHBnwXDjL+xJEYdW8DFRdo9Gwz374cGMbUCvw CR1DGjpPekjtVwDtWLFnQzQSfHkbotxkIPXX+ixK5pJDqauYKFTlhV/t3/auxeTFGx+1da upjUvNJaj2Mh5/3uBD+oSIeRIzcDHvcTTkTvAP8Rdzl0JKW54h8gz1tUoKHiSGPXIsB+i6 HpaZdZVRqD89okYtQZHFDDNnTGTXmENMysXHfgNTaMinAGVH8i2Y5M//9RWefg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135371; a=rsa-sha256; cv=none; b=kiWnbYUPCy5Srm/q5ONMfwIjsHDUnEFf8p9kx+Y3UclrwXxYn9SAARGJvENoN/2MWedZsy H1Maxu5XmjQLVs0YsFsmAQAxDBDVlxxtYgfTxZ6GctNT3Ko9qQUP79RLB4fGoinydlsoyE 1hZMrBIYKDVjd8aF5m3BSkl7peW01kX9oxgUHOaqPIg7w4atNExZK+zWuIBgwpTWSEF6/K bugQmXhyGqmM2RgPvLlOW8Meut3fvs2QcNjFugUcFqA4olL6FNtkc+HqkvKEnFT7PALl73 gn5Y7DCB5ENJK1jcvlWfi3AFzPuB6hkdnlQ/TkDnNcirJzzveC2+IfC2jaG67A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZL31QzFzvx5; Mon, 25 Aug 2025 15:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFMp9C053923; Mon, 25 Aug 2025 15:22:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMp4w053920; Mon, 25 Aug 2025 15:22:51 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:51 GMT Message-Id: <202508251522.57PFMp4w053920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d033848a5e4c - stable/14 - ufs: Remove uses of DEBUG_VFS_LOCKS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d033848a5e4ca02b20c55b8e8601c57087dafb81 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d033848a5e4ca02b20c55b8e8601c57087dafb81 commit d033848a5e4ca02b20c55b8e8601c57087dafb81 Author: Mark Johnston AuthorDate: 2025-07-24 15:27:56 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:56 +0000 ufs: Remove uses of DEBUG_VFS_LOCKS All of these assertions can reasonably be checked when plain INVARIANTS is configured, there's no need to configure a separate option. Reviewed by: olce, imp, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51696 (cherry picked from commit 4798f1e8f28d1bd440987696b3474eb6ca764fde) --- sys/ufs/ffs/ffs_softdep.c | 2 -- sys/ufs/ffs/ffs_vnops.c | 2 -- sys/ufs/ufs/ufs_lookup.c | 2 -- sys/ufs/ufs/ufs_quota.c | 4 ---- 4 files changed, 10 deletions(-) diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 54a0466da88c..70807552c8c8 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -14528,10 +14528,8 @@ getdirtybuf(struct buf *bp, BUF_UNLOCK(bp); if (waitfor != MNT_WAIT) return (NULL); -#ifdef DEBUG_VFS_LOCKS if (bp->b_vp->v_type != VCHR) ASSERT_BO_WLOCKED(bp->b_bufobj); -#endif bp->b_vflags |= BV_BKGRDWAIT; rw_sleep(&bp->b_xflags, lock, PRIBIO, "getbuf", 0); return (NULL); diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 03dcb27ff6f7..bf90387ccd59 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -511,9 +511,7 @@ ffs_lock( case LK_EXCLUSIVE: flags = ap->a_flags; for (;;) { -#ifdef DEBUG_VFS_LOCKS VNPASS(vp->v_holdcnt != 0, vp); -#endif /* DEBUG_VFS_LOCKS */ lkp = vp->v_vnlock; result = lockmgr_lock_flags(lkp, flags, &VI_MTX(vp)->lock_object, ap->a_file, ap->a_line); diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index 423c4c2e4e28..af348157c87d 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -232,7 +232,6 @@ ufs_lookup_ino(struct vnode *vdp, struct vnode **vpp, struct componentname *cnp, bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1; -#ifdef DEBUG_VFS_LOCKS /* * Assert that the directory vnode is locked, and locked * exclusively for the last component lookup for modifying @@ -250,7 +249,6 @@ ufs_lookup_ino(struct vnode *vdp, struct vnode **vpp, struct componentname *cnp, if ((nameiop == CREATE || nameiop == DELETE || nameiop == RENAME) && (flags & (LOCKPARENT | ISLASTCN)) == (LOCKPARENT | ISLASTCN)) ASSERT_VOP_ELOCKED(vdp, "ufs_lookup2"); -#endif restart: bp = NULL; diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 52fc6c08fdf9..f9427a5f152c 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -1280,10 +1280,8 @@ dqget(struct vnode *vp, uint64_t id, struct ufsmount *ump, int type, struct uio auio; int dqvplocked, error; -#ifdef DEBUG_VFS_LOCKS if (vp != NULLVP) ASSERT_VOP_ELOCKED(vp, "dqget"); -#endif if (vp != NULLVP && *dqp != NODQUOT) { return (0); @@ -1555,10 +1553,8 @@ dqsync(struct vnode *vp, struct dquot *dq) struct mount *mp; struct ufsmount *ump; -#ifdef DEBUG_VFS_LOCKS if (vp != NULL) ASSERT_VOP_ELOCKED(vp, "dqsync"); -#endif mp = NULL; error = 0; From nobody Mon Aug 25 15:22:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZL44KWfz65w9t; Mon, 25 Aug 2025 15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZL42qrsz3Xb5; Mon, 25 Aug 2025 15: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=1756135372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=drShO6BJVWHs5nDbUSn/dy3Al3K/NCWpc44RS1eIcAM=; b=u53CuH5jEwnV7VLmcc/NBodmITHDcqkikn6RbjMO2ClNQQl7snZmaXwMX7ZN3RpJU8o2Zs 1yTDoY5kpTnJ01RnQWwzUjUZHu8oaaZ6UzSxi1HRqiuemzooAj73A+nlbAO6AD7hUXIoPr 7bjuZQPvtS+GqRTCvFR1bSLMOaXsID/zmGMHjoR9Cft/TgTlP80+MbzeEtueQbtjHfNVBg Lr6LWEr8tGEaKvUNUwvwIRu9bRT0KDlrTDqsV1+Qi9NbOBlEasu9gSlExFPJ584Ttq+f9l Glr2BtpfEmCy6CEIUd73YixsQdZPLU7U2SK2FcB0T89FcxF8+kjH0Ndz5WFVmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=drShO6BJVWHs5nDbUSn/dy3Al3K/NCWpc44RS1eIcAM=; b=B48yHhk2wokqQ1szwGTn0MWuipmNCpNS3CH4veyw5YzJKgs5pI1Js3Op3XcitwEc5W6MoM jew4kMWktg7ev15aYQS8kI24efYHbi3gOwdMjYrCs0M5fEzpOLptaoIUYcjiuh5fVPu2we pWDi9dF6jBLbHWSd/k99QSJOhvWNKgbwIEsxSxAd80v9j3hRaiHm9tX849+bscotrz6L5F gFta3d4BzqPXAcr+OXVZedVyh9kP4+LMHMwq5kixn4nvrONrqlYE2Doe3y2zoikm3bKQpR grPAGLGAGTdvEQFGI8kqSwhYjYgZnWvzdQCA/qZRicphfi6yafNSuVv0LArAfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135372; a=rsa-sha256; cv=none; b=vWq1Nc8n4RhvlxMlqU9KCij08xU78tqhVPH4yeVrLfOFccE/ci59ReDGZ6VhYdsZSTHThN JiwAZlHtsRELk4k+Tm3s0lSacWaQ/iFSTQYEWxjQ1fprA7QuXiN3VZuy6hUdms2QKBr+lV ZuHFE4BlaNfczIQJmJTUEqElskYzpbuwEBvPXfgJb88l4kc8WxrXgbYbjE0b/iJYuLyqNp D4vI8c0d+8PIieIry74++GWtvXohJk3/EQ38YeQyEItLl197C8BkOLYVvt82CxQQDMSiyv y1vEWGfnhmvuqjeiuT06K9/WemKQxu/bB6HySdTB112KcBg6IF7f18DCQ5wTkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZL42DW8zvl7; Mon, 25 Aug 2025 15:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFMqDT053958; Mon, 25 Aug 2025 15:22:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMqVT053955; Mon, 25 Aug 2025 15:22:52 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:52 GMT Message-Id: <202508251522.57PFMqVT053955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b532d0509b71 - stable/14 - tmpfs: Remove uses of DEBUG_VFS_LOCKS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b532d0509b715858ac7381c3d8f260c010595419 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b532d0509b715858ac7381c3d8f260c010595419 commit b532d0509b715858ac7381c3d8f260c010595419 Author: Mark Johnston AuthorDate: 2025-07-24 15:29:24 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:56 +0000 tmpfs: Remove uses of DEBUG_VFS_LOCKS This assertion can reasonably be checked when plain INVARIANTS is configured, there's no need to configure a separate option. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51697 (cherry picked from commit 4b56c7ff6c5b4e4f9dfd2eb09a5a901f4ff9b8b3) --- sys/fs/tmpfs/tmpfs_vnops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index d67f71202228..f875c6387673 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -384,7 +384,7 @@ static int tmpfs_access_locked(struct vnode *vp, struct tmpfs_node *node, accmode_t accmode, struct ucred *cred) { -#ifdef DEBUG_VFS_LOCKS +#ifdef INVARIANTS if (!mtx_owned(TMPFS_NODE_MTX(node))) { ASSERT_VOP_LOCKED(vp, "tmpfs_access_locked needs locked vnode or node"); From nobody Mon Aug 25 15:22:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZL56M64z65vkJ; Mon, 25 Aug 2025 15:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZL53Mrdz3XY0; Mon, 25 Aug 2025 15: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=1756135373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5F62hVGhTjGD2yMqlbMn67NE8H4AKwcppJHAR2/0Bf4=; b=dJ6/OY6tBtJz8ExQnkEfCe6V2wcRIDh3ql7aNtWPzsR7qKjESIRWr3JyPp4YXv7wJFW9OB XCmIr1XTTelzfIw6FQVV0W6r29RuzNhb/VT0QtVyzdTK1qXYguxM3cbf1KBKjaKMgO0HId P3kiLWMmQB8JRTu5B9ARpLqZ4NuIIXuTzznaVE9XxxD29VRNsfvKykN3UQIWzcwG1eY+Q+ Fjb9vGSAMd4xD0PqbczvZeyV2lguKFW/zKsCBJaafZShp1RP1cstZ0onayM9CygzyEsd/o 4SzhFA/dlLYJX7K8J62aopuhMY/iq3ziCRUUKbY+X7QL0llNj5hf+8X1sa6p7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5F62hVGhTjGD2yMqlbMn67NE8H4AKwcppJHAR2/0Bf4=; b=g73ekx9rPtDG5EgE2prJ7JN6mnr4uRCbItU+gk+raBb5dUEfCAjff9RQAgYGrfbH1wTss0 nInnt8/QWeN1dbCnOAn28VQF+wor78eLliOHhYnKgVqAllM69BhNo/aMMmJqaNNvUnQf3c ei8ZeNxQT6gIl1itWvDYvTkvo65dVrOEFIDC0F/OZE3MseXNyQTYDp3KKmkfodGq+LLlb2 sc1D5cqMS2aXj78SYk3/VQlpjJHUwd9VFCvrIYvsHMRdp5ae8JnmJgaYxMqad8PGeRsaBR lSdARgBjwakW3RYwBsWlnsY+1vav/zxnwvUvVxcR/l9xvz9PlUJsugcpawkVbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135373; a=rsa-sha256; cv=none; b=qSQW17bZp+fPJeED/2skynGQVUEdRU3RY22O4uaVeP+SLIj0m36NxDevm9MQJwjM0sDy1J sYLLHD55RnzxxvYoRrCDYDFVTuSZ8RKh8YVdxhiNc4dgz7oRLEPEzOi41amyJX30xqcGfP IGdmUYoWgvoRpRWPMPFDTLYy+KUy6euq4wq+CnRQAiUTrENmCbEgqFW/4AVo7WdBchWQTC HG08+1rZvf0RlQmH38muXSzA+v+UCWYS9Ux0XUhtgwv+3M+q+6irGZwPBonb76G0iXNVH7 QXyHqVirhOUq+4wNxWXs/sgxbfCSVEFHtipTDFz4184QgEXlXOtxGLVoPTZvXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZL52xxmzw6n; Mon, 25 Aug 2025 15:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFMrQu053997; Mon, 25 Aug 2025 15:22:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMrEr053994; Mon, 25 Aug 2025 15:22:53 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:53 GMT Message-Id: <202508251522.57PFMrEr053994@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 765b8ef6991c - stable/14 - mac: Remove uses of DEBUG_VFS_LOCKS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 765b8ef6991c317b4172f3ebc2db21beb8168627 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=765b8ef6991c317b4172f3ebc2db21beb8168627 commit 765b8ef6991c317b4172f3ebc2db21beb8168627 Author: Mark Johnston AuthorDate: 2025-07-24 15:30:15 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:57 +0000 mac: Remove uses of DEBUG_VFS_LOCKS We can assert that a vnode lock is held whenever INVARIANTS is configured. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51698 (cherry picked from commit 2daaf63d538b76b6c135c273cc17c56fac5a7535) --- sys/security/mac/mac_framework.h | 2 +- sys/security/mac/mac_vfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h index 99bb11be8796..831046e808e9 100644 --- a/sys/security/mac/mac_framework.h +++ b/sys/security/mac/mac_framework.h @@ -488,7 +488,7 @@ void mac_sysvshm_init(struct shmid_kernel *); void mac_thread_userret(struct thread *td); -#if defined(MAC) && defined(DEBUG_VFS_LOCKS) +#if defined(MAC) && defined(INVARIANTS) void mac_vnode_assert_locked(struct vnode *vp, const char *func); #else #define mac_vnode_assert_locked(vp, func) do { } while (0) diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index a50c6f0c8f26..dc2bfa7c643b 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -1078,7 +1078,7 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred) return (0); } -#ifdef DEBUG_VFS_LOCKS +#ifdef INVARIANTS void mac_vnode_assert_locked(struct vnode *vp, const char *func) { From nobody Mon Aug 25 15:22:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZL66RxTz65vh8; Mon, 25 Aug 2025 15:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZL64Tjwz3Xql; Mon, 25 Aug 2025 15: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=1756135374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iuxAXpDuHsba04R8D1VmU/3eyeja4VUCxTn0V8Kege8=; b=C7VSQJArbSc73BqI6tbbqvXjlP9cNwYSaI9DCBICR7+a7PAqprTl+glJmjjMQgABXtN7O8 b5sylpAko7HqG0xqDYCTNRpibiWinaW2v0Fq8bP7iK17cimX20Ml5HpVEquOAwe1nCoB9c R+yrLz3pN2XNPawmV46AA/v0LVL6Q/9kuEbDhkJVyVs08OfDZgs+Kx5uETJz3RnjjHRRnP Nl0kiNlyDidx0lI6wb/Ih3zxAVMCr0y/FZglX66TI4BW/FmjwGXhEaaNUhfcELjFHyy/z1 IaRgGPGffFo8FtRW9U/W4rWnGXZ7HjXEzTeGr/5d1SSxQmP25GGXN6fUXIU1nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iuxAXpDuHsba04R8D1VmU/3eyeja4VUCxTn0V8Kege8=; b=faroZYJ/dowFosZ54zq4FE6DXwHFdfPxFRn+dgkT9dH7W8O+qwFVpt3mj1UI0cCRrjNu7Y 3jCfX6K4DnX4+8/cWqASTZtOUpOmywQIUa46XrTP7laWT4Hb4FyASP3Jty1FBU3fwLkQlN CuvjHvvFCJo+eb9/KKTITShOp7WkkQj5mQ03igya1wwxVyH+jwlWw0pBwpRH7e6gbAWiNw R/5nBJhrKDmOgZosNhj7YuysqlJg8ZKJLd9CRpx0DOJhTwejJs7B0RiDJQqMGEDg1B0Y62 o1dHmuz63Fe/fBUpMcKYe255tCzjboftWsTiTbkSFng2vZ0DyUtQjhaoCCaB9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135374; a=rsa-sha256; cv=none; b=b6acvPJ9NizaqCan0CWl5vLXaiuXyR3uTLDBJNRcGZlTwL8JkHoK5zUJkbtZwS3Cbg9T4e uhTgDdJpn9QPursGTwoH83BVti+pNlplclAc9PLI50IXiT1M2/md5GY2IyRGlCmLXyxx8X Krv/eQQiC0VmjPvTHbur+VOOD+O/FF4vosBWxtpbqNtEBfjhBXZY4LkN/nwlTcJoZAlx+Z L8CKRU70BoRGAGfmqtw+8eEADDQXvp1aKrMcSOCEbgIylXfR0LzGC2nY29knBKumOVqetW muLp0Vih/6py4awKBs+Dh0HIFNvKCZxGlGfbjHwwNrz0LMdB7bv9nDFTvazW0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZL641qHzvl8; Mon, 25 Aug 2025 15:22:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFMsEX054034; Mon, 25 Aug 2025 15:22:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMsiu054031; Mon, 25 Aug 2025 15:22:54 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:54 GMT Message-Id: <202508251522.57PFMsiu054031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 88fff9ee2847 - stable/14 - vnode_pager: Remove uses of DEBUG_VFS_LOCKS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 88fff9ee28476ae00536bcc5b9cfdd37185143ae Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=88fff9ee28476ae00536bcc5b9cfdd37185143ae commit 88fff9ee28476ae00536bcc5b9cfdd37185143ae Author: Mark Johnston AuthorDate: 2025-07-24 16:51:10 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:57 +0000 vnode_pager: Remove uses of DEBUG_VFS_LOCKS This assertion can reasonably be checked when plain INVARIANTS is configured, there's no need to configure a separate option. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51699 (cherry picked from commit d733bca67055b6a49b4f7abe78c39188900a7720) --- sys/vm/vnode_pager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 496c3586c321..63ca629cc598 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -487,7 +487,7 @@ vnode_pager_setsize(struct vnode *vp, vm_ooffset_t nsize) if ((object = vp->v_object) == NULL) return; -#ifdef DEBUG_VFS_LOCKS +#ifdef INVARIANTS { struct mount *mp; From nobody Mon Aug 25 15:22:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZL76nvCz65vh9; Mon, 25 Aug 2025 15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZL75Gtxz3Xw8; Mon, 25 Aug 2025 15: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=1756135375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9AFBalJ5RidwYzD5QPULPmB7COKkYQ1iP5bZdrReo8o=; b=yJpBAwIVvG3PwkYOEy5puv+9Oce1tl7+2t5ds4IVFrfXsXWPH6XwO646MrmHI0awGO2E17 ttULiQCRTRs0sn81Ue9AmFCl8Ne+sa1VMMaREjlclCVSMKJkwEzNP0SFpIJm0O1BkHRsZ7 Op7u0Jxv2p2maTTVCmVLU7T3euLVn5gKPJJ7+dNsX6uoztmu3t4fYJH4pZ8ZasHf0fbOaS 9cg3Vd4QydVQ5HfhJoRycDTy4o0b4+P8CFt2Rrv91AxichQt0SYILMWDURn8eKbxMRADrw tjQ6l+Fdy56qeZRuigioK+YKUqtXcfi6sfI/IL4eNPzMfdUWombfqcXYwtyXlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9AFBalJ5RidwYzD5QPULPmB7COKkYQ1iP5bZdrReo8o=; b=ZaCSH4xKDaCwFr7LE5q26AmvZmoCgaa+nucJf4Py7qYI/hUchd2cgWkDY6f1gQdl1MjXys qS1J9sHGqzRE8h+Wh9IsGdw/mB2Q/P46O9XklJZD2XxH/QtsnvqeKgUCuhdWD2GxxXC1Gq hQpeNZ6QZcN9PaOW39hglRGtcpvcc0nrSvgBkurkoaXtq4GMVzoZIaTb6QsJ9FeYkFSsiN qxLhjLcBg6eDWC4g+b0hseuSEGIhjyzxPPS7FFa/nY6lrmY7LWmGUGl8Mz7Y9ATUZ+Y7yS WV5xUpOLuW6WHONAvbL1EX2U3PoS4ZKS+aTlz/CcwBtfsfU/S7IXOvPxXb4UGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135375; a=rsa-sha256; cv=none; b=dmMwyMHO/bkjxGPv+tJJhnl+H1ZzAOQKRem6kFqMGqW3XFOQZJFrpexSuUAxOJ1457Ntjx 8yIXJCey5zs5sjaz+UjC0NplhrKJdNWojR71kWJ9NAYb0CRpqR3WzlIZ6hTuzqcvlGAufO AfVebHfcI3K4qInNEtY5/wImX3kIOpXBb1t05eU1ugh+zykG0NFVvbSIA8xYvFq7FcXVCm IQpzx0isrbirr8/gLpJbTe9uFLbxdUs4sJeePzmwK6D3cao2Q/mElUrsD6/5F80Z6F2PlT BX5uY1GBfGx9/FXgzt9cUx1p462HA9gmq8vDASfxQ0yXoyuXOwE32dE2p6F7XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZL74bm5zvx6; Mon, 25 Aug 2025 15:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFMt3p054069; Mon, 25 Aug 2025 15:22:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMtPw054067; Mon, 25 Aug 2025 15:22:55 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:55 GMT Message-Id: <202508251522.57PFMtPw054067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d9ddd261ef3e - stable/14 - vm_page: Clear VM_ALLOC_NOCREAT in vm_page_grab_pflags() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9ddd261ef3e746704385889a38d275a32284de4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d9ddd261ef3e746704385889a38d275a32284de4 commit d9ddd261ef3e746704385889a38d275a32284de4 Author: Mark Johnston AuthorDate: 2025-08-01 23:34:46 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:57 +0000 vm_page: Clear VM_ALLOC_NOCREAT in vm_page_grab_pflags() Otherwise vm_page_grab_zero_partial() and vm_page_grab_pages() can pass it to vm_page_alloc_*(), which results in an assertion failure since that flag is meaningless when allocating a page: panic: invalid request 0x8400 cpuid = 0 time = 1754074745 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x49/frame 0xfffffe00542859c0 vpanic() at vpanic+0x1ea/frame 0xfffffe0054285b00 panic() at panic+0x43/frame 0xfffffe0054285b60 vm_page_alloc_domain_iter() at vm_page_alloc_domain_iter+0x720/frame 0xfffffe0054285be0 vm_page_grab_zero_partial() at vm_page_grab_zero_partial+0x1d4/frame 0xfffffe0054285c90 shm_fspacectl() at shm_fspacectl+0x1cd/frame 0xfffffe0054285d30 kern_fspacectl() at kern_fspacectl+0x49f/frame 0xfffffe0054285db0 sys_fspacectl() at sys_fspacectl+0x5b/frame 0xfffffe0054285e00 amd64_syscall() at amd64_syscall+0x29c/frame 0xfffffe0054285f30 fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe0054285f30 Reported by: syzkaller Reviewed by: alc, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51692 (cherry picked from commit 9a1b3303352beb44d48b8251b80656a316b7a2e9) --- sys/vm/vm_page.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 1da7ddce86a6..5b5282dc5c9b 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4553,7 +4553,7 @@ vm_page_grab_pflags(int allocflags) pflags = allocflags & ~(VM_ALLOC_NOWAIT | VM_ALLOC_WAITOK | VM_ALLOC_WAITFAIL | - VM_ALLOC_NOBUSY | VM_ALLOC_IGN_SBUSY); + VM_ALLOC_NOBUSY | VM_ALLOC_IGN_SBUSY | VM_ALLOC_NOCREAT); if ((allocflags & VM_ALLOC_NOWAIT) == 0) pflags |= VM_ALLOC_WAITFAIL; if ((allocflags & VM_ALLOC_IGN_SBUSY) != 0) From nobody Mon Aug 25 15:22:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZL91MRrz65w1J; Mon, 25 Aug 2025 15:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZL86G8yz3Y2H; Mon, 25 Aug 2025 15: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=1756135376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZIvhyb/J4EvGO8JaF+NGtaOp2VhScFreqH6BqulzCE0=; b=OcjHBUBQwweOOr7FcvqeNQlgzniJ+6aIbY2Ey3zauFFMGsV5wc1jNMg3DySwD8+VPXoUUE 0PxAwkI3lNGELBaz9pB/vTY2LhQ2XtXEj/bmu8KVfhRncH+mopOAqW45rDAEWA3+PXW1dM lYyRckGuMPaiQMn4rStP0SeWKDPCOjGyT5MEk1mmkz6JrJIcFYhPvlb71/Ih65pHBNgF0g 1Fmu/18CBeQyOregFbI5OgTCY7YZPpZdG+Wz1GCiMXiY+Jr49sejKqgCqxb58mYnbwlN4R osnT6sohmYs0OThuHEFUHAtvYBgMhiPu4UfnpeJESLVOEHFZcurO64C16TiMrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZIvhyb/J4EvGO8JaF+NGtaOp2VhScFreqH6BqulzCE0=; b=vkC+3fS8WOUVstP0u/nT7hprd07Oec07vw+YtqgFAehMJ8+Fr145mJOHqvj5C711XDUMFs gKEhGROcEbd3E2DgylcQLKZSCucFsNVhGYDwWqh0fu80HMwKcX8L/b2S88TXbdIqduGT4x So2wlk0+rQ0Rz7ppYK47PU3Lmkv+RE2qjxnEivMDphrWga3BaPo7W2mrFaqP08lGmOjHLC nI4KeNUSKHipyU7NS4m/dTdPglGi9rMJNGDDVULQWz0cDa3IPM2/yTadWcsq1m70bw71Nl wXahQbN9LGgIzO2NmznkqcujTaZJzYqiKSKneM9HHvTvBG+I0K5D/w0CvoWHSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135376; a=rsa-sha256; cv=none; b=vGpFv1t7vHed2/trzqVbTg4rHhwuy+RjNELaCIJa02e7aj99ujOPwqHmscrLfgzZDOEEEh ghhvbe8xycDec53ah3vovPDcY1PGHlGNhDoHyeOO2TO/uNLbFUIhknd4lOFjVVhQSqOsao 9yv7BMha4T2bEbQ5LHlnAr27JdrmVVfPbJaFi2hF2D/PNdntBeeSeY5fqPM0W7oHt2kMeR z27E8jGD1cldzBuDN4Q7Pi9IwY9VXN8ldzh9UpwrMTCVtsIV5qV7sPNEXVtpXfrpXG1NFa nkPSWTQ9ezq082Hn7qQOjk9Dj8ekYFQchT9YSuAHuz5NP6hFcwjrWHUoug2MZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZL85kgjzvx7; Mon, 25 Aug 2025 15:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFMuX1054104; Mon, 25 Aug 2025 15:22:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMuuZ054101; Mon, 25 Aug 2025 15:22:56 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:56 GMT Message-Id: <202508251522.57PFMuuZ054101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 58022811d353 - stable/14 - libdtrace: Permit taking the address of an identifier without type info List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 58022811d35382ffe48ab6b1edc4984c800f9841 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=58022811d35382ffe48ab6b1edc4984c800f9841 commit 58022811d35382ffe48ab6b1edc4984c800f9841 Author: Mark Johnston AuthorDate: 2025-07-21 13:34:30 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:57 +0000 libdtrace: Permit taking the address of an identifier without type info Symbols defined using assembler directives lack type info, but in this case one ought to be able to cast a pointer to the symbol and dereference the pointer to get a value. Without this change, D disallows this trick since it requires all identifiers to have a type. Relax the rules slightly and allow an identifier to have type "void" if we know we're just taking its address. As a result, the following dtrace invocation works: dtrace -n 'tick-1s {printf("%d", *(int *)&`ticks);}' In particular, since commit b2b974f7ef4c ("clock: Simplify subr_ticks and rename"), "ticks" does not have any type info associated with it, so its value couldn't be printed. This trick provides a workaround and is probably generally useful. Add a regression test which exercises this functionality. PR: 287752 Reviewed by: avg MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D51417 (cherry picked from commit dabde7d97680cac7e0ead56693d424f4e5631019) --- .../dtrace/test/tst/common/profile-n/tst.ticks.d | 54 ++++++++++++++++++++++ .../opensolaris/lib/libdtrace/common/dt_parser.c | 25 ++++++++-- .../opensolaris/lib/libdtrace/common/dt_parser.h | 1 + .../dtrace/tests/common/profile-n/Makefile | 1 + 4 files changed, 78 insertions(+), 3 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ticks.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ticks.d new file mode 100644 index 000000000000..4061db9858c1 --- /dev/null +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ticks.d @@ -0,0 +1,54 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright 2025 Mark Johnston + */ + +/* + * For 10s, verify that the value of `ticks goes up by `hz each second. + */ + +#pragma D option quiet + +BEGIN +{ + i = 0; +} + +tick-1s +{ + if (i == 0) { + t = *(int *)&`ticks; + i++; + } else { + u = *(int *)&`ticks; + if (u - t != `hz) { + printf("ticks: %d, expected %d\n", u - t, `hz); + exit(1); + } + t = u; + i++; + if (i == 10) { + exit(0); + } + } +} diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c index dd68f9278308..8cc504856567 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c @@ -1918,6 +1918,14 @@ dt_node_op1(int op, dt_node_t *cp) return (cp); } + /* + * When applying the addressof operator to an identifier, it's okay if + * we can't find type information for the identifier, so flag the node + * to ensure that we don't raise an error. + */ + if (op == DT_TOK_ADDROF && cp->dn_kind == DT_NODE_IDENT) + cp->dn_flags |= DT_NF_IDENTADDR; + dnp = dt_node_alloc(DT_NODE_OP1); assert(op <= USHRT_MAX); dnp->dn_op = (ushort_t)op; @@ -2786,10 +2794,21 @@ dt_xcook_ident(dt_node_t *dnp, dt_idhash_t *dhp, uint_t idkind, int create) dt_module_modelname(dtp->dt_ddefs)); } - xyerror(D_SYM_NOTYPES, + /* + * If we're taking the address of an identifier that + * doesn't have type info, try to make it a void *. + * This lets us use identifiers that are defined in + * assembly and don't have type information. + */ + if ((dnp->dn_flags & DT_NF_IDENTADDR) == 0 || + dtrace_lookup_by_type(dtp, DTRACE_OBJ_CDEFS, + "void", &dtt) != 0) { + xyerror(D_SYM_NOTYPES, "no symbolic type information is available for " - "%s%s%s: %s\n", dts.dts_object, mark, dts.dts_name, - dtrace_errmsg(dtp, dtrace_errno(dtp))); + "%s%s%s: %s\n", dts.dts_object, mark, + dts.dts_name, + dtrace_errmsg(dtp, dtrace_errno(dtp))); + } } idp = dt_ident_create(name, DT_IDENT_SYMBOL, 0, 0, diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h index 3a146c5d2592..1d2f33beee0f 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h @@ -182,6 +182,7 @@ typedef struct dt_node { #define DT_NF_WRITABLE 0x10 /* node is writable (can be modified) */ #define DT_NF_BITFIELD 0x20 /* node is an integer bitfield */ #define DT_NF_USERLAND 0x40 /* data is a userland address */ +#define DT_NF_IDENTADDR 0x80 /* node is an identifier address */ #define DT_TYPE_NAMELEN 128 /* reasonable size for ctf_type_name() */ diff --git a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile index 0e5439792b20..13a3202aa00d 100644 --- a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile @@ -38,6 +38,7 @@ ${PACKAGE}FILES= \ tst.profileusec.d \ tst.profileusec.d.out \ tst.sym.ksh \ + tst.ticks.d \ tst.ufunc.ksh \ tst.ufuncsort.ksh \ tst.ufuncsort.ksh.out \ From nobody Mon Aug 25 15:22:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZLB3ZG9z65vsX; Mon, 25 Aug 2025 15:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZLB06rtz3XYp; Mon, 25 Aug 2025 15:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XSUfR64KoM/2ECxsUZ2ISMqpOZiRgxVwt7OrPWYFkpA=; b=ZB+gUH0escI5q+SFxT3bgr++wwjdBLDuErETsH5CbDMxG3xmB6buXTjzqrsh9EFj5/2eom oWgVlkgxHDn4GuMrcA2RkGa5limP+Abh+7eBI3bR3tvmMOJeWUnZHQR/6MLKKynGVppEUp RrXtkJoNCifKylTlaOPtsb9TdXIMGyDFCNzyTTt7A/VXcc/UA9Q1syQwD+xwi7ccneWwOH RkzqlIjEnJfnTr3uly3ENCEAgooAjW3BLDgZ/YhdfAx3jsER2HoOLwBJNuTWeJ/G2q36uE oTQM5mKe9FcZhTGAl3IE0flAZ4mNkSFYLBMBUEbMpZYxZDNXqXG7uOh+fr44aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XSUfR64KoM/2ECxsUZ2ISMqpOZiRgxVwt7OrPWYFkpA=; b=CAlzO1ca1G0vCIDj2NXlAz+TTAIlJ9OvVfYRl+9oKpPTA0mESv0LP/bTBFpWtB4F9Nq1aF pGnTHUv4KE1ghfBoq91r7XoLkeoRa55fHigHpIWi2cMzvNWzrGELrrQx/sdjpjpMoCC7Gl DGnxBpMlxE6Ur43aEiA3XvNnpcTz+58+497cXbTa9pm2qj1z+mcfz6Zi1x5IOfZ6zWc91M t2D+RIrJuszGYA+O9y7Gzq7uf6Jt3DEszNyDYqWY0Unqtv0WiRhdVBvMNipscKISVKOhXZ CyU/Wk2pJLfXflg/nchoTpNuHEbmqliTufsaSUw0KkG/aq5dTEFSjR2IiKjeeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135378; a=rsa-sha256; cv=none; b=Hbxw8pPqqMO6HKo80WlIubgzKlQVYx/3ISgVZzTsB7S5fAfA83QYh4gdjruKkCMb9jw/OB AjSPJgBCUSEnMgdIKzABpcO4UIab8uJJs+fRp9Oz9/OBqD98gMJIrsFglAiY/UMm65jBEe lPVcEXOtz8MB48Q5MUrWs0TTtyeAGkprWtoY5hQKpgNTxf3TLjT3KRGV8tyDW4yTw66In7 UUEFjTipmqtMoJcDCJUqosnczavsOgp5vkXqVeppN+wyKGChmnTngVPKzRWQFEBvWLY17g ZJmS5rQ/vnI4MQUv8HCtm7OT3U+umigbOUJOmnJ0W0ynqE1ZY/pQuYy+bNz8CQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZL96TVPzvl9; Mon, 25 Aug 2025 15:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFMvIQ054139; Mon, 25 Aug 2025 15:22:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMv5f054136; Mon, 25 Aug 2025 15:22:57 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:57 GMT Message-Id: <202508251522.57PFMv5f054136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8fbaa731d538 - stable/14 - makefs/zfs: Make it possible to set a compression property List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8fbaa731d538fcbea8144d843b3d71037503cc78 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8fbaa731d538fcbea8144d843b3d71037503cc78 commit 8fbaa731d538fcbea8144d843b3d71037503cc78 Author: Mark Johnston AuthorDate: 2025-07-21 13:35:12 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:57 +0000 makefs/zfs: Make it possible to set a compression property makefs currently does not implement compression for ZFS datasets, as doing so seems somewhat fraught with compatibility issues. As a result, the root dataset has compression disabled, and all others inherit from that. However, it may be useful to enable compression for new files once the generated pool is actually imported. Thus, implement a per-data compression option. By default, compression is inherited from the parent dataset and disabled on the root dataset. Add a regression test. PR: 288241 MFC after: 1 month (cherry picked from commit d8f3e8781b2ce316120e9a5a42bb1174e9a53187) --- usr.sbin/makefs/makefs.8 | 10 +++- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 90 +++++++++++++++++++++++++++++++ usr.sbin/makefs/zfs/dsl.c | 44 +++++++++++++-- 3 files changed, 137 insertions(+), 7 deletions(-) diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8 index 803ae0714abd..bc6cf8e5e2d9 100644 --- a/usr.sbin/makefs/makefs.8 +++ b/usr.sbin/makefs/makefs.8 @@ -33,8 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 19, 2024 - +.Dd July 19, 2025 .Dt MAKEFS 8 .Os .Sh NAME @@ -596,10 +595,17 @@ The following properties may be set for a dataset: .Bl -tag -compact -offset indent .It atime .It canmount +.It compression .It exec .It mountpoint .It setuid .El +Note that +.Nm +does not implement compression of files included in the image, +regardless of the value of the +.Dv compression +property. .El .Sh SEE ALSO .Xr mtree 5 , diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index 3d5819439a73..f155049d6f93 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -124,6 +124,95 @@ basic_cleanup() common_cleanup } +# +# Try configuring various compression algorithms. +# +atf_test_case compression cleanup +compression_body() +{ + create_test_inputs + + cd $TEST_INPUTS_DIR + mkdir dir + mkdir dir2 + cd - + + for alg in off on lzjb gzip gzip-1 gzip-2 gzip-3 gzip-4 \ + gzip-5 gzip-6 gzip-7 gzip-8 gzip-9 zle lz4 zstd; do + atf_check $MAKEFS -s 1g -o rootpath=/ \ + -o poolname=$ZFS_POOL_NAME \ + -o fs=${ZFS_POOL_NAME}\;compression=$alg \ + -o fs=${ZFS_POOL_NAME}/dir \ + -o fs=${ZFS_POOL_NAME}/dir2\;compression=off \ + $TEST_IMAGE $TEST_INPUTS_DIR + + import_image + + check_image_contents + + if [ $alg = gzip-6 ]; then + # ZFS reports gzip-6 as just gzip since it uses + # a default compression level of 6. + alg=gzip + fi + # The "dir" dataset's compression algorithm should be + # inherited from the root dataset. + atf_check -o inline:$alg\\n -e empty -s exit:0 \ + zfs get -H -o value compression ${ZFS_POOL_NAME} + atf_check -o inline:$alg\\n -e empty -s exit:0 \ + zfs get -H -o value compression ${ZFS_POOL_NAME}/dir + atf_check -o inline:off\\n -e empty -s exit:0 \ + zfs get -H -o value compression ${ZFS_POOL_NAME}/dir2 + + atf_check -e ignore dd if=/dev/random \ + of=${TEST_MOUNT_DIR}/dir/random bs=1M count=10 + atf_check -e ignore dd if=/dev/zero \ + of=${TEST_MOUNT_DIR}/dir/zero bs=1M count=10 + atf_check -e ignore dd if=/dev/zero \ + of=${TEST_MOUNT_DIR}/dir2/zero bs=1M count=10 + + # Export and reimport to ensure that everything is + # flushed to disk. + atf_check zpool export ${ZFS_POOL_NAME} + atf_check -o ignore -e empty -s exit:0 \ + zdb -e -p /dev/$(cat $TEST_MD_DEVICE_FILE) -mmm -ddddd \ + $ZFS_POOL_NAME + atf_check zpool import -R $TEST_MOUNT_DIR $ZFS_POOL_NAME + + if [ $alg = off ]; then + # If compression is off, the files should be the + # same size as the input. + atf_check -o match:"^11[[:space:]]+${TEST_MOUNT_DIR}/dir/random" \ + du -m ${TEST_MOUNT_DIR}/dir/random + atf_check -o match:"^11[[:space:]]+${TEST_MOUNT_DIR}/dir/zero" \ + du -m ${TEST_MOUNT_DIR}/dir/zero + atf_check -o match:"^11[[:space:]]+${TEST_MOUNT_DIR}/dir2/zero" \ + du -m ${TEST_MOUNT_DIR}/dir2/zero + else + # If compression is on, the dir/zero file ought + # to be smaller. + atf_check -o match:"^1[[:space:]]+${TEST_MOUNT_DIR}/dir/zero" \ + du -m ${TEST_MOUNT_DIR}/dir/zero + atf_check -o match:"^11[[:space:]]+${TEST_MOUNT_DIR}/dir/random" \ + du -m ${TEST_MOUNT_DIR}/dir/random + atf_check -o match:"^11[[:space:]]+${TEST_MOUNT_DIR}/dir2/zero" \ + du -m ${TEST_MOUNT_DIR}/dir2/zero + fi + + atf_check zpool destroy ${ZFS_POOL_NAME} + atf_check rm -f ${TEST_ZFS_POOL_NAME} + atf_check mdconfig -d -u $(cat ${TEST_MD_DEVICE_FILE}) + atf_check rm -f ${TEST_MD_DEVICE_FILE} + done +} +compression_cleanup() +{ + common_cleanup +} + +# +# Try destroying a dataset that was created by makefs. +# atf_test_case dataset_removal cleanup dataset_removal_body() { @@ -862,6 +951,7 @@ atf_init_test_cases() { atf_add_test_case autoexpand atf_add_test_case basic + atf_add_test_case compression atf_add_test_case dataset_removal atf_add_test_case devfs atf_add_test_case empty_dir diff --git a/usr.sbin/makefs/zfs/dsl.c b/usr.sbin/makefs/zfs/dsl.c index f7264b9d2ca7..8a8cee7c82b2 100644 --- a/usr.sbin/makefs/zfs/dsl.c +++ b/usr.sbin/makefs/zfs/dsl.c @@ -193,6 +193,39 @@ dsl_dir_set_prop(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, const char *key, nvlist_add_uint64(nvl, key, 0); else errx(1, "invalid value `%s' for %s", val, key); + } else if (strcmp(key, "compression") == 0) { + size_t i; + + const struct zfs_compression_algorithm { + const char *name; + enum zio_compress alg; + } compression_algorithms[] = { + { "off", ZIO_COMPRESS_OFF }, + { "on", ZIO_COMPRESS_ON }, + { "lzjb", ZIO_COMPRESS_LZJB }, + { "gzip", ZIO_COMPRESS_GZIP_6 }, + { "gzip-1", ZIO_COMPRESS_GZIP_1 }, + { "gzip-2", ZIO_COMPRESS_GZIP_2 }, + { "gzip-3", ZIO_COMPRESS_GZIP_3 }, + { "gzip-4", ZIO_COMPRESS_GZIP_4 }, + { "gzip-5", ZIO_COMPRESS_GZIP_5 }, + { "gzip-6", ZIO_COMPRESS_GZIP_6 }, + { "gzip-7", ZIO_COMPRESS_GZIP_7 }, + { "gzip-8", ZIO_COMPRESS_GZIP_8 }, + { "gzip-9", ZIO_COMPRESS_GZIP_9 }, + { "zle", ZIO_COMPRESS_ZLE }, + { "lz4", ZIO_COMPRESS_LZ4 }, + { "zstd", ZIO_COMPRESS_ZSTD }, + }; + for (i = 0; i < nitems(compression_algorithms); i++) { + if (strcmp(val, compression_algorithms[i].name) == 0) { + nvlist_add_uint64(nvl, key, + compression_algorithms[i].alg); + break; + } + } + if (i == nitems(compression_algorithms)) + errx(1, "invalid compression algorithm `%s'", val); } else { errx(1, "unknown property `%s'", key); } @@ -236,9 +269,6 @@ dsl_init(zfs_opt_t *zfs) zfs->rootdsldir = dsl_dir_alloc(zfs, NULL); - nvlist_add_uint64(zfs->rootdsldir->propsnv, "compression", - ZIO_COMPRESS_OFF); - zfs->rootds = dsl_dataset_alloc(zfs, zfs->rootdsldir); zfs->rootdsldir->headds = zfs->rootds; @@ -288,9 +318,13 @@ dsl_init(zfs_opt_t *zfs) } /* - * Set the root dataset's mount point if the user didn't override the - * default. + * Set the root dataset's mount point and compression strategy if the + * user didn't override the defaults. */ + if (nvpair_find(zfs->rootdsldir->propsnv, "compression") == NULL) { + nvlist_add_uint64(zfs->rootdsldir->propsnv, "compression", + ZIO_COMPRESS_OFF); + } if (nvpair_find(zfs->rootdsldir->propsnv, "mountpoint") == NULL) { nvlist_add_string(zfs->rootdsldir->propsnv, "mountpoint", zfs->rootpath); From nobody Mon Aug 25 15:22:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZLC54Zgz65vkR; Mon, 25 Aug 2025 15:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZLC2qgxz3Xyq; Mon, 25 Aug 2025 15:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pVpHUFSkswVnX4MtmeeJ7M4SijOzlxzCVbPFDBLXFpk=; b=vWFhWI2FbCjTQ9QeZLBBDigtiDOZ0mTHATdms65ykV+ULxO5fb4RhByK2KDldisQRu1ZVG WWdlqHkLM65jluthapHhfmqMJzXAmHXcq8Tvl6xzumWGCZvvsNOrmfXPn4NfDZQhhBdIiq 0onXzCrk0CPbG2APN/4fvnVJan8q9A+Hfo5cgYr8V/ZWg8VAe9fLPMj6G4HtTM+sLZEL2C DLWAd9E6S9d/ifgD8hwRkgHxnqx90BCxap8+ht0J2ZGZE79aqI1V8KRNPSdn1XaYP25UFY AX+9UueXikLRNHbgFUap9NVUJgw1euR7TF3CyXnZpb/mMi4xTbbA1CLvuHnxHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pVpHUFSkswVnX4MtmeeJ7M4SijOzlxzCVbPFDBLXFpk=; b=XHWbuA/+8XNkTILnSl2srK1Up49anzl/P9/OaeHY4onZNgB6H++6RzfOIKMHYdbyzZMtJo vP1RYLHcZuKD62NkhuuinoPJd/xAg9NUvL6gahjPSE9HKZRIxLHGaQrZgZRduAsLNSzW2n cGTnJjtDa5kwrqRyIs6gQO5ERpRUqsBDwBC9dvrJk9CkRCTPo4pOjAyuaykF7D5DN26cV7 6Hj0htuMWrEX8nrB9/LMC5S7PHBgig7sdJT1EjpIdIeqxjjM6XE52uHFcWG42wl6qFfiiq 0RoKUGajBNzGa+m3p2nJa7EUxmL2ZORR6CV90YKw5aOTx9YrEh3sTOIYyk1jew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135379; a=rsa-sha256; cv=none; b=RDcxjz54c3JCev4uecLFInhHm4ynSaCG6LuGMsn8J43INfY3HTJQfSI1c/AREUqg0nGgUH R5OuUZB4Ij0m4PneAZA/Tnd6w+t54YJGLQk7lvpJGofCarNFyFvID/QUJ3OzQp7wRhaqzw UoHmpmVSqR6VLPn2sdbcwPjkekQ/hBYByaOUYppKIAYTRkCS/DTLNiKeyySjX2t9YWSpVi HmVIonoGNlsewawd8xYhD6C8FLmqSMmqmVi7sZArdpEiZ0ZclIsRIum8gFnDoOUM07qmMi Fx49x5jsG0g94jg7O8Kx8wzHbU6LtJKgqrpT3KpPr5YLwH13M3fQVFTmY7/hvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZLC09Lnzvh6; Mon, 25 Aug 2025 15:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFMwI5054173; Mon, 25 Aug 2025 15:22:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMwHP054170; Mon, 25 Aug 2025 15:22:58 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:58 GMT Message-Id: <202508251522.57PFMwHP054170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b681da5c8d8b - stable/14 - makefs/zfs: Allow the user to specify the pool GUID List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b681da5c8d8b8bfac0a91401545776fe8f1919ae Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b681da5c8d8b8bfac0a91401545776fe8f1919ae commit b681da5c8d8b8bfac0a91401545776fe8f1919ae Author: Mark Johnston AuthorDate: 2025-07-21 13:41:40 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:57 +0000 makefs/zfs: Allow the user to specify the pool GUID This will be used by the test suite to enable running makefs/zfs tests in parallel. MFC after: 1 month (cherry picked from commit cd4b9dac1a0dc6b868aa4376ac355aaf25430a77) --- usr.sbin/makefs/makefs.8 | 6 ++++++ usr.sbin/makefs/zfs.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8 index bc6cf8e5e2d9..d3b7c9c3e519 100644 --- a/usr.sbin/makefs/makefs.8 +++ b/usr.sbin/makefs/makefs.8 @@ -550,6 +550,12 @@ This option allows the default heuristic to be overridden. .It verify-txgs Prompt OpenZFS to verify pool metadata during import. This is disabled by default as it may significantly increase import times. +.It poolguid +Use the specified 64-bit integer as the pool GUID. +If this option is not specified, the pool GUID will be random but fixed +across multiple identical invocations of +.Nm . +This option is useful for testing but not required for reproducibility. .It poolname The name of the ZFS pool. This option must be specified. diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c index 66e7f8dafc9c..8d50c450541b 100644 --- a/usr.sbin/makefs/zfs.c +++ b/usr.sbin/makefs/zfs.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -85,6 +86,8 @@ zfs_prep_opts(fsinfo_t *fsopts) 0, 0, "Bootable dataset" }, { '\0', "mssize", &zfs->mssize, OPT_INT64, MINMSSIZE, MAXMSSIZE, "Metaslab size" }, + { '\0', "poolguid", &zfs->poolguid, OPT_INT64, + 0, INT64_MAX, "ZFS pool GUID" }, { '\0', "poolname", &zfs->poolname, OPT_STRPTR, 0, 0, "ZFS pool name" }, { '\0', "rootpath", &zfs->rootpath, OPT_STRPTR, @@ -547,7 +550,8 @@ pool_init(zfs_opt_t *zfs) { uint64_t dnid; - zfs->poolguid = randomguid(); + if (zfs->poolguid == 0) + zfs->poolguid = randomguid(); zfs->vdevguid = randomguid(); zfs->mos = objset_alloc(zfs, DMU_OST_META); From nobody Mon Aug 25 15:22:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZLD4sZ1z65vxq; Mon, 25 Aug 2025 15:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZLD1HN4z3Xyw; Mon, 25 Aug 2025 15:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKswL/xzJ44uCmjADkvqGvPFy38ifBzDRU+ikzIQxyQ=; b=GX/Ze22PH8AF8Eo32g2tfDpUr/pyW86dF37gwVHRAy2FkBEgDING8g3XpxWirCNYqIhc6f iYSkcpScjbyYGOHXsvVbjcZEA18cUWEMSEYrnafFQh4qyVydW5pGTg/CsaryE1fXYNHT8y eRjeKKTTH7IDW6vtFrLm51l4pj4zemnz4rcTCoZnhclhENo/GvIos2bRpZ6nS1vXyDuCz2 nQgjc8ZN1ybWXyu3qE1wWyQ2NlmhPD8kCl9rCaWon7RafFodqjqQ5GGxdu7qQcMqbHQUte sy6ETQjn9nSYhBU+eKDV4YzooJhZDH4hUneA38A4iyKURNmU259IjlBVH2c3lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKswL/xzJ44uCmjADkvqGvPFy38ifBzDRU+ikzIQxyQ=; b=qtPHJhDIveBdbZa43WDPEkNXza4FqLPj/4X9FUuYR6u1uKI+2Ycp3KM0l4Z4lshw1d9hxW UaeIihQV3vxJ3XRPNM2pn7ZDExn+aqVb+1po+Z+JG8jFlSiJBY5S5UpScRUOph28s2tNOk M3hvYzYdDghF3dCFF1wbtCQAVmK0KPNtB5VRyctMVojdpgTsli4mhRP9LX7qV0Eb5LYwGd 7cxcG+PtFDsufU6CcLQLoD6xkCOt9WSe0EmbPT8B3iStQtw2APOX3xIHU7UR7BGe60LyLI H+K05GqQ+C6EaDnB9DH2ucsJgHYNvRnGUR1o/VNY4G5C4ltkxKskJxupP6ew2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135380; a=rsa-sha256; cv=none; b=EABXtTaLd/Bx/6XFSw7xaLZG9oIEsFzNOylgrcPp+Csao9+6gxFwTXy5RkuSllq/fMQXA+ HqGUyOHMmvVA+QImtcCXY50rB3KznP9oNlnSzW0G9WficDlTf3QfxLgdI3JQtlxG/OmsdF tz794vI09/3FAuuGSyada1GZhs8L1or0psdFHtmps6WrCWjaz4xHUE46vx1lT+zBMGY83X j9L3FDmUVTCp7QeZuJ5FhQJ13tjU3iO791HoKaZygldg/DShopB/7OIauXFmCpwUdrXJGD 37/2pOLp+wflvlrrQ9nMrLeCnoJJfGwj+k88PBo6VLGlXmq/ZxdlCJCMHhuyww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZLD0lGKzv9V; Mon, 25 Aug 2025 15:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFMx3L054212; Mon, 25 Aug 2025 15:22:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMx94054209; Mon, 25 Aug 2025 15:22:59 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:59 GMT Message-Id: <202508251522.57PFMx94054209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5b42aac0013a - stable/14 - makefs/zfs tests: Run in parallel List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5b42aac0013afa760a8071cdf16c70786c5802b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5b42aac0013afa760a8071cdf16c70786c5802b9 commit 5b42aac0013afa760a8071cdf16c70786c5802b9 Author: Mark Johnston AuthorDate: 2025-07-21 13:41:56 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:57 +0000 makefs/zfs tests: Run in parallel Use the script PID as a pool GUID. This way, tests running in parallel will have pool GUIDs that won't collide, and the tests no longer need to be serialized. MFC after: 1 month (cherry picked from commit 68dc9c6b8ef86caef3962cc9177bb21d8f38b0ed) --- usr.sbin/makefs/tests/Makefile | 4 ---- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/usr.sbin/makefs/tests/Makefile b/usr.sbin/makefs/tests/Makefile index 98cc89031c64..a9c67dd92807 100644 --- a/usr.sbin/makefs/tests/Makefile +++ b/usr.sbin/makefs/tests/Makefile @@ -6,10 +6,6 @@ TEST_METADATA.makefs_cd9660_tests+= required_files="/sbin/mount_cd9660" ATF_TESTS_SH+= makefs_ffs_tests .if ${MK_ZFS} != "no" ATF_TESTS_SH+= makefs_zfs_tests -# ZFS pools created by makefs always have the same GUID, so OpenZFS -# refuses to import more than one at a time. Thus the ZFS tests cannot -# be run in parallel for now. -TEST_METADATA.makefs_zfs_tests+= is_exclusive="true" .endif BINDIR= ${TESTSDIR} diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index f155049d6f93..13abaf50fba4 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -28,7 +28,7 @@ # SUCH DAMAGE. # -MAKEFS="makefs -t zfs -o verify-txgs=true" +MAKEFS="makefs -t zfs -o verify-txgs=true -o poolguid=$$" ZFS_POOL_NAME="makefstest$$" TEST_ZFS_POOL_NAME="$TMPDIR/poolname" From nobody Mon Aug 25 15:23:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZLF4VNBz65vxt; Mon, 25 Aug 2025 15:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZLF1qhvz3Xxd; Mon, 25 Aug 2025 15:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vHo8Nf8psVqxt9pnFjE9Izs6TCnpUX622KaDUn/vajw=; b=paNn/CD8mIu3ZMQ5CS+xSaQmqTUIR93EEzxBoQUen8g5zeD9gMN+xOuGxGY5HFzDpIHiO2 bzRv8dE/V3u6e5ReKdXDyKyTUbZHPmxYGavCqgoDXjeVmIVhPeFfCFZg6aYDhSqOrpb4e8 WzkKF2/o39MJ7RvIJA0ISdmvWNWKoQt9nD0hOT7Zzj6tyg0w36O86lMreO6nCFC8MCnlKz zkFyX5qEcVtkt7UF0Q9Ksxuo1qEpxumzp+gusWn64K0Y3Bmqqo3qD/cUGlcmtNHElewNKO Jm3U135t1MXedhAlc92/sqZd1OXqcN8StCEjyWGlxWh40/Fes4TaqBNUQ/+4lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vHo8Nf8psVqxt9pnFjE9Izs6TCnpUX622KaDUn/vajw=; b=iZ4vUh5Q30YsEPH3mTzPQNyoH/cMMoEuANyUtRG+6/EImHEJFxNxkKgPT9lev+fRGHy+/c 0Eovx9afggWjRn1slB9OngX9nmz3S4m1L/pso+lrNoHFRXmohb7quLGcW81JHR/0qdY5l2 2rMlP74ZnhhqwhyDS+jHWdezRC+ZRygzb6YoUAqluRum+m4uxosUuZpi5Dzib0bF2WmqJH x1tkLQjbICigkZjyWK7BtG2EvS22pOkJ6D1yIPAbgQSqzcDJYRDjdw9a/bERDkkO7Agk2C p6GhuhGfY76TdA955Nn1BF+H7AL2PYhjg22RbTWqiLFTgy/W+IA9jrk9KgATPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135381; a=rsa-sha256; cv=none; b=QoJHwKYKFjn1W+QdQWwfalxaoP+mWDlmRLYlhhqEMkokf736BRZP6xF+OCddrZUCUsMgZY K75Ex7f01dkDAApkQ15M7gme8KESzq9AC2Daq04ZOAeQKwKTaDqU0cAdNYsTk8xERytpUQ kT9vPAcl25tluS4BMhZQufv30v8T30Z684pDQEjXK5kCTM+I+3mmP5ilRxGJ8p4r4Esxlh tFhhjZjCRMNV3BMxXHJoST32IJL/R1ir4mhrBcTnt1wWeC6djuekBK0WDBywuv/0sJuiXg wbRTtvGgjh4H2mmSuaOQFlHUDCm2EJH5XJNZBavaxbsW1uEIvUXxnjtSlhxD+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZLF1D7szvx8; Mon, 25 Aug 2025 15:23:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFN11c054262; Mon, 25 Aug 2025 15:23:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFN1cs054259; Mon, 25 Aug 2025 15:23:01 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:23:01 GMT Message-Id: <202508251523.57PFN1cs054259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 17d87881a363 - stable/14 - arm64: prevent panic when using syscall mux + large arg call (mmap) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17d87881a363c160e7e8cdb252d0261214c1a50b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=17d87881a363c160e7e8cdb252d0261214c1a50b commit 17d87881a363c160e7e8cdb252d0261214c1a50b Author: John-Mark Gurney AuthorDate: 2025-08-18 20:25:37 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 15:19:47 +0000 arm64: prevent panic when using syscall mux + large arg call (mmap) if the syscall muxes are used, up to two additional arguments may be required. This means that the 8 required for mmap increases up to 10 (for __syscall). Sponsored by: Juniper Networks, Inc. (cherry picked from commit 740b879c6ade531adebeba7cd2f261bbe650797f) --- sys/arm64/arm64/elf32_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index de0ee9607ad1..5f35d01f9ac0 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -193,7 +193,7 @@ freebsd32_fetch_syscall_args(struct thread *td) register_t *ap; struct syscall_args *sa; int error, i, nap, narg; - unsigned int args[4]; + unsigned int args[6]; nap = 4; p = td->td_proc; From nobody Mon Aug 25 15:23:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9ZLf74gJz65w1g; Mon, 25 Aug 2025 15:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZLf6f0Gz3Yr7; Mon, 25 Aug 2025 15:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PHV3bS46HZecQ4FUkBdJuZqMvnL53Mtq1XcJbOadP7s=; b=LQEJ0Ic+dWQelAhenhcvNJ2nwxiUM3N7/QckJamGMBjOOuBRDW/f2xQ5OL6xw+l8WGtgOX K5Ve2KElzhiZYiBzbvIJWKzS9LU9Be54mpU6DiiTC5tU0LPb+Rn8EYQZCbMkcAu5l7Mr5q hbOBrXeLNeaGZmUKOqhE4hcNPDkCVOJkZ2LqGk49Fn7HyF3hczEi3gc2QRFTky78BbJfYZ Ynku/BMcdgfmkCSpXomW3PaT29UJdSHK3lrYtrsNku0GdegDpkVHgsEMAD6ZJ1SybAeCYT G/1ZCwfm7X/kNJZlLljE0e3se4MhOnFWWoHS6XoPfgPCXkLVzjYbJDcIlJr3rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PHV3bS46HZecQ4FUkBdJuZqMvnL53Mtq1XcJbOadP7s=; b=sP3KIYXdr8mX1vI44lGY3/X+jsTQ2Y1HNrz/nkpyO5sWIm71I5SezPq5NSD0IpdFo9+uA4 CjadM9e6Q8NfdwX8KrPPUwpl4SMyXHxXnay1vUel0qvQXvw/qIdjrhuawleGJittsf81Ap aLvUl2dFuVlGwIkHhmj5lJu08je7pKoVkT6edqO+/xSnFTXr7YXmVTkApGh35KbSPMJCFT AflO7+1maGRWO+7KrSH8qKnSod95Xh50lMLyhCfXZxIPsEEWJpS8H+QpdAIfhfERl6zc1m 57/5o2TW/Stj+bZ+NsB/2kqRImFKfagyDTiS+sfFBxTgofRM3KMkC5qbTxqxCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135402; a=rsa-sha256; cv=none; b=tJj397DXSTDVxVC1q3f1QGTGDljNK2CsbGfqLzuI23NNDOWUh/aRL9fpJZc6PDUgfxbnqQ T7j2YKUnLZF2yR/rBCGKJsrABVcSpufXbLZ12+mJF48rnh+yf6A+vi0JW2zOFhnYpeO77o V4WKQP0/WCiOybYR39WYLC3K/THq16sI8qytEYDoZVPJtSmuKe5l09ljqsjAnPYuF57Ndw OIC/t52fPZP6C1mCmgZWo3sG+WFmehPOZ/6UwsCikSUYz53obAGCVtNvaZgiORXxvutEiX Fw9ryJm2zzIzskLFm5bPPURjrh9AFgwu4AgwLn+2i5NFVWixnpqHarf4dtUPVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9ZLf692bzvx9; Mon, 25 Aug 2025 15:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PFNMjX054527; Mon, 25 Aug 2025 15:23:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFNM8n054524; Mon, 25 Aug 2025 15:23:22 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:23:22 GMT Message-Id: <202508251523.57PFNM8n054524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 98ac13c4baf5 - stable/13 - arm64: prevent panic when using syscall mux + large arg call (mmap) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 98ac13c4baf5deb84010d632cb3b96dacd8c4eb6 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=98ac13c4baf5deb84010d632cb3b96dacd8c4eb6 commit 98ac13c4baf5deb84010d632cb3b96dacd8c4eb6 Author: John-Mark Gurney AuthorDate: 2025-08-18 20:25:37 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 15:23:12 +0000 arm64: prevent panic when using syscall mux + large arg call (mmap) if the syscall muxes are used, up to two additional arguments may be required. This means that the 8 required for mmap increases up to 10 (for __syscall). Sponsored by: Juniper Networks, Inc. (cherry picked from commit 740b879c6ade531adebeba7cd2f261bbe650797f) --- sys/arm64/arm64/elf32_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index 1c580e2b0de3..6392de73acff 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -190,7 +190,7 @@ freebsd32_fetch_syscall_args(struct thread *td) register_t *ap; struct syscall_args *sa; int error, i, nap, narg; - unsigned int args[4]; + unsigned int args[6]; nap = 4; p = td->td_proc; From nobody Tue Aug 26 00:24:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9pMZ1F8cz65tLh; Tue, 26 Aug 2025 00:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9pMZ0MDCz3l1J; Tue, 26 Aug 2025 00:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756167898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zuVx3CHYuqQI7LiheXlPdDmCHVBNssgioiBBC8bd4pQ=; b=nZJ5ZYnjaay+5agpqI93dM5OY4GskhL0MqhTgohCeofthFBrcb9cUJE58yAnujR1RGqueb ZC+PeZBil9UrUPrd4Y1SRsxjB67+B+xOa6XgB/f51rKbUEiYNCoks0fgAe0J0EktDldh3k /xIt/5HLJMa3gC9cc3/2FSzBoOVIR8OxpygnfS2OGaNXBgAs6wjqLP3BpDBgW0JJUIOfc6 sW17BKHmaWqE9g0ntHZ4jqJUIYETnUGMf5pFKRfg2WndTHZLG+8RbueAigL/Y1xBt5cOYT RCDu0vVgNuLtThXVkSWECIvSwaEv658JJ+rDdg2n/uabasW0RPmEaCScDETR7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756167898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zuVx3CHYuqQI7LiheXlPdDmCHVBNssgioiBBC8bd4pQ=; b=dJpB7ZtXER94tSNVj7YtwB5UOtQJs5VTSHT+NiRlJmM+9VFEcFOinWA+tFz74YDnFw697Z SGzWkCH1ZMH9ny3uxdgxGP7ahfc2IFPg0u0f78vYoaIUXgtosHV6QKlp41bF5tYHazCs5t 1UcfzzFvq5o4Wow+ZZkYdBepYtg303p08MbxeoqhClgcvMUQZ6TJXexKTzmjSx9XxGi/Vj Ax5qURRlrep7O1aFlTRZUsEOlA/aRAmtVkCqy3pfG+CD0N6R5NTXWklmQROXlCMKfMJB3P C5FmMTAf1EDVYsnQZnh9xR8g0k7bOeLOcr5fDQnpFoMecDNYH5rSzhC8iO+SjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756167898; a=rsa-sha256; cv=none; b=Z0aH8ArCXrKVxqRp3a0I2dyZKUhOOCTP4WRtR9VFHks8L6TSNes3PzuagEQ0tfkqKUNM/A qWeDsm8f8rY17+JE7fRUOsiT8mnJz3mVfFj1p3ZkuCeI2rWNRIMnErpyZv3z8Bn9yRIF9X QQrbFokBrVuQZRv8Dn80NvJ4y6W3ry/JEoA35pf5lhnpboawPQEL1bJpP3gY5vPVGyQ4CM LyOqor0I2Vv9M+O9p4pKfLqehaycHr7M1luRZbAIjmoUr3PUBViCXQjvQ5GU9+uTXxd94j HH52JvcgxxFzgVYKIfCbTxWde/IKh+HK8ga3w/ccK4Kah+OjyAxtyR7ntE7Jow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9pMY73nLz1BX6; Tue, 26 Aug 2025 00:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57Q0OvEE071185; Tue, 26 Aug 2025 00:24:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57Q0Ov6b071182; Tue, 26 Aug 2025 00:24:57 GMT (envelope-from git) Date: Tue, 26 Aug 2025 00:24:57 GMT Message-Id: <202508260024.57Q0Ov6b071182@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: 301512155324 - stable/14 - libc: convert ai_errlist array to designated initializers syntax List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 30151215532469142d7c81a7e1736cc4460170de Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=30151215532469142d7c81a7e1736cc4460170de commit 30151215532469142d7c81a7e1736cc4460170de Author: Konstantin Belousov AuthorDate: 2025-08-19 02:55:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-26 00:23:30 +0000 libc: convert ai_errlist array to designated initializers syntax (cherry picked from commit 632f7051709da98d4c9e59f11404f00d456b592c) --- lib/libc/net/gai_strerror.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c index 0d4303e76a73..d2f679a6782f 100644 --- a/lib/libc/net/gai_strerror.c +++ b/lib/libc/net/gai_strerror.c @@ -46,21 +46,21 @@ * but are or may be used as extensions or in old code. */ static const char *ai_errlist[] = { - "Success", /* 0 */ - "Address family for hostname not supported", /* EAI_ADDRFAMILY */ - "Name could not be resolved at this time", /* EAI_AGAIN */ - "Flags parameter had an invalid value", /* EAI_BADFLAGS */ - "Non-recoverable failure in name resolution", /* EAI_FAIL */ - "Address family not recognized", /* EAI_FAMILY */ - "Memory allocation failure", /* EAI_MEMORY */ - "No address associated with hostname", /* EAI_NODATA*/ - "Name does not resolve", /* EAI_NONAME */ - "Service was not recognized for socket type", /* EAI_SERVICE */ - "Intended socket type was not recognized", /* EAI_SOCKTYPE */ - "System error returned in errno", /* EAI_SYSTEM */ - "Invalid value for hints", /* EAI_BADHINTS */ - "Resolved protocol is unknown", /* EAI_PROTOCOL */ - "Argument buffer overflow" /* EAI_OVERFLOW */ + [0] = "Success", + [EAI_ADDRFAMILY] = "Address family for hostname not supported", + [EAI_AGAIN] = "Name could not be resolved at this time", + [EAI_BADFLAGS] = "Flags parameter had an invalid value", + [EAI_FAIL] = "Non-recoverable failure in name resolution", + [EAI_FAMILY] = "Address family not recognized", + [EAI_MEMORY] = "Memory allocation failure", + [EAI_NODATA] = "No address associated with hostname", + [EAI_NONAME] = "Name does not resolve", + [EAI_SERVICE] = "Service was not recognized for socket type", + [EAI_SOCKTYPE] = "Intended socket type was not recognized", + [EAI_SYSTEM] = "System error returned in errno", + [EAI_BADHINTS] = "Invalid value for hints", + [EAI_PROTOCOL] = "Resolved protocol is unknown", + [EAI_OVERFLOW] = "Argument buffer overflow", }; #if defined(NLS) From nobody Tue Aug 26 00:24:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9pMb2DP0z65tNd; Tue, 26 Aug 2025 00: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9pMb1KC9z3l6K; Tue, 26 Aug 2025 00: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=1756167899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4YNQpB2bU+66qjb8MaUeexoGr/ocUAelczhVOQx7jfA=; b=RSIE1CzHmsCk3fJxAM76GSFiMpf/g7LG8Cn5qJvQMuLDKJrBX+rIA62XZKPy6Jc3A2SzEz r4aT2lUgYcb2V55Y8DdpRCK6qvoltZLXXLcEec6i7LEOM7s60aqV3ODFF+5wVVJaen/tmW TjoViGZ7Z+hvxrt4GmMOjiAlUZ9oLuFGKfVZVAAnjK1ylZEfUStPDDtA3PSyUxfn5ANonR V7Qz+K/lasSsGdAPQocVhp1EJNiIE8SOD3cbtlMykTlDN9t7JlxBFA4DY/rVd10S1i/kN9 YeM4a0Th8bG6ME9b0pifb768tkLxww3V11b7CGByAvoie+8fSRFnpUzVwcAI2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756167899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4YNQpB2bU+66qjb8MaUeexoGr/ocUAelczhVOQx7jfA=; b=b99qQiiNfpRrdpR2Cs81SFlkqYyoplHFHiCj2bFSNOvBIApnuA7AbYplxj3AdhPrcd5w8x O079Mq7C2koXUlBmirv0aPh/rtQEhlgDs4wVKBvNyKA/kLnpfQn0ZvXFPMGs9+QvsJkr9B av6bdRQqrVLR9C62PFS1gesw84HFOMuAmLX1SA+Y6k0/dO96pTzR0q/3Npjgx5CP+EuoRz KJuO82ztg6Pi7BYrrnZywEg3GbeP3Q+ZOYDGakCKuuHJyPTnu5J6foN8aja7z2LI+izb7S xX55aBc+uLNmQMJVjt/7zlJII2f7wQnzG7t+XC4oPugwgha9IO+edE6qBNI2UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756167899; a=rsa-sha256; cv=none; b=Od3CUHNIT+C7FVRxH/A00DUp2bH71Yd990GZLTiM6QgVzLVgVqVpt4+EW41oujASYyOGTy abP3TLGpXGoiQC5ZA1MGvBmCzNCuVK8/FHle0V3tGN7UyFOK9/iM6akOsAPbXSidwMfNgr 8yBPNpgoaLZroRWGfqIci/cSR0Xraz00Wxp7j8471dZISYN6mpVE5Jz/zNNiSjxHVFm5F9 bg0QlRhY+41TNflSs+54YZg9UdJ/3i6leD7/s9rtmtB3PgcAwgh8qkenLRUQPRJWqYJQ8E sREaUEWkyKgat3cf0HAQRyc1D3QCrcCBxNo+uC0mgZAFU2qae6cnvmE0oI12kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9pMb0sswz1Bc0; Tue, 26 Aug 2025 00:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57Q0OxMo071219; Tue, 26 Aug 2025 00:24:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57Q0Ox99071216; Tue, 26 Aug 2025 00:24:59 GMT (envelope-from git) Date: Tue, 26 Aug 2025 00:24:59 GMT Message-Id: <202508260024.57Q0Ox99071216@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: 5dd8aa3d2b94 - stable/14 - libc: mark ai_errlist as const List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5dd8aa3d2b945508c90cc814331aa9047faf55e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5dd8aa3d2b945508c90cc814331aa9047faf55e2 commit 5dd8aa3d2b945508c90cc814331aa9047faf55e2 Author: Konstantin Belousov AuthorDate: 2025-08-19 02:57:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-26 00:23:30 +0000 libc: mark ai_errlist as const (cherry picked from commit 47d1788c2e984f99521fd5b31194f96d94bf8a6b) --- lib/libc/net/gai_strerror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c index d2f679a6782f..8d3501197c73 100644 --- a/lib/libc/net/gai_strerror.c +++ b/lib/libc/net/gai_strerror.c @@ -45,7 +45,7 @@ * Entries EAI_ADDRFAMILY (1) and EAI_NODATA (7) were omitted from RFC 3493, * but are or may be used as extensions or in old code. */ -static const char *ai_errlist[] = { +static const char *const ai_errlist[] = { [0] = "Success", [EAI_ADDRFAMILY] = "Address family for hostname not supported", [EAI_AGAIN] = "Name could not be resolved at this time", From nobody Tue Aug 26 00:25:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9pMc5H0Pz65tJN; Tue, 26 Aug 2025 00:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9pMc2vXCz3l6h; Tue, 26 Aug 2025 00:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756167900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ebe1Ak5FarCIv1TlKBKkNByDlKuTLXY5zVbbUAjSPsE=; b=OxEoUbW0tD+9mHfBvMCW7o9OiV2aIPrTQCQCda61Mh+XJsjTGn/jYEmGmK5rMsY53oO7KO u3R6qQLM2BwSpyuBL6MctUMoga7uIIrQpTF/9ApPgRBXPSAeudbR1KIRHKgvc08oK6m5oz DJGiJYOe8xc95xZu591A3ah6l6nlAJs05emQD+w3Tr23bYIWvD0ytgYiHwfUu4DjkuQP0I JmaoAXGn/q+oiDqzpl33K1tVY5ayMlM+Ia61PrzAJFC6kI693Cv+iJtHe4jdWcmmoone+s Qipxmvq5gjSkGx/Vut/xQ4Nut+184CkxxJSCsMxDS/GVJWDZqjtEHxr1LESyEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756167900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ebe1Ak5FarCIv1TlKBKkNByDlKuTLXY5zVbbUAjSPsE=; b=pr2BFwAAI7bT7BbEGu+DljbSXZlHYF2XtHBOeZKqR8R8ZXZcdajOHt3DHKssBC0GZ9+Ffv fW2v+NkQQpklWVU0iZtNzOknHUtnx5KBMUqrcFMq5ClrLUekJVP29gWHNsiqi3ALYCutfE cRlagSWgBUljeVebqP9NWl6jJPF3l12IWw44zPo/SMwvvMuyQvGrsB8m0Qr3JV33OFkB5G RFafH0TSqLybrgA7ggVtqhMbBHpw5MFQLn6ELj9Z861CcUffBaoqVysB44iKbpv8zuc+qV 6cjKf0zgrI9oq62URodRBSRqMuwA/6A65CLG4lyw7AEak1R/JusylXu7UNWvqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756167900; a=rsa-sha256; cv=none; b=bHDz+f+Eny3i4fz8ryWBvxFZOWMG9YYLn7jvcR+uM3NYIqKJXwYnAnjVtQpH2egjGE3FUZ sIjKMse3a/k1JlFe7vzA+EADFYpv+9a5BwVz3zPmWR98SCQzo84Rr3ksCH90EnjWKOaVS1 qhaumducaRYdbgQnJl9bOywjks3tu1WO1ji9A2US6iaCSabh1ytHEfj7myMy21x6V9I12V wAkmTduy3YDmv/T0Thl8TZWlP1Ue0mgiDf1potNu5RiMnGk77tnAZtundqmM0tIB9x0wq1 vios0OvHW4LGGG7Jv0jGMxQfX4fWiiNkZiFV73yT2/tvQk9QUCZVrWodvtTlAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9pMc1pvFz1BKv; Tue, 26 Aug 2025 00:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57Q0P0kU071276; Tue, 26 Aug 2025 00:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57Q0P0tq071273; Tue, 26 Aug 2025 00:25:00 GMT (envelope-from git) Date: Tue, 26 Aug 2025 00:25:00 GMT Message-Id: <202508260025.57Q0P0tq071273@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: ac1e3998bd77 - stable/14 - libc: some style in gai_strerror.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ac1e3998bd770ee142a1180123e8b735548b7d57 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ac1e3998bd770ee142a1180123e8b735548b7d57 commit ac1e3998bd770ee142a1180123e8b735548b7d57 Author: Konstantin Belousov AuthorDate: 2025-08-19 03:00:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-26 00:23:31 +0000 libc: some style in gai_strerror.c (cherry picked from commit bd4dd5d951ea022b478c455c3eabb2a1b8cc4936) --- lib/libc/net/gai_strerror.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c index 8d3501197c73..96bc32b593fa 100644 --- a/lib/libc/net/gai_strerror.c +++ b/lib/libc/net/gai_strerror.c @@ -72,7 +72,7 @@ static int gai_keycreated = 0; static void gai_keycreate(void) { - gai_keycreated = (thr_keycreate(&gai_key, free) == 0); + gai_keycreated = thr_keycreate(&gai_key, free) == 0; } #endif @@ -110,11 +110,11 @@ gai_strerror(int ecode) strlcpy(buf, catgets(catd, 3, NL_MSGMAX, "Unknown error"), sizeof(gai_buf)); catclose(catd); - return buf; + return (buf); thr_err: #endif if (ecode >= 0 && ecode < EAI_MAX) - return ai_errlist[ecode]; - return "Unknown error"; + return (ai_errlist[ecode]); + return ("Unknown error"); } From nobody Tue Aug 26 00:25:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c9pMd48MJz65tG3; Tue, 26 Aug 2025 00:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9pMd3LXXz3kyN; Tue, 26 Aug 2025 00:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756167901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NQvbUc9bKlpJzErdL3QgbtB/nnZ2vS15tvRDgXce9oY=; b=RHE9dboT9auKlFztRQN4HSm/VhJST1GE3v+vc1cpu8S3XGxuWRaBQ8SVUk5CZEZ9CPHnAG g2+8XP6eWKSeny5FdfF2Zg+8XUvUZLAFgIJOFUU5W8zvVT8juXFMcuKQiYjSTyCiWayljY zvndcbSAbNL61DYhW9IuvKWY9wU1qs9CSL4JgClW2r+hXegLGt4xK9Pc62ZKGF5lNjNav7 unQPqKA4aMSWA/g8qwRJyj4sVxPtTTXZ+ThHJMPOWiphx3hY6sidIJ6AGZ9wd8vxaAhGm8 OEP5F7DMwNDyHYtIAtvW7hoYiQNMgELR7qpz8X3YUF0QLrE5AddfnpbMwXD69w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756167901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NQvbUc9bKlpJzErdL3QgbtB/nnZ2vS15tvRDgXce9oY=; b=yGcVspWG6Ec2nSj8YoSq38z3xIsuTN8g1xWXZi5hb7WLLcKyMgZdYAHuEIdArl11nsv+5m LW2GBnNfRLUFMPq9Ve4nW3wtUjkfpfBbmiFaO15tAY8EcJs2txP7Iy5QAJyLkLWoeg1g3v K9mUE2SyLg+ry9HX8CF9uXqw2eG7ybvtckmyPVlowm3dC2qZizvRnR2yrJzV6bXBty8QkW A79HcRRV+DIsTmDNd1Dsr2SWwG9rUAhbiZso3JCdy7o6uoT3qgxhcB69fOZeTtDXTM32KW 0RzQdPxltTzeTBEvDnut2OVai20qyi6QFMDO+6ie9bZzGVW3KGLAP3xMMVneLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756167901; a=rsa-sha256; cv=none; b=lPZ/qU8OwEbLT0RnzRAkBuQeLv3yRc/ginvC3HUkWH+ziZjVBJUb47z3JdyznqT3EmA/uh 2o2P0LdQ1fqdEQzQgVcCHC1xpAYYxRYGWyHJk+EX6JSgSyYffmYIAalhPvn2Re53eWHqIx H/WyefYvykVaWoZGUcFXM9C3eaRq0ixtpqwZxh/DqqTYXY74rroxr0iL6P46RMR6v3/FPF 5DNip6cm9S7n99yKMkxuWSvPAL/5vUUAQG7DBvrQsFQIt7c5sj2Dth91pxu5nI70gdF8gf 4p/5gpcGAHsaE8Q2O5KaWg2rzfreK8AL8+yAqSsGSZFptavO7JPIMQxKLG7TlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9pMd2nyzz1Bq7; Tue, 26 Aug 2025 00:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57Q0P1LG071310; Tue, 26 Aug 2025 00:25:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57Q0P1fe071307; Tue, 26 Aug 2025 00:25:01 GMT (envelope-from git) Date: Tue, 26 Aug 2025 00:25:01 GMT Message-Id: <202508260025.57Q0P1fe071307@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: 5e243ccc5f67 - stable/14 - libc: preserve errno in gai_strerror() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e243ccc5f67229582f6e6cbfbaee834adb7cdae Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e243ccc5f67229582f6e6cbfbaee834adb7cdae commit 5e243ccc5f67229582f6e6cbfbaee834adb7cdae Author: Konstantin Belousov AuthorDate: 2025-08-19 03:05:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-26 00:23:31 +0000 libc: preserve errno in gai_strerror() PR: 288931 (cherry picked from commit f892e509c1a07f7116b9788a05e4ae99a06d54d0) --- lib/libc/net/gai_strerror.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c index 96bc32b593fa..23f58b763573 100644 --- a/lib/libc/net/gai_strerror.c +++ b/lib/libc/net/gai_strerror.c @@ -82,7 +82,9 @@ gai_strerror(int ecode) #if defined(NLS) nl_catd catd; char *buf; + int saved_errno; + saved_errno = errno; if (thr_main() != 0) buf = gai_buf; else { @@ -110,9 +112,11 @@ gai_strerror(int ecode) strlcpy(buf, catgets(catd, 3, NL_MSGMAX, "Unknown error"), sizeof(gai_buf)); catclose(catd); + errno = saved_errno; return (buf); thr_err: + errno = saved_errno; #endif if (ecode >= 0 && ecode < EAI_MAX) return (ai_errlist[ecode]); From nobody Wed Aug 27 18:38:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBtb05qdNz65RjS; Wed, 27 Aug 2025 18:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBtb05Xqzz3wb2; Wed, 27 Aug 2025 18:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756319916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sHOQG8LN7NQAhsAvcyI+xrFsq4UNYuEPqWmMPtl/RVM=; b=e+sOfyU2wsSnO1kyxVkB2Oqs3cYeZR1QBQX2lT1w01f6amwQXBjv7UMw8JQgOhDF6sO6Pz 2rOQwzCb4qj8G6zfxVy4GLjqFfcI+OwuZ0XLwtpyUPzSlgwua8yMKu/gqedu5zQyGPvfvY oPfG+P4+C4deNjmAmYZxlqSaf0ubsx1lhMCTpsEDTw8PL5x2ssy09RICLOHt+D5qYI+mPw X01gl0KBnuChGP2eNNH6aM3AV34Wmh9t/SVlBlbGieiW8fv5lQDMhaRf7sGimpz1RIc2hH m9HES+OG31O39HkLdZZkVFrXuVnsPEu+y9FbFE5HbX+mpNx8ejz0GyYIXSlCYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756319916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sHOQG8LN7NQAhsAvcyI+xrFsq4UNYuEPqWmMPtl/RVM=; b=DEMhPvWz/lPeUuSV0JUN8pBg8NrM9MW1ftRM0LlyrH9sli5BmCsUGd0F7xDLKTcTkwQ5UA 3VVrf3iT5xzF+CGp4TgVoPSC7w52GXcRddvV0B0CBaTuYrPsa5FTHMIsHVesR8ns1wK8tC KJvzphwpS91f6n95s6Tdv122OflpcoPfwWC4TuCTwdBKVwYQ0g/l5q9Uh/90inHJGwQC7L LhN/9laNgkoi+n3yhL8AOAkwnE47EmnKKpRKJblotZ1h5g+YYtROl8SBZknrA32LiD+9fK ZeIFJBNSp3UnFNpidK8DkzYl2+v1wXIYNHu0r7HzOGu2eRPOeUJTuQyuQ0ymaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756319916; a=rsa-sha256; cv=none; b=yZtrU53n00rl5wfYUecmtQqm3PPTS02P9L+p+2SwJEwqTwjyc3yvYPoGlIOMLaLmnPe7He 8snzVeQqmtmKh0b1VCsNf4wdUYnzKbp559WEcgYkKoEIUDpdXEuurfeX6pZl22dp5d3jvN zFObo7yE0ggRNXROe+cNoJAMIvREB0rAkq2oGYpC4jOoHtSIX6TcK4T3gfHOL2qD/cIIC8 NYnDBvoEkqECyph/RAKAfASjuKOI3uTnCZRHDQRfzGvIvLHJ11rxzKqlaWVQtpu7KCR44a W0GTfvLv9A0n1F1Uizvic70nArpTQd1yKHstne5yGxVgMKWTQrXBkgtD6NRTQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBtb0561NzZjj; Wed, 27 Aug 2025 18:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RIcaxU049359; Wed, 27 Aug 2025 18:38:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RIcatR049356; Wed, 27 Aug 2025 18:38:36 GMT (envelope-from git) Date: Wed, 27 Aug 2025 18:38:36 GMT Message-Id: <202508271838.57RIcatR049356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Ambrisko Subject: git: 0110702febf0 - stable/14 - enic(4): fix down/up, MTU changes and more List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ambrisko X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0110702febf077114bb449ec53a6058ae9f766d1 Auto-Submitted: auto-generated The branch stable/14 has been updated by ambrisko: URL: https://cgit.FreeBSD.org/src/commit/?id=0110702febf077114bb449ec53a6058ae9f766d1 commit 0110702febf077114bb449ec53a6058ae9f766d1 Author: Doug Ambrisko AuthorDate: 2025-01-09 16:28:37 +0000 Commit: Doug Ambrisko CommitDate: 2025-08-27 17:36:52 +0000 enic(4): fix down/up, MTU changes and more (cherry picked from commits 0acab8b3d1336d4db73a9946ef76b4bcd0b0aabe, 1c9c4a25e600bcfad3eec891d43221b55ddf7e19) ifconfig down/up cycles was not working. Fix that which is required to support MTU changes. Now doing ifconfig enic0 mtu 3000 for example works. If the MTU is changes in the VIC HW configuration, that is not reflected in and the OS reports the default 1500. I need to look at that but changing it via ifconfig works. So this is different then what Linux does. Change TX interrupt allocation to be in this driver. Change the admin interrupt count to 2. This make multiple queues work but need to be done as pairs so if the VIC has more TX or RX queues setup in the VIC configuration it will use the lesser value. While updating the TX interrupt also add support for devcmd2. Enable checksum offloading. PR: 282095 --- sys/dev/enic/cq_desc.h | 15 --- sys/dev/enic/enic.h | 76 ++++++-------- sys/dev/enic/enic_res.c | 4 +- sys/dev/enic/enic_res.h | 2 - sys/dev/enic/enic_txrx.c | 39 +++++-- sys/dev/enic/if_enic.c | 192 +++++++++++++++++++++++++++++----- sys/dev/enic/vnic_cq.c | 2 - sys/dev/enic/vnic_cq.h | 9 +- sys/dev/enic/vnic_dev.c | 244 ++++++++++++++++++++++++++++++++++++------- sys/dev/enic/vnic_dev.h | 9 +- sys/dev/enic/vnic_intr.c | 2 +- sys/dev/enic/vnic_intr.h | 2 +- sys/dev/enic/vnic_resource.h | 1 + sys/dev/enic/vnic_rq.c | 7 +- sys/dev/enic/vnic_rq.h | 1 - sys/dev/enic/vnic_rss.h | 5 - sys/dev/enic/vnic_wq.c | 106 +++++++++++++++++-- sys/dev/enic/vnic_wq.h | 18 +++- 18 files changed, 569 insertions(+), 165 deletions(-) diff --git a/sys/dev/enic/cq_desc.h b/sys/dev/enic/cq_desc.h index ae8847c6d9a1..4fb8cce7212e 100644 --- a/sys/dev/enic/cq_desc.h +++ b/sys/dev/enic/cq_desc.h @@ -44,14 +44,6 @@ struct cq_desc { #define CQ_DESC_COMP_NDX_BITS 12 #define CQ_DESC_COMP_NDX_MASK ((1 << CQ_DESC_COMP_NDX_BITS) - 1) -static inline void cq_color_enc(struct cq_desc *desc, const u8 color) -{ - if (color) - desc->type_color |= (1 << CQ_DESC_COLOR_SHIFT); - else - desc->type_color &= ~(1 << CQ_DESC_COLOR_SHIFT); -} - static inline void cq_desc_enc(struct cq_desc *desc, const u8 type, const u8 color, const u16 q_number, const u16 completed_index) @@ -87,11 +79,4 @@ static inline void cq_desc_dec(const struct cq_desc *desc_arg, CQ_DESC_COMP_NDX_MASK; } -static inline void cq_color_dec(const struct cq_desc *desc_arg, u8 *color) -{ - volatile const struct cq_desc *desc = desc_arg; - - *color = (desc->type_color >> CQ_DESC_COLOR_SHIFT) & CQ_DESC_COLOR_MASK; -} - #endif /* _CQ_DESC_H_ */ diff --git a/sys/dev/enic/enic.h b/sys/dev/enic/enic.h index 8c2212726548..eec6de823c9d 100644 --- a/sys/dev/enic/enic.h +++ b/sys/dev/enic/enic.h @@ -108,13 +108,13 @@ struct vnic_res { #define ENIC_DEFAULT_VXLAN_PORT 4789 /* - * Interrupt 0: LSC and errors * Interrupt 1: rx queue 0 * Interrupt 2: rx queue 1 * ... + * Interrupt x: LSC and errors */ #define ENICPMD_LSC_INTR_OFFSET 0 -#define ENICPMD_RXQ_INTR_OFFSET 1 +#define ENICPMD_RXQ_INTR_OFFSET 0 #include "vnic_devcmd.h" @@ -152,6 +152,9 @@ struct vnic_dev { u64 args[VNIC_DEVCMD_NARGS]; int in_reset; struct vnic_intr_coal_timer_info intr_coal_timer_info; + struct devcmd2_controller *devcmd2; + int (*devcmd_rtn)(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, + int wait); void *(*alloc_consistent)(void *priv, size_t size, bus_addr_t *dma_handle, struct iflib_dma_info *res, u8 *name); void (*free_consistent)(void *priv, size_t size, void *vaddr, @@ -175,6 +178,28 @@ struct intr_queue { struct enic_softc *softc; }; +#define ENIC_MAX_LINK_SPEEDS 3 +#define ENIC_LINK_SPEED_10G 10000 +#define ENIC_LINK_SPEED_4G 4000 +#define ENIC_LINK_40G_INDEX 2 +#define ENIC_LINK_10G_INDEX 1 +#define ENIC_LINK_4G_INDEX 0 +#define ENIC_RX_COALESCE_RANGE_END 125 +#define ENIC_AIC_TS_BREAK 100 + +struct enic_rx_coal { + u32 small_pkt_range_start; + u32 large_pkt_range_start; + u32 range_end; + u32 use_adaptive_rx_coalesce; +}; + +/* Store only the lower range. Higher range is given by fw. */ +struct enic_intr_mod_range { + u32 small_pkt_range_start; + u32 large_pkt_range_start; +}; + struct enic { struct enic *next; struct rte_pci_device *pdev; @@ -267,6 +292,9 @@ struct enic { uint64_t tx_offload_mask; /* PKT_TX flags accepted */ struct enic_softc *softc; int port_mtu; + struct enic_rx_coal rx_coalesce_setting; + u32 rx_coalesce_usecs; + u32 tx_coalesce_usecs; }; struct enic_softc { @@ -307,11 +335,6 @@ struct enic_softc { /* Per-instance private data structure */ -static inline unsigned int enic_vnic_rq_count(struct enic *enic) -{ - return enic->rq_count; -} - static inline unsigned int enic_cq_rq(struct enic *enic, unsigned int rq) { return rq; @@ -322,21 +345,6 @@ static inline unsigned int enic_cq_wq(struct enic *enic, unsigned int wq) return enic->rq_count + wq; } -static inline uint32_t -enic_ring_add(uint32_t n_descriptors, uint32_t i0, uint32_t i1) -{ - uint32_t d = i0 + i1; - d -= (d >= n_descriptors) ? n_descriptors : 0; - return d; -} - -static inline uint32_t -enic_ring_sub(uint32_t n_descriptors, uint32_t i0, uint32_t i1) -{ - int32_t d = i1 - i0; - return (uint32_t)((d < 0) ? ((int32_t)n_descriptors + d) : d); -} - static inline uint32_t enic_ring_incr(uint32_t n_descriptors, uint32_t idx) { @@ -346,34 +354,14 @@ enic_ring_incr(uint32_t n_descriptors, uint32_t idx) return idx; } -void enic_free_wq(void *txq); -int enic_alloc_intr_resources(struct enic *enic); int enic_setup_finish(struct enic *enic); -int enic_alloc_wq(struct enic *enic, uint16_t queue_idx, - unsigned int socket_id, uint16_t nb_desc); void enic_start_wq(struct enic *enic, uint16_t queue_idx); int enic_stop_wq(struct enic *enic, uint16_t queue_idx); void enic_start_rq(struct enic *enic, uint16_t queue_idx); -void enic_free_rq(void *rxq); -int enic_set_vnic_res(struct enic *enic); -int enic_init_rss_nic_cfg(struct enic *enic); -int enic_set_rss_reta(struct enic *enic, union vnic_rss_cpu *rss_cpu); -int enic_set_vlan_strip(struct enic *enic); +int enic_stop_rq(struct enic *enic, uint16_t queue_idx); +void enic_dev_disable(struct enic *enic); int enic_enable(struct enic *enic); int enic_disable(struct enic *enic); -void enic_remove(struct enic *enic); -int enic_get_link_status(struct enic *enic); -void enic_dev_stats_clear(struct enic *enic); -void enic_add_packet_filter(struct enic *enic); -int enic_set_mac_address(struct enic *enic, uint8_t *mac_addr); -int enic_del_mac_address(struct enic *enic, int mac_index); -unsigned int enic_cleanup_wq(struct enic *enic, struct vnic_wq *wq); - -void enic_post_wq_index(struct vnic_wq *wq); -int enic_probe(struct enic *enic); -int enic_clsf_init(struct enic *enic); -void enic_clsf_destroy(struct enic *enic); -int enic_set_mtu(struct enic *enic, uint16_t new_mtu); int enic_link_update(struct enic *enic); bool enic_use_vector_rx_handler(struct enic *enic); void enic_fdir_info(struct enic *enic); diff --git a/sys/dev/enic/enic_res.c b/sys/dev/enic/enic_res.c index d264874557a0..413873ad0fb4 100644 --- a/sys/dev/enic/enic_res.c +++ b/sys/dev/enic/enic_res.c @@ -95,11 +95,11 @@ int enic_get_vnic_config(struct enic *enic) dev_info(enic_get_dev(enic), "vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x " - "wq/rq %d/%d mtu d, max mtu:%d\n", + "wq/rq %d/%d mtu %d, max mtu:%d\n", enic->mac_addr[0], enic->mac_addr[1], enic->mac_addr[2], enic->mac_addr[3], enic->mac_addr[4], enic->mac_addr[5], c->wq_desc_count, c->rq_desc_count, - /* enic->rte_dev->data->mtu, */ enic->max_mtu); + c->mtu, enic->max_mtu); dev_info(enic_get_dev(enic), "vNIC csum tx/rx %s/%s " "rss %s intr mode %s type %s timer %d usec " "loopback tag 0x%04x\n", diff --git a/sys/dev/enic/enic_res.h b/sys/dev/enic/enic_res.h index 1a6f3a3ca98f..82963e61a44f 100644 --- a/sys/dev/enic/enic_res.h +++ b/sys/dev/enic/enic_res.h @@ -67,7 +67,5 @@ int enic_set_nic_cfg(struct enic *enic, u8 rss_default_cpu, u8 rss_hash_type, u8 ig_vlan_strip_en); void enic_get_res_counts(struct enic *enic); void enic_init_vnic_resources(struct enic *enic); -int enic_alloc_vnic_resources(struct enic *); -void enic_free_vnic_resources(struct enic *); #endif /* _ENIC_RES_H_ */ diff --git a/sys/dev/enic/enic_txrx.c b/sys/dev/enic/enic_txrx.c index 5a557fc7f94a..169041587d06 100644 --- a/sys/dev/enic/enic_txrx.c +++ b/sys/dev/enic/enic_txrx.c @@ -103,6 +103,7 @@ enic_isc_txd_encap(void *vsc, if_pkt_info_t pi) softc = vsc; enic = &softc->enic; + if_softc_ctx_t scctx = softc->scctx; wq = &enic->wq[pi->ipi_qsidx]; nsegs = pi->ipi_nsegs; @@ -112,6 +113,9 @@ enic_isc_txd_encap(void *vsc, if_pkt_info_t pi) head_idx = wq->head_idx; desc_count = wq->ring.desc_count; + if ((scctx->isc_capenable & IFCAP_RXCSUM) != 0) + offload_mode |= WQ_ENET_OFFLOAD_MODE_CSUM; + for (i = 0; i < nsegs; i++) { eop = 0; cq = 0; @@ -320,7 +324,7 @@ enic_isc_rxd_flush(void *vsc, uint16_t rxqid, uint8_t flid, qidx_t pidx) static int enic_legacy_intr(void *xsc) { - return -1; + return (1); } static inline void @@ -375,7 +379,7 @@ enic_wq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc, u8 type, vnic_wq_service(&enic->wq[q_number], cq_desc, completed_index, NULL, opaque); - return 0; + return (0); } static void @@ -384,7 +388,7 @@ vnic_rq_service(struct vnic_rq *rq, struct cq_desc *cq_desc, void(*buf_service)(struct vnic_rq *rq, struct cq_desc *cq_desc, /* struct vnic_rq_buf * *buf, */ int skipped, void *opaque), void *opaque) { - + if_softc_ctx_t scctx; if_rxd_info_t ri = (if_rxd_info_t) opaque; u8 type, color, eop, sop, ingress_port, vlan_stripped; u8 fcoe, fcoe_sof, fcoe_fc_crc_ok, fcoe_enc_error, fcoe_eof; @@ -396,6 +400,8 @@ vnic_rq_service(struct vnic_rq *rq, struct cq_desc *cq_desc, int cqidx; if_rxd_frag_t frag; + scctx = rq->vdev->softc->scctx; + cq_enet_rq_desc_dec((struct cq_enet_rq_desc *)cq_desc, &type, &color, &q_number, &completed_index, &ingress_port, &fcoe, &eop, &sop, &rss_type, @@ -419,6 +425,11 @@ vnic_rq_service(struct vnic_rq *rq, struct cq_desc *cq_desc, ri->iri_cidx = cqidx; ri->iri_nfrags = 1; ri->iri_len = bytes_written; + + if ((scctx->isc_capenable & IFCAP_RXCSUM) != 0) + if (!csum_not_calc && (tcp_udp_csum_ok || ipv4_csum_ok)) { + ri->iri_csum_flags = (CSUM_IP_CHECKED | CSUM_IP_VALID); + } } static int @@ -431,7 +442,7 @@ enic_rq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc, vnic_rq_service(&enic->rq[ri->iri_qsidx], cq_desc, completed_index, VNIC_RQ_RETURN_DESC, NULL, /* enic_rq_indicate_buf, */ opaque); - return 0; + return (0); } void @@ -468,10 +479,8 @@ enic_stop_wq(struct enic *enic, uint16_t queue_idx) int ret; ret = vnic_wq_disable(&enic->wq[queue_idx]); - if (ret) - return ret; - return 0; + return (ret); } void @@ -483,3 +492,19 @@ enic_start_rq(struct enic *enic, uint16_t queue_idx) vnic_rq_enable(rq); enic_initial_post_rx(enic, rq); } + +int +enic_stop_rq(struct enic *enic, uint16_t queue_idx) +{ + int ret; + + ret = vnic_rq_disable(&enic->rq[queue_idx]); + + return (ret); +} + + +void +enic_dev_disable(struct enic *enic) { + vnic_dev_disable(enic->vdev); +} diff --git a/sys/dev/enic/if_enic.c b/sys/dev/enic/if_enic.c index 154eedfd0a19..3d7efd345571 100644 --- a/sys/dev/enic/if_enic.c +++ b/sys/dev/enic/if_enic.c @@ -201,11 +201,11 @@ static struct if_shared_ctx enic_sctx_init = { * descriptor */ .isc_rx_nsegments = 1, /* One mapping per descriptor */ .isc_rx_maxsegsize = ENIC_DEFAULT_RX_MAX_PKT_SIZE, - .isc_admin_intrcnt = 3, + .isc_admin_intrcnt = 2, .isc_vendor_info = enic_vendor_info_array, .isc_driver_version = "1", .isc_driver = &enic_iflib_driver, - .isc_flags = IFLIB_HAS_RXCQ | IFLIB_HAS_TXCQ, + .isc_flags = IFLIB_HAS_RXCQ | IFLIB_HAS_TXCQ | IFLIB_SKIP_MSIX, /* * Number of receive queues per receive queue set, with associated @@ -235,6 +235,99 @@ enic_register(device_t dev) return (&enic_sctx_init); } +static int +enic_allocate_msix(struct enic_softc *softc) { + if_ctx_t ctx; + if_softc_ctx_t scctx; + if_shared_ctx_t sctx; + device_t dev; + cpuset_t cpus; + int queues, vectors, requested; + int err = 0; + + dev = softc->dev; + ctx = softc->ctx; + scctx = softc->scctx; + sctx = iflib_get_sctx(ctx); + + if (bus_get_cpus(dev, INTR_CPUS, sizeof(cpus), &cpus) != 0) { + device_printf(dev, "Unable to fetch CPU list\n"); + CPU_COPY(&all_cpus, &cpus); + } + + + queues = CPU_COUNT(&cpus); + queues = imin(queues, scctx->isc_nrxqsets); + queues = imin(queues, scctx->isc_ntxqsets); + requested = queues * 2 + sctx->isc_admin_intrcnt; + scctx->isc_nrxqsets = queues; + scctx->isc_ntxqsets = queues; + + vectors = requested; + if ((err = pci_alloc_msix(dev, &vectors)) != 0) { + device_printf(dev, + "failed to allocate %d MSI-X vectors, err: %d\n", requested, + err); + err = 1; + goto enic_allocate_msix_out; + } else { + if (vectors != requested) { + device_printf(dev, + "Unable to allocate sufficient MSI-X vectors " + "(got %d, need %d)\n", requested, vectors); + pci_release_msi(dev); + err = 1; + goto enic_allocate_msix_out; + } + } + + device_printf(dev, "Using MSI-X interrupts with %d vectors\n", + vectors); + + scctx->isc_intr = IFLIB_INTR_MSIX; + scctx->isc_vectors = vectors; + +enic_allocate_msix_out: + return (err); + +} + +static struct enic_intr_mod_range mod_range[ENIC_MAX_LINK_SPEEDS] = { + {0, 0}, /* 0 - 4 Gbps */ + {0, 3}, /* 4 - 10 Gbps */ + {3, 6}, /* 10 - 40 Gbps */ +}; + +static void enic_set_rx_coal_setting(struct enic *enic) +{ + unsigned int speed; + int index = -1; + struct enic_rx_coal *rx_coal = &enic->rx_coalesce_setting; + + /* 1. Read the link speed from fw + * 2. Pick the default range for the speed + * 3. Update it in enic->rx_coalesce_setting + */ + speed = vnic_dev_port_speed(enic->vdev); + if (ENIC_LINK_SPEED_10G < speed) + index = ENIC_LINK_40G_INDEX; + else if (ENIC_LINK_SPEED_4G < speed) + index = ENIC_LINK_10G_INDEX; + else + index = ENIC_LINK_4G_INDEX; + + rx_coal->small_pkt_range_start = mod_range[index].small_pkt_range_start; + rx_coal->large_pkt_range_start = mod_range[index].large_pkt_range_start; + rx_coal->range_end = ENIC_RX_COALESCE_RANGE_END; + + /* Start with the value provided by UCSM */ + for (index = 0; index < enic->rq_count; index++) + enic->cq[index].cur_rx_coal_timeval = + enic->config.intr_timer_usec; + + rx_coal->use_adaptive_rx_coalesce = 1; +} + static int enic_attach_pre(if_ctx_t ctx) { @@ -283,6 +376,8 @@ enic_attach_pre(if_ctx_t ctx) ENIC_LOCK(softc); vnic_dev_register(vdev, &softc->mem, 1); enic->vdev = vdev; + vnic_dev_cmd_init(enic->vdev); + vdev->devcmd = vnic_dev_get_res(vdev, RES_TYPE_DEVCMD, 0); vnic_dev_cmd(vdev, CMD_INIT_v1, &a0, &a1, wait); @@ -326,6 +421,7 @@ enic_attach_pre(if_ctx_t ctx) /* Set ingress vlan rewrite mode before vnic initialization */ enic->ig_vlan_rewrite_mode = IG_VLAN_REWRITE_MODE_UNTAG_DEFAULT_VLAN; + enic->ig_vlan_rewrite_mode = IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN; err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev, enic->ig_vlan_rewrite_mode); if (err) { @@ -360,8 +456,10 @@ enic_attach_pre(if_ctx_t ctx) softc->scctx = iflib_get_softc_ctx(ctx); scctx = softc->scctx; scctx->isc_txrx = &enic_txrx; - scctx->isc_capabilities = scctx->isc_capenable = 0; + scctx->isc_capabilities = scctx->isc_capenable = \ + IFCAP_HWCSUM; scctx->isc_tx_csum_flags = 0; + if_setmtu(softc->ifp, enic->config.mtu); scctx->isc_max_frame_size = enic->config.mtu + ETHER_HDR_LEN + \ ETHER_CRC_LEN; scctx->isc_nrxqsets_max = enic->conf_rq_count; @@ -389,7 +487,6 @@ enic_attach_pre(if_ctx_t ctx) } scctx->isc_tx_nsegments = 31; - scctx->isc_vectors = enic->conf_cq_count; scctx->isc_msix_bar = -1; ifmedia_add(softc->media, IFM_ETHER | IFM_AUTO, 0, NULL); @@ -397,8 +494,7 @@ enic_attach_pre(if_ctx_t ctx) ifmedia_add(softc->media, IFM_ETHER | IFM_10_FL, 0, NULL); /* - * Allocate the CQ here since TX is called first before RX for now - * assume RX and TX are the same + * Allocate the CQ here since TX is called first before RX. */ if (softc->enic.cq == NULL) softc->enic.cq = malloc(sizeof(struct vnic_cq) * @@ -407,8 +503,6 @@ enic_attach_pre(if_ctx_t ctx) if (softc->enic.cq == NULL) return (ENOMEM); - softc->enic.cq->ntxqsets = softc->enic.wq_count + softc->enic.rq_count; - /* * Allocate the consistent memory for stats and counters upfront so * both primary and secondary processes can access them. @@ -416,12 +510,20 @@ enic_attach_pre(if_ctx_t ctx) err = vnic_dev_alloc_stats_mem(enic->vdev); if (err) { dev_err(enic, "Failed to allocate cmd memory, aborting\n"); + goto err_out_dev_close; + } + + err = enic_allocate_msix(softc); + if (err) { + dev_err(enic, "Failed to allocate MSIX, aborting\n"); + goto err_out_dev_close; } return (rc); err_out_dev_close: vnic_dev_close(enic->vdev); + vnic_dev_deinit_devcmd2(enic->vdev); err_out_unregister: free(softc->vdev.devcmd, M_DEVBUF); free(softc->enic.intr_queues, M_DEVBUF); @@ -482,9 +584,10 @@ enic_msix_intr_assign(if_ctx_t ctx, int msix) snprintf(irq_name, sizeof(irq_name), "etxq%d:%d", i - scctx->isc_nrxqsets, device_get_unit(softc->dev)); - - iflib_softirq_alloc_generic(ctx, &enic->intr_queues[i].intr_irq, IFLIB_INTR_TX, &enic->wq[i - scctx->isc_nrxqsets], i - scctx->isc_nrxqsets, irq_name); - + iflib_softirq_alloc_generic(ctx, + &enic->intr_queues[i].intr_irq, IFLIB_INTR_TX, + &enic->wq[i - scctx->isc_nrxqsets], i - scctx->isc_nrxqsets, + irq_name); enic->intr[i].index = i; enic->intr[i].vdev = enic->vdev; @@ -567,6 +670,7 @@ enic_attach_post(if_ctx_t ctx) enic_setup_sysctl(softc); enic_init_vnic_resources(enic); + enic_set_rx_coal_setting(enic); enic_setup_finish(enic); ifmedia_add(softc->media, IFM_ETHER | IFM_AUTO, 0, NULL); @@ -589,7 +693,9 @@ enic_detach(if_ctx_t ctx) enic_free_irqs(softc); ENIC_LOCK(softc); + vnic_dev_deinit(enic->vdev); vnic_dev_close(enic->vdev); + vnic_dev_deinit_devcmd2(enic->vdev); free(softc->vdev.devcmd, M_DEVBUF); pci_disable_busmaster(softc->dev); enic_pci_mapping_free(softc); @@ -626,7 +732,7 @@ enic_tx_queues_alloc(if_ctx_t ctx, caddr_t * vaddrs, uint64_t * paddrs, for (q = 0; q < ntxqsets; q++) { struct vnic_wq *wq; struct vnic_cq *cq; - unsigned int cq_wq; + unsigned int cq_wq; wq = &softc->enic.wq[q]; cq_wq = enic_cq_wq(&softc->enic, q); @@ -646,7 +752,6 @@ enic_tx_queues_alloc(if_ctx_t ctx, caddr_t * vaddrs, uint64_t * paddrs, wq->head_idx = 0; wq->tail_idx = 0; - wq->ring.size = wq->ring.desc_count * wq->ring.desc_size; wq->ring.descs = vaddrs[q * ntxqs + 0]; wq->ring.base_addr = paddrs[q * ntxqs + 0]; @@ -659,7 +764,6 @@ enic_tx_queues_alloc(if_ctx_t ctx, caddr_t * vaddrs, uint64_t * paddrs, cq->ring.desc_count = softc->scctx->isc_ntxd[q]; cq->ring.desc_avail = cq->ring.desc_count - 1; - cq->ring.size = cq->ring.desc_count * cq->ring.desc_size; cq->ring.descs = vaddrs[q * ntxqs + 1]; cq->ring.base_addr = paddrs[q * ntxqs + 1]; @@ -715,7 +819,6 @@ enic_rx_queues_alloc(if_ctx_t ctx, caddr_t * vaddrs, uint64_t * paddrs, cq->ring.desc_count = softc->scctx->isc_nrxd[1]; cq->ring.desc_avail = cq->ring.desc_count - 1; - cq->ring.size = cq->ring.desc_count * cq->ring.desc_size; cq->ring.descs = vaddrs[q * nrxqs + 0]; cq->ring.base_addr = paddrs[q * nrxqs + 0]; @@ -731,7 +834,6 @@ enic_rx_queues_alloc(if_ctx_t ctx, caddr_t * vaddrs, uint64_t * paddrs, rq->ring.desc_count = softc->scctx->isc_nrxd[0]; rq->ring.desc_avail = rq->ring.desc_count - 1; - rq->ring.size = rq->ring.desc_count * rq->ring.desc_size; rq->ring.descs = vaddrs[q * nrxqs + 1]; rq->ring.base_addr = paddrs[q * nrxqs + 1]; rq->need_initial_post = true; @@ -807,6 +909,11 @@ enic_stop(if_ctx_t ctx) struct enic *enic; if_softc_ctx_t scctx; unsigned int index; + struct vnic_wq *wq; + struct vnic_rq *rq; + struct vnic_cq *cq; + unsigned int cq_wq, cq_rq; + softc = iflib_get_softc(ctx); scctx = softc->scctx; @@ -817,15 +924,36 @@ enic_stop(if_ctx_t ctx) softc->link_active = 0; softc->stopped = 1; + enic_dev_disable(enic); + for (index = 0; index < scctx->isc_ntxqsets; index++) { enic_stop_wq(enic, index); vnic_wq_clean(&enic->wq[index]); vnic_cq_clean(&enic->cq[enic_cq_rq(enic, index)]); + + wq = &softc->enic.wq[index]; + wq->ring.desc_avail = wq->ring.desc_count - 1; + wq->ring.last_count = wq->ring.desc_count; + wq->head_idx = 0; + wq->tail_idx = 0; + + cq_wq = enic_cq_wq(&softc->enic, index); + cq = &softc->enic.cq[cq_wq]; + cq->ring.desc_avail = cq->ring.desc_count - 1; } for (index = 0; index < scctx->isc_nrxqsets; index++) { + enic_stop_rq(enic, index); vnic_rq_clean(&enic->rq[index]); vnic_cq_clean(&enic->cq[enic_cq_wq(enic, index)]); + + rq = &softc->enic.rq[index]; + cq_rq = enic_cq_rq(&softc->enic, index); + cq = &softc->enic.cq[cq_rq]; + + cq->ring.desc_avail = cq->ring.desc_count - 1; + rq->ring.desc_avail = rq->ring.desc_count - 1; + rq->need_initial_post = true; } for (index = 0; index < scctx->isc_vectors; index++) { @@ -845,6 +973,9 @@ enic_init(if_ctx_t ctx) scctx = softc->scctx; enic = &softc->enic; + + enic_init_vnic_resources(enic); + for (index = 0; index < scctx->isc_ntxqsets; index++) enic_prep_wq_for_simple_tx(&softc->enic, index); @@ -862,6 +993,8 @@ enic_init(if_ctx_t ctx) vnic_dev_enable_wait(enic->vdev); ENIC_UNLOCK(softc); + softc->stopped = 0; + enic_link_status(softc); } @@ -942,12 +1075,14 @@ enic_mtu_set(if_ctx_t ctx, uint32_t mtu) softc = iflib_get_softc(ctx); enic = &softc->enic; + enic_stop(softc->ctx); if (mtu > enic->port_mtu){ return (EINVAL); } enic->config.mtu = mtu; scctx->isc_max_frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; + enic_init(softc->ctx); return (0); } @@ -1026,7 +1161,6 @@ static void enic_update_admin_status(if_ctx_t ctx) { struct enic_softc *softc; - softc = iflib_get_softc(ctx); enic_link_status(softc); @@ -1100,7 +1234,9 @@ enic_setup_txq_sysctl(struct vnic_wq *wq, int i, struct sysctl_ctx_list *ctx, { struct sysctl_oid *txsnode; struct sysctl_oid_list *txslist; - struct vnic_stats *stats = wq[i].vdev->stats; + struct vnic_stats *stats; + + stats = wq[i].vdev->stats; txsnode = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "hstats", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Host Statistics"); @@ -1136,7 +1272,9 @@ enic_setup_rxq_sysctl(struct vnic_rq *rq, int i, struct sysctl_ctx_list *ctx, { struct sysctl_oid *rxsnode; struct sysctl_oid_list *rxslist; - struct vnic_stats *stats = rq[i].vdev->stats; + struct vnic_stats *stats; + + stats = rq[i].vdev->stats; rxsnode = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "hstats", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Host Statistics"); @@ -1357,7 +1495,7 @@ enic_dev_init(struct enic *enic) if (vnic_dev_overlay_offload_cfg(enic->vdev, OVERLAY_CFG_VXLAN_PORT_UPDATE, ENIC_DEFAULT_VXLAN_PORT)) { dev_err(enic, "failed to update vxlan port\n"); - return -EINVAL; + return (EINVAL); } } return 0; @@ -1441,7 +1579,7 @@ enic_dev_wait(struct vnic_dev *vdev, int (*start) (struct vnic_dev *, int), return 0; usleep(1000); } - return -ETIMEDOUT; + return (ETIMEDOUT); } static int @@ -1452,7 +1590,7 @@ enic_map_bar(struct enic_softc *softc, struct enic_bar_info *bar, int bar_num, if (bar->res != NULL) { device_printf(softc->dev, "Bar %d already mapped\n", bar_num); - return EDOOFUS; + return (EDOOFUS); } bar->rid = PCIR_BAR(bar_num); @@ -1481,20 +1619,18 @@ enic_init_vnic_resources(struct enic *enic) unsigned int rxq_interrupt_enable = 0; unsigned int rxq_interrupt_offset = ENICPMD_RXQ_INTR_OFFSET; unsigned int txq_interrupt_enable = 0; - unsigned int txq_interrupt_offset = ENICPMD_RXQ_INTR_OFFSET; + unsigned int txq_interrupt_offset; unsigned int index = 0; unsigned int cq_idx; if_softc_ctx_t scctx; scctx = enic->softc->scctx; - rxq_interrupt_enable = 1; - txq_interrupt_enable = 1; + txq_interrupt_enable = 0; rxq_interrupt_offset = 0; - txq_interrupt_offset = enic->intr_count - 2; - txq_interrupt_offset = 1; + txq_interrupt_offset = scctx->isc_nrxqsets; for (index = 0; index < enic->intr_count; index++) { vnic_intr_alloc(enic->vdev, &enic->intr[index], index); @@ -1568,7 +1704,7 @@ enic_update_packet_filter(struct enic *enic) } static bool -enic_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) +enic_if_needs_restart(if_ctx_t ctx, enum iflib_restart_event event) { switch (event) { case IFLIB_RESTART_VLAN_CONFIG: diff --git a/sys/dev/enic/vnic_cq.c b/sys/dev/enic/vnic_cq.c index 72de29e5a381..bd3629530a61 100644 --- a/sys/dev/enic/vnic_cq.c +++ b/sys/dev/enic/vnic_cq.c @@ -40,6 +40,4 @@ void vnic_cq_clean(struct vnic_cq *cq) ENIC_BUS_WRITE_4(cq->ctrl, CQ_HEAD, 0); ENIC_BUS_WRITE_4(cq->ctrl, CQ_TAIL, 0); ENIC_BUS_WRITE_4(cq->ctrl, CQ_TAIL_COLOR, 1); - - vnic_dev_clear_desc_ring(&cq->ring); } diff --git a/sys/dev/enic/vnic_cq.h b/sys/dev/enic/vnic_cq.h index 26f9009612c5..7f875d57ed74 100644 --- a/sys/dev/enic/vnic_cq.h +++ b/sys/dev/enic/vnic_cq.h @@ -63,27 +63,22 @@ struct vnic_cq { unsigned int to_clean; unsigned int last_color; unsigned int interrupt_offset; + unsigned int cur_rx_coal_timeval; + unsigned int tobe_rx_coal_timeval; #ifdef ENIC_AIC struct vnic_rx_bytes_counter pkt_size_counter; unsigned int cur_rx_coal_timeval; unsigned int tobe_rx_coal_timeval; ktime_t prev_ts; #endif - int ntxqsets; - int nrxqsets; - int ntxqsets_start; - int nrxqsets_start; }; -void vnic_cq_free(struct vnic_cq *cq); void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable, unsigned int color_enable, unsigned int cq_head, unsigned int cq_tail, unsigned int cq_tail_color, unsigned int interrupt_enable, unsigned int cq_entry_enable, unsigned int message_enable, unsigned int interrupt_offset, u64 message_addr); void vnic_cq_clean(struct vnic_cq *cq); -int vnic_cq_mem_size(struct vnic_cq *cq, unsigned int desc_count, - unsigned int desc_size); static inline unsigned int vnic_cq_service(struct vnic_cq *cq, unsigned int work_to_do, diff --git a/sys/dev/enic/vnic_dev.c b/sys/dev/enic/vnic_dev.c index 3425d7372e56..a8228aed69aa 100644 --- a/sys/dev/enic/vnic_dev.c +++ b/sys/dev/enic/vnic_dev.c @@ -44,7 +44,7 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev, u8 type; if (num_bars == 0) - return -EINVAL; + return (EINVAL); rh = malloc(sizeof(*rh), M_DEVBUF, M_NOWAIT | M_ZERO); mrh = malloc(sizeof(*mrh), M_DEVBUF, M_NOWAIT | M_ZERO); @@ -52,7 +52,7 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev, pr_err("vNIC BAR0 res hdr not mem-mapped\n"); free(rh, M_DEVBUF); free(mrh, M_DEVBUF); - return -EINVAL; + return (EINVAL); } /* Check for mgmt vnic in addition to normal vnic */ @@ -69,7 +69,7 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev, rh->magic, rh->version); free(rh, M_DEVBUF); free(mrh, M_DEVBUF); - return -EINVAL; + return (EINVAL); } } @@ -97,6 +97,7 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev, case RES_TYPE_INTR_CTRL: case RES_TYPE_INTR_PBA_LEGACY: case RES_TYPE_DEVCMD: + case RES_TYPE_DEVCMD2: break; default: ENIC_BUS_READ_REGION_4(softc, mem, r_offset, (void *)r, sizeof(*r) / 4); @@ -167,17 +168,12 @@ unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring, ring->desc_size = VNIC_ALIGN(desc_size, desc_align); - ring->size = ring->desc_count * ring->desc_size; - ring->size_unaligned = ring->size + ring->base_align; + ring->size_unaligned = ring->desc_count * ring->desc_size \ + + ring->base_align; return ring->size_unaligned; } -void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring) -{ - memset(ring->descs, 0, ring->size); -} - static int _vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, int wait) { @@ -189,12 +185,12 @@ static int _vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, status = ENIC_BUS_READ_4(devcmd, DEVCMD_STATUS); if (status == 0xFFFFFFFF) { /* PCI-e target device is gone */ - return -ENODEV; + return (ENODEV); } if (status & STAT_BUSY) { pr_err("Busy devcmd %d\n", _CMD_N(cmd)); - return -EBUSY; + return (EBUSY); } if (_CMD_DIR(cmd) & _CMD_DIR_WRITE) { @@ -214,7 +210,7 @@ static int _vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, status = ENIC_BUS_READ_4(devcmd, DEVCMD_STATUS); if (status == 0xFFFFFFFF) { /* PCI-e target device is gone */ - return -ENODEV; + return (ENODEV); } if (!(status & STAT_BUSY)) { @@ -225,7 +221,7 @@ static int _vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, pr_err("Devcmd %d failed " \ "with error code %d\n", _CMD_N(cmd), err); - return err; + return (err); } if (_CMD_DIR(cmd) & _CMD_DIR_READ) { @@ -237,7 +233,82 @@ static int _vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, } pr_err("Timedout devcmd %d\n", _CMD_N(cmd)); - return -ETIMEDOUT; + return (ETIMEDOUT); +} + +static int _vnic_dev_cmd2(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, + int wait) +{ + struct devcmd2_controller *dc2c = vdev->devcmd2; + struct devcmd2_result *result; + u8 color; + unsigned int i; + u32 fetch_index, new_posted; + int delay, err; + u32 posted = dc2c->posted; + + fetch_index = ENIC_BUS_READ_4(dc2c->wq_ctrl, TX_FETCH_INDEX); + if (fetch_index == 0xFFFFFFFF) + return (ENODEV); + + new_posted = (posted + 1) % DEVCMD2_RING_SIZE; + + if (new_posted == fetch_index) { + device_printf(dev_from_vnic_dev(vdev), + "devcmd2 %d: wq is full. fetch index: %u, posted index: %u\n", + _CMD_N(cmd), fetch_index, posted); + return (EBUSY); + } + + dc2c->cmd_ring[posted].cmd = cmd; + dc2c->cmd_ring[posted].flags = 0; + + if ((_CMD_FLAGS(cmd) & _CMD_FLAGS_NOWAIT)) + dc2c->cmd_ring[posted].flags |= DEVCMD2_FNORESULT; + if (_CMD_DIR(cmd) & _CMD_DIR_WRITE) + for (i = 0; i < VNIC_DEVCMD_NARGS; i++) + dc2c->cmd_ring[posted].args[i] = vdev->args[i]; + + ENIC_BUS_WRITE_4(dc2c->wq_ctrl, TX_POSTED_INDEX, new_posted); + dc2c->posted = new_posted; + *** 657 LINES SKIPPED *** From nobody Wed Aug 27 19:22:10 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBvYG5SRDz65W1P; Wed, 27 Aug 2025 19:22:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBvYG2QHhz43bc; Wed, 27 Aug 2025 19:22:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SgC1ISmHGuU6aHxCK8XfIls5GWF6GCMeh10OeFopFhk=; b=v04bbmzAhK8Ybm+tXe+6lKzs9XellDFVOrIifHolap82pnFb9s3k/5t3PAqmcgDc/RGxd0 bN6TBwMhOvzTM2MwVX7rQ2xQKwJqYFoztyukS36gLT+JwK6TwG+8WFseAe8iVSb+rWYuVI q/RR7P7r/kdZm/0JNiSlK/bN0q8u31SO8pZzcNgxhCRNQXebOeNe3D5KKq6bjfZMcSoCZk JWFUAs2WNehWL7KwWPrBmXjXYFvwcTEg8UQL6Br6XL35PsEPouL7cUhWQk3bLpJXaFDFNV OXJKoUlFemJALhUfxo02JhkiOf92gMC12Hh7dz0rd59MZXhO1vgIMLLBS+DI4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SgC1ISmHGuU6aHxCK8XfIls5GWF6GCMeh10OeFopFhk=; b=vuwvGiBUgsfaI4mRslfV8FrIFV1+xYyCTE3baVqxBVav5a3L0f8Z/TC02jhlqOglEQXMOx QZhxf3hQio4I4sTpDX9j+6yZaX8zcqvF+L8MOAkreYtCO89Tz4+6gFSf+68MnoeyH5zW3P ByEqLHBvyiyKRdfnKez3k3JpkEQgdemQunR+f8b5Ha1xC3r/KBLpCDHCWwJjFvObgKbP0W yINMOFyHcRfTfmzwma0mlbEcFi5F4BwIbVeG+vTurE+/0f/zz5SMv3uk8GvbcJIl7vT10a YjqE/ClgpONr8Sl7jrNKqW5T4tAyBRVHIBorY05Xh8ZlPT2Tim2ZmXm8tbwoWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322530; a=rsa-sha256; cv=none; b=xAIiUVbUJbOooTwk3btWMqLm76i9CJ4ehUyDgIaXF/nllJbXZqT4GAzd9gl/3Ifnc3N8Vk zDavA8yc9h99lJd+dm/WISoXznneOk1XcdLGtgLkeYM3KsswsWAnGsa0jHNFidDads1I4B az5yqa1mXTqMojlLLUciPqibhp0ipA+o75EMxJa8vtjpfZlYVpE8g9EhqnkwvhODOy/dQN XZDZrvFPN3ofxJfwERs6SPm0q2Xl0GlED/OakZLKv89VJE3kX8f6EiWEAP5n2/P4NQ/Zol bZ+4nDWXrhcRWKH++DVXik+9kKJHsdHfNJfRHNoG0VAtTTnIWXp7Hv4IW9F+bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBvYG1sMfzbvR; Wed, 27 Aug 2025 19:22:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RJMAq9041007; Wed, 27 Aug 2025 19:22:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJMA8e041004; Wed, 27 Aug 2025 19:22:10 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:10 GMT Message-Id: <202508271922.57RJMA8e041004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 935c26dbe3a6 - stable/14 - libkern: Drop incorrect qsort optimization List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 935c26dbe3a6ce77cda9bd802fa45cdb938610a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=935c26dbe3a6ce77cda9bd802fa45cdb938610a6 commit 935c26dbe3a6ce77cda9bd802fa45cdb938610a6 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-15 18:01:02 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:49:58 +0000 libkern: Drop incorrect qsort optimization See 5205b32de3fb for details. PR: 287089 MFC after: 1 week Reviewed by: jlduran Differential Revision: https://reviews.freebsd.org/D51919 (cherry picked from commit ef8f3e913156aa268e07ae1daa68e3bc3f1c4d29) --- sys/libkern/qsort.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/sys/libkern/qsort.c b/sys/libkern/qsort.c index 2707d2ecb738..71cdceaa33dc 100644 --- a/sys/libkern/qsort.c +++ b/sys/libkern/qsort.c @@ -115,11 +115,10 @@ qsort(void *a, size_t n, size_t es, cmp_t *cmp) char *pa, *pb, *pc, *pd, *pl, *pm, *pn; size_t d1, d2; int cmp_result; - int swaptype_long, swaptype_int, swap_cnt; + int swaptype_long, swaptype_int; loop: SWAPINIT(long, a, es); SWAPINIT(int, a, es); - swap_cnt = 0; if (n < 7) { for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) for (pl = pm; @@ -148,7 +147,6 @@ loop: SWAPINIT(long, a, es); for (;;) { while (pb <= pc && (cmp_result = CMP(thunk, pb, a)) <= 0) { if (cmp_result == 0) { - swap_cnt = 1; swap(pa, pb); pa += es; } @@ -156,7 +154,6 @@ loop: SWAPINIT(long, a, es); } while (pb <= pc && (cmp_result = CMP(thunk, pc, a)) >= 0) { if (cmp_result == 0) { - swap_cnt = 1; swap(pc, pd); pd -= es; } @@ -165,18 +162,9 @@ loop: SWAPINIT(long, a, es); if (pb > pc) break; swap(pb, pc); - swap_cnt = 1; pb += es; pc -= es; } - if (swap_cnt == 0) { /* Switch to insertion sort */ - for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) - for (pl = pm; - pl > (char *)a && CMP(thunk, pl - es, pl) > 0; - pl -= es) - swap(pl, pl - es); - return; - } pn = (char *)a + n * es; d1 = MIN(pa - (char *)a, pb - pa); From nobody Wed Aug 27 19:22:09 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBvYF31nKz65W6q; Wed, 27 Aug 2025 19:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBvYF1TVYz43gk; Wed, 27 Aug 2025 19:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7MTtzovHBjtSIQOlWNCqWBf7UEed/SPfr1t9a2mgv3o=; b=PI+5GTl8vR2OHBAEafaSS7FF2UbwFw3+QqcKFXbisXX0k8qdFFkLtkVs1j1HvnzAqKfxeh PU9tgPx4RVvj8FTewzwUbG2EH92wUEGNzK3e3m4Cg5L+CxqsQ990KCSb+dY6YjQQuCvLtm DYYiL3QiVfMh7xIAzSNxpVbgzXx08hF67UabPcPCSPK8XvpNIzuqR4G7fknM7dws0Lo/Mm rZIIBCdGKIiSXwY+vOpxqEb5Na/xi9XwyTAPMN3GAaCZ4vyqHw6deVdO/yDUuSrcFb3iRJ SJaUkZezPb5I/YxESTbFjA6C8OHB0qEmDzmmvp4fJfk44xYlTNJhKjpAHxfC/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7MTtzovHBjtSIQOlWNCqWBf7UEed/SPfr1t9a2mgv3o=; b=DpwC1/jTWtDQ0Do64Sm4prx+O3TvTIQyWGC/SEBbkym0SgPFwf82epMY5M9VlE2ugImWXF nTAea6YElxX0KgSn8mOTDv1Wm35I4duy4EBK4PkUSdZYesLt4+soO5vovS3i1meujsQscv TG4epUvpV/ajBbcE9Lz2KqkvHBP5mo8h28brIiXDK01q9ZbjRi6fuPo3HDBG+blLfmv7kg TVSRS93RrGYDojntXlM5/hUZ+xlRmIwNKtrAYw4Mydb2irZo2lhaHxle6MxSZsW75TGXS0 OYUxBlH+SF6qBSR7CLBwoHVudUr4tGRb/aZLcai5xF25w1gD0pEo5rn2eGf/XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322529; a=rsa-sha256; cv=none; b=vvwzWyIeNmWzFkj21o9S5WZGSYYwJH89a1zE3pqbDWOym/ILyLmFjOBDFEhm1C6xCZa1+M fnG5SCEkQMZjPfXXPmFsKuw7FV4Npn3ks+WH4jZT2Jt3rJQNCHhk4h1M/3btNpnr7gAggY Xm1VsKY3WYol/0KrTZWc3LFBZY2+pwqlm9lJL/sMt2qf1PhMpdYc5QlcMeouvIy4E6Vguc t19vRV9csPlwAybUbpEEKCPxy6dCZhSOhBw2LvIMaYQZUiFyEe9RIKbT+Grxo1U54Eop2F nMZwnxZT70L0fAGbERL9R0Z1w06hOaBCsC/6eBTEYS4n7cPbcEb8OlxLd0aJig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBvYF0wXjzcCJ; Wed, 27 Aug 2025 19:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RJM97V040963; Wed, 27 Aug 2025 19:22:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJM9T1040960; Wed, 27 Aug 2025 19:22:09 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:09 GMT Message-Id: <202508271922.57RJM9T1040960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f1e93df44ba0 - stable/14 - libc: Drop incorrect qsort optimization List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f1e93df44ba0b494c6eda01958a71fec501bc32b Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f1e93df44ba0b494c6eda01958a71fec501bc32b commit f1e93df44ba0b494c6eda01958a71fec501bc32b Author: Dag-Erling Smørgrav AuthorDate: 2025-08-15 07:22:33 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:49:58 +0000 libc: Drop incorrect qsort optimization As pointed out in the PR and the article linked below, the switch to insertion sort in the BSD qsort code is based on a misunderstanding of Knuth's TAOCP and is actually a pessimization. As demonstrated by the added test, it is trivially easy to construct pathological input which results in quadratic runtime. Without that misguided optimization, the same input runs in nearly linearithmic time. https://www.raygard.net/2022/02/26/Re-engineering-a-qsort-part-3 PR: 287089 MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D51907 (cherry picked from commit 5205b32de3fb7702e96b3991f5b1a61eee406d8b) --- lib/libc/stdlib/qsort.c | 13 ----- lib/libc/tests/stdlib/Makefile | 1 + lib/libc/tests/stdlib/qsort_bench.c | 113 ++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 13 deletions(-) diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c index 22308887de1a..0735cf635b51 100644 --- a/lib/libc/stdlib/qsort.c +++ b/lib/libc/stdlib/qsort.c @@ -109,13 +109,11 @@ local_qsort(void *a, size_t n, size_t es, cmp_t *cmp, void *thunk) char *pa, *pb, *pc, *pd, *pl, *pm, *pn; size_t d1, d2; int cmp_result; - int swap_cnt; /* if there are less than 2 elements, then sorting is not needed */ if (__predict_false(n < 2)) return; loop: - swap_cnt = 0; if (n < 7) { for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) for (pl = pm; @@ -144,7 +142,6 @@ loop: for (;;) { while (pb <= pc && (cmp_result = CMP(thunk, pb, a)) <= 0) { if (cmp_result == 0) { - swap_cnt = 1; swapfunc(pa, pb, es); pa += es; } @@ -152,7 +149,6 @@ loop: } while (pb <= pc && (cmp_result = CMP(thunk, pc, a)) >= 0) { if (cmp_result == 0) { - swap_cnt = 1; swapfunc(pc, pd, es); pd -= es; } @@ -161,18 +157,9 @@ loop: if (pb > pc) break; swapfunc(pb, pc, es); - swap_cnt = 1; pb += es; pc -= es; } - if (swap_cnt == 0) { /* Switch to insertion sort */ - for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) - for (pl = pm; - pl > (char *)a && CMP(thunk, pl - es, pl) > 0; - pl -= es) - swapfunc(pl, pl - es, es); - return; - } pn = (char *)a + n * es; d1 = MIN(pa - (char *)a, pb - pa); diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile index 974bbf7c0704..14f1ab022c37 100644 --- a/lib/libc/tests/stdlib/Makefile +++ b/lib/libc/tests/stdlib/Makefile @@ -13,6 +13,7 @@ ATF_TESTS_C+= qsort_b_test ATF_TESTS_C+= qsort_r_compat_test ATF_TESTS_C+= qsort_r_test ATF_TESTS_C+= qsort_s_test +ATF_TESTS_C+= qsort_bench ATF_TESTS_C+= quick_exit_test ATF_TESTS_C+= set_constraint_handler_s_test ATF_TESTS_C+= strfmon_test diff --git a/lib/libc/tests/stdlib/qsort_bench.c b/lib/libc/tests/stdlib/qsort_bench.c new file mode 100644 index 000000000000..5f2cfae40140 --- /dev/null +++ b/lib/libc/tests/stdlib/qsort_bench.c @@ -0,0 +1,113 @@ +/*- + * Copyright (c) 2025 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include +#include +#include + +/*- + * Measures qsort(3) runtime with pathological input and verify that it + * stays close to N * log2(N). + * + * Thanks to Vivian Hussey for the proof of concept. + * + * The input we construct is similar to a sweep from 0 to N where each + * half, except for the first element, has been reversed; for instance, + * with N = 8, we get { 0, 3, 2, 1, 4, 8, 7, 6 }. This triggers a bug in + * the BSD qsort(3) where it will switch to insertion sort if the pivots + * are sorted. + * + * This article goes into more detail about the bug and its origin: + * + * https://www.raygard.net/2022/02/26/Re-engineering-a-qsort-part-3 + * + * With this optimization (the `if (swap_cnt == 0)` block), qsort(3) needs + * roughly N * N / 4 comparisons to sort our pathological input. Without + * it, it needs only a little more than N * log2(N) comparisons. + */ + +/* we stop testing once a single takes longer than this */ +#define MAXRUNSECS 10 + +static bool debugging; + +static uintmax_t ncmp; + +static int +intcmp(const void *a, const void *b) +{ + ncmp++; + return ((*(int *)a > *(int *)b) - (*(int *)a < *(int *)b)); +} + +static void +qsort_bench(int log2n) +{ + uintmax_t n = 1LLU << log2n; + int *buf; + + /* fill an array with a pathological pattern */ + ATF_REQUIRE(buf = malloc(n * sizeof(*buf))); + buf[0] = 0; + buf[n / 2] = n / 2; + for (unsigned int i = 1; i < n / 2; i++) { + buf[i] = n / 2 - i; + buf[n / 2 + i] = n - i; + } + + ncmp = 0; + qsort(buf, n, sizeof(*buf), intcmp); + + /* check result and free array */ + if (debugging) { + for (unsigned int i = 1; i < n; i++) { + ATF_REQUIRE_MSG(buf[i] > buf[i - 1], + "array is not sorted"); + } + } + free(buf); + + /* check that runtime does not exceed N² */ + ATF_CHECK_MSG(ncmp / n < n, + "runtime %ju exceeds N² for N = %ju", ncmp, n); + + /* check that runtime does not exceed N log N by much */ + ATF_CHECK_MSG(ncmp / n <= log2n + 1, + "runtime %ju exceeds N log N for N = %ju", ncmp, n); +} + +ATF_TC_WITHOUT_HEAD(qsort_bench); +ATF_TC_BODY(qsort_bench, tc) +{ + struct timespec t0, t1; + uintmax_t tus; + + for (int i = 10; i <= 30; i++) { + clock_gettime(CLOCK_UPTIME, &t0); + qsort_bench(i); + clock_gettime(CLOCK_UPTIME, &t1); + tus = t1.tv_sec * 1000000 + t1.tv_nsec / 1000; + tus -= t0.tv_sec * 1000000 + t0.tv_nsec / 1000; + if (debugging) { + fprintf(stderr, "N = 2^%d in %ju.%06jus\n", + i, tus / 1000000, tus % 1000000); + } + /* stop once an individual run exceeds our limit */ + if (tus / 1000000 >= MAXRUNSECS) + break; + } +} + +ATF_TP_ADD_TCS(tp) +{ + debugging = !getenv("__RUNNING_INSIDE_ATF_RUN") && + isatty(STDERR_FILENO); + ATF_TP_ADD_TC(tp, qsort_bench); + return (atf_no_error()); +} From nobody Wed Aug 27 19:22:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBvYH5flZz65WHC; Wed, 27 Aug 2025 19:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBvYH3RSxz43gm; Wed, 27 Aug 2025 19:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KxKiqfWluhekpr10V4nOn5m0qtiz3KP2MEApKisfSgA=; b=IwWgPfb1F+bF6bnRhp0U1RBBlLyR91dtFAGajBdFtlD3dvkkkGuMGB8gz1u/k0jPVYhFpJ 3S7oBbgvh67U/gr6nybZsb5J2a1JDVqZ/UfBE8hVmNRNq2L1wXt/i2mVG+4CYWfxEWhh2u 7stYs8uz4rXf8Zhfp0nijwBJzYDGA2dWRneunTf3pNtg7+jzo9hj8heZ0Nn4Jq/iKSN36G I2NFOOLIZmS4ELsvml0xexaVHOYeSoB77CuPBbmpUESPPjqkVno92gNqSBVw10hcgsSMFF H5hVviQSaZFJ1wlRDP+A/DSMxresxd7rg6HhMtiaFhEScCr5wvPVCAcpAM9EVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KxKiqfWluhekpr10V4nOn5m0qtiz3KP2MEApKisfSgA=; b=p9IODO8Kxuqgfuhra2ewlvRH6uDROreM4PPKqknzDF61SUGaHH3jJZmgdAentwPsExf0cp S/c0z7766MwBQlk56s3+p8HA2q97kf8mk7NYujQN/86vLzKaLec4JhRmmanxgd4zDPKV8+ bQ0jtGDRbcUi2Pb4ZObRrLqHuRH6CyUesF8QJ/MYi88eZngnoQxT/kHnRaqMIcI3EjPwDG AT9zqbv8a5gKcf7Ow4LkRvKNoCqfmE8gSOYYJVaGHCYALiXibMIxDNgdhTu2E3V+jbPhet xk2xhP8/mloUNRkC418vWy1hyMhPJ/dCSJTzmoqdJ1tas5DkP3qTV3dC339KtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322531; a=rsa-sha256; cv=none; b=qIEzs5EzLn4+pnSHcAZvMF8XObkfqVnT9BuzcDkATmRgIbpCHn0GE/OloZHZLvlJh+nRO2 92z7ah75aJaQoXdAWOR3DDtBcnUUfpqewBw8JQLG7b2iLO9d2HhF5YPs//i+MFk+71vzIv nxIrN8nIF/hsOeMDWKjaEmZWVG5j6s+ZITnLAr2rvRpwbPOEw0N/KviiRjsTpsDdMGH7ka GLboRSOzo05WLG03gI8oumuO+vd1HWYaTAhKR6FtdAmSSWTffbBr+/5CPZNIrGXYNHExFT vld//24QAb3lzumoIkSc65nPK6HNw5WPQnxbqWdTlHCa/FN3VqVTZ0TycubebA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBvYH2nvqzcc7; Wed, 27 Aug 2025 19:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RJMBbZ041042; Wed, 27 Aug 2025 19:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJMBYG041039; Wed, 27 Aug 2025 19:22:11 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:11 GMT Message-Id: <202508271922.57RJMBYG041039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bb6dfb08f061 - stable/14 - freebsd-update: Do not fsync List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bb6dfb08f0619b14ad9b68cca592db65b152c194 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bb6dfb08f0619b14ad9b68cca592db65b152c194 commit bb6dfb08f0619b14ad9b68cca592db65b152c194 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-15 18:04:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:49:58 +0000 freebsd-update: Do not fsync Fsyncing each file we install slows us down significantly and adds little to no safety. MFC after: 1 week PR: 287897 (cherry picked from commit 20f0996700a8e60780931e7fde65899040465f4e) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index f575f89bcf82..8ec380bd2f17 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2952,7 +2952,7 @@ install_from_index () { if [ -z "${LINK}" ]; then # Create a file, without setting flags. gunzip < files/${HASH}.gz > ${HASH} - install -S -o ${OWNER} -g ${GROUP} \ + install -o ${OWNER} -g ${GROUP} \ -m ${PERM} ${HASH} ${BASEDIR}/${FPATH} rm ${HASH} else From nobody Wed Aug 27 19:22:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBvYJ6Mpxz65WC4; Wed, 27 Aug 2025 19:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBvYJ3lVKz43bk; Wed, 27 Aug 2025 19:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ks7aAiGWEd2cKd6HkRycx9PZ3zoGH+fuY58CpYdJdKE=; b=Nse1s+eeZupVMMfbMoooROL5QNgDpk8yaFg2yk6WcAn4Ab/Ep6UhXL/E4zTYtoPUvcWFF7 bjpSSkzwCyGaZiahJ4AxCFnbZg2cAyr5HV3+97ZgPAxwriI44ZIy6VUMhxw4IVHhhIfjO6 ril23/06TH9XH93WQsJF0bNwWv/KTMVWmrGgJ1lp3V452iX61zeZ2kHn4yiFEo/eLBmh25 C56Jc4M7p4TpP0/q7CCZIlTXB/T6URC9aMiYAZ3kadaAhOIaflWW60HvQM/GdjOxlgMcvh 8yvChLoaGruas6U3sIfjHCS87n7dpUwjWAygssVHrvZOvchBPNN8e1P7Q3CKbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ks7aAiGWEd2cKd6HkRycx9PZ3zoGH+fuY58CpYdJdKE=; b=ATlNZPIUkzHgqp39Uc7Y1ezpfh1P8Zs25cFCzBPNf4fX+VCZub8j9NB8IQTuGW3L/2DHZC YOCxh7yjSTyyu7IDOB/vnn2VOlbWlIhemkTk1Vs2LQg5Vn3ZgHhoCPAH/YR8K14G5yr4bp mHAdCCVRBLulXXvyM6gq1zXFldSftPoCTjGiO4eiIV9qB2cwcBAi5nAg8guusI5HCMsBxZ 5owhuFvlI8KpoGRPWdXV8GUlKp2xcjGtLlgCnlWc0+c7i9AKYE15tSaudYPEwSTuB/q/Iy S8q2Y32r6C5sc1HmOChWfAsf+XaHKe9JwHEmM9NcQnlSykpVr0DeVImfN6RJow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322532; a=rsa-sha256; cv=none; b=DGUQCgBVnnw9Viiar5NDc5ydB2KfYsDqsvCifV/njG/ruoS5O2NLQHZTZH2wx16cA55cht bDJXaRDlJjCZhtUJ3WLA2+kg7E+uZD+GYC0RTOh3n0oyYzov1q/yUSi2W3s+akCSKW903A 6rUg0K/vzz1ajsP2qEJ+kiP7T/5tzDP2EGb3bHizvOl380uKQqc7Af+ofnlNpJuvAY/zKh nYHxX3S4owI1eoN/AuG4loQnAJccCD8oy0vcQyAD8IVUU1aQKZ2zlXnUxRjYcGpEBUf1zF 1qZQmqYUQCQ9ON0RJEKUfC6aETtUH+IDKVktaFA2AStW7PSfzcwPmqLce1i3Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBvYJ3Hc2zbyC; Wed, 27 Aug 2025 19:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RJMCNE041178; Wed, 27 Aug 2025 19:22:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJMCLV041170; Wed, 27 Aug 2025 19:22:12 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:12 GMT Message-Id: <202508271922.57RJMCLV041170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c9c1ecb811d9 - stable/13 - libc: Drop incorrect qsort optimization List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c9c1ecb811d99d329b2250ee7bd7c044d759ea33 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c9c1ecb811d99d329b2250ee7bd7c044d759ea33 commit c9c1ecb811d99d329b2250ee7bd7c044d759ea33 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-15 07:22:33 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:50:57 +0000 libc: Drop incorrect qsort optimization As pointed out in the PR and the article linked below, the switch to insertion sort in the BSD qsort code is based on a misunderstanding of Knuth's TAOCP and is actually a pessimization. As demonstrated by the added test, it is trivially easy to construct pathological input which results in quadratic runtime. Without that misguided optimization, the same input runs in nearly linearithmic time. https://www.raygard.net/2022/02/26/Re-engineering-a-qsort-part-3 PR: 287089 MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D51907 (cherry picked from commit 5205b32de3fb7702e96b3991f5b1a61eee406d8b) --- lib/libc/stdlib/qsort.c | 13 ----- lib/libc/tests/stdlib/Makefile | 1 + lib/libc/tests/stdlib/qsort_bench.c | 113 ++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 13 deletions(-) diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c index dc0a5452161e..8a2d5ae97cd5 100644 --- a/lib/libc/stdlib/qsort.c +++ b/lib/libc/stdlib/qsort.c @@ -104,13 +104,11 @@ local_qsort(void *a, size_t n, size_t es, cmp_t *cmp, void *thunk) char *pa, *pb, *pc, *pd, *pl, *pm, *pn; size_t d1, d2; int cmp_result; - int swap_cnt; /* if there are less than 2 elements, then sorting is not needed */ if (__predict_false(n < 2)) return; loop: - swap_cnt = 0; if (n < 7) { for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) for (pl = pm; @@ -139,7 +137,6 @@ loop: for (;;) { while (pb <= pc && (cmp_result = CMP(thunk, pb, a)) <= 0) { if (cmp_result == 0) { - swap_cnt = 1; swapfunc(pa, pb, es); pa += es; } @@ -147,7 +144,6 @@ loop: } while (pb <= pc && (cmp_result = CMP(thunk, pc, a)) >= 0) { if (cmp_result == 0) { - swap_cnt = 1; swapfunc(pc, pd, es); pd -= es; } @@ -156,18 +152,9 @@ loop: if (pb > pc) break; swapfunc(pb, pc, es); - swap_cnt = 1; pb += es; pc -= es; } - if (swap_cnt == 0) { /* Switch to insertion sort */ - for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) - for (pl = pm; - pl > (char *)a && CMP(thunk, pl - es, pl) > 0; - pl -= es) - swapfunc(pl, pl - es, es); - return; - } pn = (char *)a + n * es; d1 = MIN(pa - (char *)a, pb - pa); diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile index 9df98bd4f435..b86dcb28cb1e 100644 --- a/lib/libc/tests/stdlib/Makefile +++ b/lib/libc/tests/stdlib/Makefile @@ -11,6 +11,7 @@ ATF_TESTS_C+= qsort_b_test .endif ATF_TESTS_C+= qsort_r_test ATF_TESTS_C+= qsort_s_test +ATF_TESTS_C+= qsort_bench ATF_TESTS_C+= quick_exit_test ATF_TESTS_C+= set_constraint_handler_s_test ATF_TESTS_C+= strfmon_test diff --git a/lib/libc/tests/stdlib/qsort_bench.c b/lib/libc/tests/stdlib/qsort_bench.c new file mode 100644 index 000000000000..5f2cfae40140 --- /dev/null +++ b/lib/libc/tests/stdlib/qsort_bench.c @@ -0,0 +1,113 @@ +/*- + * Copyright (c) 2025 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include +#include +#include + +/*- + * Measures qsort(3) runtime with pathological input and verify that it + * stays close to N * log2(N). + * + * Thanks to Vivian Hussey for the proof of concept. + * + * The input we construct is similar to a sweep from 0 to N where each + * half, except for the first element, has been reversed; for instance, + * with N = 8, we get { 0, 3, 2, 1, 4, 8, 7, 6 }. This triggers a bug in + * the BSD qsort(3) where it will switch to insertion sort if the pivots + * are sorted. + * + * This article goes into more detail about the bug and its origin: + * + * https://www.raygard.net/2022/02/26/Re-engineering-a-qsort-part-3 + * + * With this optimization (the `if (swap_cnt == 0)` block), qsort(3) needs + * roughly N * N / 4 comparisons to sort our pathological input. Without + * it, it needs only a little more than N * log2(N) comparisons. + */ + +/* we stop testing once a single takes longer than this */ +#define MAXRUNSECS 10 + +static bool debugging; + +static uintmax_t ncmp; + +static int +intcmp(const void *a, const void *b) +{ + ncmp++; + return ((*(int *)a > *(int *)b) - (*(int *)a < *(int *)b)); +} + +static void +qsort_bench(int log2n) +{ + uintmax_t n = 1LLU << log2n; + int *buf; + + /* fill an array with a pathological pattern */ + ATF_REQUIRE(buf = malloc(n * sizeof(*buf))); + buf[0] = 0; + buf[n / 2] = n / 2; + for (unsigned int i = 1; i < n / 2; i++) { + buf[i] = n / 2 - i; + buf[n / 2 + i] = n - i; + } + + ncmp = 0; + qsort(buf, n, sizeof(*buf), intcmp); + + /* check result and free array */ + if (debugging) { + for (unsigned int i = 1; i < n; i++) { + ATF_REQUIRE_MSG(buf[i] > buf[i - 1], + "array is not sorted"); + } + } + free(buf); + + /* check that runtime does not exceed N² */ + ATF_CHECK_MSG(ncmp / n < n, + "runtime %ju exceeds N² for N = %ju", ncmp, n); + + /* check that runtime does not exceed N log N by much */ + ATF_CHECK_MSG(ncmp / n <= log2n + 1, + "runtime %ju exceeds N log N for N = %ju", ncmp, n); +} + +ATF_TC_WITHOUT_HEAD(qsort_bench); +ATF_TC_BODY(qsort_bench, tc) +{ + struct timespec t0, t1; + uintmax_t tus; + + for (int i = 10; i <= 30; i++) { + clock_gettime(CLOCK_UPTIME, &t0); + qsort_bench(i); + clock_gettime(CLOCK_UPTIME, &t1); + tus = t1.tv_sec * 1000000 + t1.tv_nsec / 1000; + tus -= t0.tv_sec * 1000000 + t0.tv_nsec / 1000; + if (debugging) { + fprintf(stderr, "N = 2^%d in %ju.%06jus\n", + i, tus / 1000000, tus % 1000000); + } + /* stop once an individual run exceeds our limit */ + if (tus / 1000000 >= MAXRUNSECS) + break; + } +} + +ATF_TP_ADD_TCS(tp) +{ + debugging = !getenv("__RUNNING_INSIDE_ATF_RUN") && + isatty(STDERR_FILENO); + ATF_TP_ADD_TC(tp, qsort_bench); + return (atf_no_error()); +} From nobody Wed Aug 27 19:22:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBvYJ6M4Lz65WDy; Wed, 27 Aug 2025 19:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBvYJ3llcz43k8; Wed, 27 Aug 2025 19:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xV47aeDH1pM8liOkwBuM7ZTd7NrVvaVM4G8C287mjhw=; b=auKAlVSkXv2s1dDdal2YWWDJe5ry16bYYZkNYTUm72BrgsKIDDRFVb3pY4sJN4CZx4dzgB 0XLoI26uoZMEMqgUDH5wF/bGZxs3Oy29eMVTMam14XbHEK4qlP2dbniDL/o8U7uMKUTZsH 2CXI+A3TmBA3TdmQYsfFd4mIMbbEFHCcCFprfrxjrKbHDsWfOViXl7NH8WfyOl+diCasx0 n1+z1S8xN2Y03OzVRnGCXjy2mkAE7yJVjodQ4G0HJV3YzoEs6I+XrG9P5Aj829joFnUub5 HftE9fIzsjaClCWbLtd2/ZPS9JD7ApWRoTrkV0QH/LRAf10sx2eg0e6aXwDgMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xV47aeDH1pM8liOkwBuM7ZTd7NrVvaVM4G8C287mjhw=; b=MGgiE21bDBorfD0flnaOIabJm73EvH6+GO4VtJF0R3uod8iLS15Ivgi3UIz+d7LjqyuDZJ yzTseK2cA2aVd5EC4ksok5Ye1ClDyBKbGPDad0zpVNHByrqgMqQ9XjIPGnsznzf01knZHR HW38ZAIpXtcZLv1SDOd2pcE0xOBr378i645CRnAD6m1kK6Pq9SsG+81a6SftxsUCJNP/Xv a9YhfFIWMpATguxbkB1Bzr3f+Rl6rg9tk2w+JN32M1tpXDln4oShYM42LpSu5MJzpEcmXY Em/VXSMeZiesk2+/YecInmkdI35Ll0pguwnywYmMnKg3NGq8B6c88y4op01HjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322532; a=rsa-sha256; cv=none; b=txSE4oFBWnORtimP9I9SX0uDX3wE2rLy85DwcAFewFugLdOSa1Tdjau2E9FKLlKGhp4/oT yPZR3QnFI/nYRDzDqEVhw5c+GscfmhI1zhuOhoRaL8uXZeXP43ZsfE/pzu+HcCMdoWeDRh 4p0g9SY/ABk65oizwDNZJblFyiQQQQObgTEHQn4kC6xxWgBPZcZzUhMf7sa5yQ2fL4wJyS RZEYY2aaxuU0zOCjf3vA491/SeXbDHRdn101DtHQdmTTWDO66auyqfB/Ar2z6Aj4lJMkoY FugZ6rt7gZ56Vl2mTjJElZy4SDmxHgntWPXaV56JtALA5PLnguyYUSqwNsEGHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBvYJ3JBFzc8p; Wed, 27 Aug 2025 19:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RJMCja041179; Wed, 27 Aug 2025 19:22:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJMCNN041175; Wed, 27 Aug 2025 19:22:12 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:12 GMT Message-Id: <202508271922.57RJMCNN041175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: d62cfe703fd1 - stable/14 - getmntpoint: Don't compare st_rdev for non-devices List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d62cfe703fd1fb53bc0006b3724428a3dc8991f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d62cfe703fd1fb53bc0006b3724428a3dc8991f1 commit d62cfe703fd1fb53bc0006b3724428a3dc8991f1 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-17 17:07:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:49:58 +0000 getmntpoint: Don't compare st_rdev for non-devices If the mntfromname of a mountpoint is not a device (e.g. nullfs, tarfs, procfs) we shouldn't compare st_rdev, as any match will be spurious. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D51945 (cherry picked from commit 8073a5137f223bb481606b15edaa5ecb93ceffcb) --- sbin/mount/getmntopts.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index 31987f7b0b78..fab25466425f 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -192,6 +192,7 @@ getmntpoint(const char *name) strncpy(statfsp->f_mntfromname, device, len); } if (stat(ddevname, &mntdevstat) == 0 && + S_ISCHR(mntdevstat.st_mode) && mntdevstat.st_rdev == devstat.st_rdev) return (statfsp); } From nobody Wed Aug 27 19:22:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBvYK758cz65WF0; Wed, 27 Aug 2025 19:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBvYK4jK4z43bq; Wed, 27 Aug 2025 19:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FEgum8TH+XH+KR+07mjnct5dlwCKB7+p8mvpSigs2UY=; b=WoVHtAtQxaI7OzB/VunITc0wZfPoLiIpU3W4eiOTOcYlap5/cP73mUF5jokIjxY3ITqytw FZlIaFsgCk8jKtdVBFbHcWDdUsEP597T0XxnTRFzA3Vdp0yE6GlF8Fqr0cI6l0DOwj397u I29+oMefukrFPF3XK3wW7EV7iJbeNxN4gg4En0FlbwapQ2EwXKoDiFBO9B42FLfRUabmlT HErfQRphb/wxaWAnaTYb86jxCvO+TzSBS6R1FKFx6DR77xS8X9BQ2RcJkcH3+7qgEsetj4 bFWty1iCrITukVBrXOtUdgCYCcXTIHh4+C8i9AJilhXpM8aIW938A6EybkG8KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FEgum8TH+XH+KR+07mjnct5dlwCKB7+p8mvpSigs2UY=; b=af9RFm7ficPq3A6tWNPJTDwj+pMpPl6IJaxWNntXaEKGm23yfU8nd6mjBuNr+qhAfySsLK fGWl1PXZLfhrSZPUARUcT83wN7WVbdREjG+Uk87cbEztQa3DmV1m6T6ARc+mW8kVbLo3+I okMreqlPFCQIusg7yAYjthXz61KouAzaDJoardE8w0kp40axSMvE4Zp/0SPfFQYzjPUPpe BT2iIhbIcOeCuEfeRbQomd5IRBldhWIlcfw//WpVVHAJnioE5MPYGMTsURHBWbRwjVNmf8 svl3BDjIhGlnApwzZuTGojK8pbptFrcPiPpYFHyV+/Z566LYg2N4nww+Ere0SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322533; a=rsa-sha256; cv=none; b=Bc7Uyx8Iq63m1Vn9VqnlI1b3jyT5oifPDBiZL8mcdQWxAF8u9VSZdNXWft+mGMpALIGusS RRJPbwaLRit6R+/KSQkj74aWkT94WxpOoR9r2aUSJ6REC18JvSpPNyecgCJ2QjjZHfKCBF HSRVIOdigREp1oifW0ZBIqZ8ZNdYn2y/XogyqqoILLGoI5gZRbFHUK0bTuurlJHouN13vr WwtdUfpzNLvBY69keNhFEAThiFNuJVeAHJxfLJOHqOHHMj+IzZfaWMCLnL9m0Z+rJNoeQo uvNg5PGrI38XraUI26j3HrLwtKr63u/0S8iWgvlb/AqOwr/Xe9tWVXS3kguhDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBvYK4HmSzc8q; Wed, 27 Aug 2025 19:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RJMDDt041252; Wed, 27 Aug 2025 19:22:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJMD4H041244; Wed, 27 Aug 2025 19:22:13 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:13 GMT Message-Id: <202508271922.57RJMD4H041244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: af321075b4d2 - stable/13 - libkern: Drop incorrect qsort optimization List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: af321075b4d26f78aa29a207987551086379e592 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=af321075b4d26f78aa29a207987551086379e592 commit af321075b4d26f78aa29a207987551086379e592 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-15 18:01:02 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:50:57 +0000 libkern: Drop incorrect qsort optimization See 5205b32de3fb for details. PR: 287089 MFC after: 1 week Reviewed by: jlduran Differential Revision: https://reviews.freebsd.org/D51919 (cherry picked from commit ef8f3e913156aa268e07ae1daa68e3bc3f1c4d29) --- sys/libkern/qsort.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/sys/libkern/qsort.c b/sys/libkern/qsort.c index f3b3c23d18ac..0775dff6361e 100644 --- a/sys/libkern/qsort.c +++ b/sys/libkern/qsort.c @@ -115,11 +115,10 @@ qsort(void *a, size_t n, size_t es, cmp_t *cmp) char *pa, *pb, *pc, *pd, *pl, *pm, *pn; size_t d1, d2; int cmp_result; - int swaptype_long, swaptype_int, swap_cnt; + int swaptype_long, swaptype_int; loop: SWAPINIT(long, a, es); SWAPINIT(int, a, es); - swap_cnt = 0; if (n < 7) { for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) for (pl = pm; @@ -148,7 +147,6 @@ loop: SWAPINIT(long, a, es); for (;;) { while (pb <= pc && (cmp_result = CMP(thunk, pb, a)) <= 0) { if (cmp_result == 0) { - swap_cnt = 1; swap(pa, pb); pa += es; } @@ -156,7 +154,6 @@ loop: SWAPINIT(long, a, es); } while (pb <= pc && (cmp_result = CMP(thunk, pc, a)) >= 0) { if (cmp_result == 0) { - swap_cnt = 1; swap(pc, pd); pd -= es; } @@ -165,18 +162,9 @@ loop: SWAPINIT(long, a, es); if (pb > pc) break; swap(pb, pc); - swap_cnt = 1; pb += es; pc -= es; } - if (swap_cnt == 0) { /* Switch to insertion sort */ - for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es) - for (pl = pm; - pl > (char *)a && CMP(thunk, pl - es, pl) > 0; - pl -= es) - swap(pl, pl - es); - return; - } pn = (char *)a + n * es; d1 = MIN(pa - (char *)a, pb - pa); From nobody Wed Aug 27 19:22:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBvYM50vjz65W4N; Wed, 27 Aug 2025 19:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBvYL6R46z4464; Wed, 27 Aug 2025 19:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lf3mAgA5SWG6vbPwfp890ZmBHvXH3nNr6ta/gxTAJ4A=; b=HCZtm9WLK8CbEONzeWKYAn2/S2SQMlV7dbW5qz2SUQRlPLeqw73zH9qigKgO1Et4AcILmF GQkMf775PtbyrtgE+qglgqUi2EnX/72GE9kLZIKut0sTR5oiHX87HDtLPzZrlbZaWieJeC xXMyJaXH7A6IsLqJlN4ygUSzFd5CD+r7zTCuTEMYDmJQVN1XksKdqCIpgg4+iWYLa9tT7i lEfUfzZXPqIXQwwA30jBeZZufrRpRHr2qkzTHAfVZDTQRdTuGMRtfOcBEy0YNqzsNDklhK fdbCVqLkPcBgoLV1WoXnKcjoZIt2fGqylE5LrSaDbQQ1lIa+yMgM+HSTb0jAnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lf3mAgA5SWG6vbPwfp890ZmBHvXH3nNr6ta/gxTAJ4A=; b=lD+WhkJ5R11zFHOmaDsFkBlzfoT660jW6ehakwtxQoX9Jt3ZHT0jIVGAU4K9o89eJvgs/A cCVvFSkU1DQ3xOSwbCK5VXtAJTnZumys4TR0kGVnKIUGWlxiFxwOuYOCOV1dTl8JYC32I/ K063CuLFgPCTW0GDum8iLmt15WdInfd1SpJGuCnPIY/z6uybco7HHDseqwU7dFhHKRvHQm mPoMeTBQIAgayns92njlSNqcfb0Aq6jgVrd1XxG2eaysH8bJnoMVcFrMFQj2QqpE/z6iic /BAev1DT8SNtgOy5vM6/pgrXdID4wDaF8lCrJ/lPZ2OzjCy7STORj0GQmnLqkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322534; a=rsa-sha256; cv=none; b=dP8KfKINggJLzMxKwo8dgFbOgGR63L/47i2qBJ1YCfUHAfv2UF5Nd/LJCoUKpASrbQpZ2i TcmS2/s5/JIwdxzrizCkaXRnvmRSzVwGVMT+iwN1SVoyRyLjUvm9f7zytWG4BAvaUm4/JR 9gdKVd6ahR416Of0t92fpOJug/jzrX2WHu5x8uGdKMwzr+KK7ve1za/VRfrLeBLKDnn/lR oz11cjdsKodArQL1zvBDz/1DHsI3qo07vnm+vrypDI0K71P2Wqq/QY52TZoLgI4TnsuGBN 4Z2El7tQ0u6z4nQOOUFZDtgw0CpraQX4rC9dgL2ZYx+0l2+c0qHN8S7wD1b3Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBvYL5FcjzbvS; Wed, 27 Aug 2025 19:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RJMEdb041309; Wed, 27 Aug 2025 19:22:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJME70041303; Wed, 27 Aug 2025 19:22:14 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:14 GMT Message-Id: <202508271922.57RJME70041303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4e3f44692f6d - stable/13 - freebsd-update: Do not fsync List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4e3f44692f6d319bc4f6f61e8abfb3736a89e128 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4e3f44692f6d319bc4f6f61e8abfb3736a89e128 commit 4e3f44692f6d319bc4f6f61e8abfb3736a89e128 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-15 18:04:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:50:57 +0000 freebsd-update: Do not fsync Fsyncing each file we install slows us down significantly and adds little to no safety. MFC after: 1 week PR: 287897 (cherry picked from commit 20f0996700a8e60780931e7fde65899040465f4e) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 4a6a8d78330b..f620b956f80b 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2932,7 +2932,7 @@ install_from_index () { if [ -z "${LINK}" ]; then # Create a file, without setting flags. gunzip < files/${HASH}.gz > ${HASH} - install -S -o ${OWNER} -g ${GROUP} \ + install -o ${OWNER} -g ${GROUP} \ -m ${PERM} ${HASH} ${BASEDIR}/${FPATH} rm ${HASH} else From nobody Wed Aug 27 19:22:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBvYL0VgGz65WWD; Wed, 27 Aug 2025 19:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBvYK4jx8z43y1; Wed, 27 Aug 2025 19:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1XmIB920YxFPQvSlDS8hMoXx8Hq6qsvL97Rt8CjI/c=; b=JRcVgchrucci7D2b1ifcUHyyY2HHf/19EfGBeHe7GC0sS+yGBv0LSxmOA1UuY4c+eSRgNn ZgtqNYYmy1v711R3jrm4Konc9eKK8nid3w6T0QcQfydSiULGWsp1ijfOajVMTEPtmG0/Wb QiFSduWghoZ/kSpz+cp6r8eOWbg0PEznrCt7qwy2xfbvfABLWy0ySSZpJ/9h4fr3bfTGFW ud7RXpio8gCvLLiVdzgjg0AGCKyP+J5FujNFR45Sg8xiv9mutvbeG12JRojEnjVDzM+cqP vrwkMP/NhLqMbEIAmcc0hyY2ovEMyGh2EB7SASwAaBA1thQJLf5ikh9/LZu5mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1XmIB920YxFPQvSlDS8hMoXx8Hq6qsvL97Rt8CjI/c=; b=bn6jpUQ0d94jIBX450nwr8D2V6lEWrZLFaDyT1bSwFTHmRR9eS+vq0tRrU2orzumiizzwS 1F85PLxyZJi8a2DQC2aJYPSCcq82Ox4eIxiB8sNM77DIXW2tAj99l640uVASN7vjIywBqD 8rGQvBcxlaSJhEfa3CH3E1QvfGY/Sf8uRuZxwAdiQUJ9rY6xMvWckjinjl46gvqpJW2Tu/ WfWM3JdB5lrvb3oBsTZrJWlfN+InfyG+PJOa768q0F6pIdKNEddCCUikuHixVqXA0I3AY1 Pm1qznXT+1p+a/lxJr1ymd77o0xsTwJmNMT2cKM+2M5CTVeqO6cOTcmPKA+wRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322533; a=rsa-sha256; cv=none; b=X6FNuEdpCH3QVNZlxhb/zMyujkXc9bJBUhsdNhV0ZH6LHDxurrY7wBEn63LHI8kZ+iFkMl uNcYVoTVZLvyw4W0SzBSy14umvop5klBaAhNXI97TysCAe4o24FlOwL4ivQx0Dx4poHaPQ symSDuJArcS0Vc5TuUxYlaX/+HdVh7zs3D65LxxoDPafT0lVsBT2jRAGqT7e4aZ5SGnMY+ zb8CNN0l0sYu18R5Q90zsPwm3/guznowDboQlEYQ6p4ib6dkW34IvvKV2xW7/vUopU/9Ck D+DH/tUlGVnx3NnDzbCceZNF7x5FUd397id3b1tLz//qDCOqsEh8iUlby59lGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBvYK4GwPzcCL; Wed, 27 Aug 2025 19:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RJMDTN041253; Wed, 27 Aug 2025 19:22:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJMDpf041250; Wed, 27 Aug 2025 19:22:13 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:13 GMT Message-Id: <202508271922.57RJMDpf041250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 1235e1d16085 - stable/14 - stat(2): Document the st_rdev field List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1235e1d16085de69f87fbea68a80e070cf360019 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1235e1d16085de69f87fbea68a80e070cf360019 commit 1235e1d16085de69f87fbea68a80e070cf360019 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-17 17:07:55 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:49:58 +0000 stat(2): Document the st_rdev field MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D51946 (cherry picked from commit 4eaa7f66620c33957ff9a929820cb791f7fe5578) --- lib/libc/sys/stat.2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2 index 6b2f2a7c7eab..381674ce897e 100644 --- a/lib/libc/sys/stat.2 +++ b/lib/libc/sys/stat.2 @@ -27,7 +27,7 @@ .\" .\" @(#)stat.2 8.4 (Berkeley) 5/1/95 .\" -.Dd March 30, 2021 +.Dd August 17, 2025 .Dt STAT 2 .Os .Sh NAME @@ -171,6 +171,9 @@ Flags enabled for the file. See .Xr chflags 2 for the list of flags and their description. +.It Va st_rdev +Numeric ID of the device referenced by the file, if the file is a +character or block special; otherwise unspecified. .El .Pp The From nobody Wed Aug 27 19:22:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBvYQ43K7z65WF3; Wed, 27 Aug 2025 19:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBvYP05kjz43yZ; Wed, 27 Aug 2025 19:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FDkThQkldE29Apf+oLPsZRAqqNZwWVKS5jz8WRK61J4=; b=iQ9zgaMH+gm4JzX6w0DUKreofV1xOzLt8GEjWBlM17aXoDDaDKM/ns9oqYmPc6PhRPlWJA am36XR2C4pF0ldMNU+cMYjz3esnO61snZZe9FU6e6BIu6PNVdvnJwSeCoU4pDXwPo4R3he kkT2V4cczhLE2E1p+VmarNhbuJtzsm8rO314rCmpMUSqT08utyN73GDaIPZhYXzB0350CD SnOHc0SpEGcEFStVXjkex36bmesCUqFcT5oJf7frLKI0mnksIEeHEy8f3XsnBzuTZMjFMy LA/iFsVvhTNIKdG6LhFtLgb46T+m3lXEPfvVsc2aISekLJXBqjXhxBWjXaVVMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FDkThQkldE29Apf+oLPsZRAqqNZwWVKS5jz8WRK61J4=; b=fwgWT7Ev+prIlpnJgYNoLfZHPj0V8WOdAhwvbyHWzvY3m0BfBKJEhIXQ93HQiwX+Aaxk73 RQnji3xAIihH0/O6bKgjtNRfbjZyYWpjaahq/0NtZQyjtH14dnfjT2QgtCpOg/xcWTzwpo qVPgQciUp2b+FUZEvdj5GStEILkJ5P9YIhQyLu5+CL92i+KCVc7Pl63/TJuryjjxDA+qXC OfrEj2ds9zDU3PrKwrB5DOgF4ayG4Afe8/Pcwwu60aqe/SFlVrZwvSNe0itm73V0gGC30j gGrmEYsveM8WJpWhI0s+a38xZ+Bcp5yK8iEbWPDvOvbZIPqNT/qvukgPN0vkZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322537; a=rsa-sha256; cv=none; b=uISVCufJr+HvVEt6B9hUX8ruqKRqof2uLpNJNnKBeirHWK3o+8nq3/7TNfXiaHnLEJAlQi 2NuvNW4jibfkH1voGIkWzl9NnsNBAVcJHWpYDIZKEC834GEGzx9BonB1FM327bvQXAQ7Eu a4komLvgo8ePbMCUrhFkx4wrj7U5yfdDInLzuXV8a4hPFjLtF7cS+NSHotAp5WtO3aGejv gC0LMhasWtTpa6e/NGx1iuYDBGRA4MmvZXALK7DRpwDUy7SgjDvtdjI68OlTTA4ySZwQQt QMLwU9ojvL00Jsw5uzQLa5CB1ZlKxzJf1JPpysZQkDkqi/NFMwsMAL0GHjDl/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBvYN6kFmzcMt; Wed, 27 Aug 2025 19:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RJMGHn041429; Wed, 27 Aug 2025 19:22:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJMGAl041426; Wed, 27 Aug 2025 19:22:16 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:16 GMT Message-Id: <202508271922.57RJMGAl041426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0d9522888c0d - stable/13 - stat(2): Document the st_rdev field List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0d9522888c0d37f11b3b9af0595d6dc7e0982ef2 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0d9522888c0d37f11b3b9af0595d6dc7e0982ef2 commit 0d9522888c0d37f11b3b9af0595d6dc7e0982ef2 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-17 17:07:55 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:50:58 +0000 stat(2): Document the st_rdev field MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D51946 (cherry picked from commit 4eaa7f66620c33957ff9a929820cb791f7fe5578) --- lib/libc/sys/stat.2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2 index 6b2f2a7c7eab..381674ce897e 100644 --- a/lib/libc/sys/stat.2 +++ b/lib/libc/sys/stat.2 @@ -27,7 +27,7 @@ .\" .\" @(#)stat.2 8.4 (Berkeley) 5/1/95 .\" -.Dd March 30, 2021 +.Dd August 17, 2025 .Dt STAT 2 .Os .Sh NAME @@ -171,6 +171,9 @@ Flags enabled for the file. See .Xr chflags 2 for the list of flags and their description. +.It Va st_rdev +Numeric ID of the device referenced by the file, if the file is a +character or block special; otherwise unspecified. .El .Pp The From nobody Wed Aug 27 19:22:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cBvYN2WNTz65W4P; Wed, 27 Aug 2025 19:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBvYM6LHjz443c; Wed, 27 Aug 2025 19:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ei+vQcrT6VrBkLn96WiqLhimkLyPEd4XFGVI7D56B9k=; b=IZCggqxS2KqS2iEIZbLy29lM71jn+3SOKanQqYc8chlxWEGQZNmtaepBknmMV0gQGoG3vp J6CMuFXj40oYqlMqpW5rwEmYH4nbEtWTb/GPlCZndZbMa/o5V143sQ2vidb8OEiTE3LeIz 2augPVlkRjotFlf2KGvlVVgs4WbxtkFk0VS0M3Xn8N62Pw/+RuZ1PcU8DEpIwbkoE0Z6IB /lwrFFqhNWyTaAaUrJH6Hzcei3OxWPon40CWn5irkHDANktfkNz7xuex9huc51FWSOoq/V 2013IF8B9jXo9YMhO3I7TJkPthVUfq3q9o0dBFhdJUoTTMyt50/L26HWCWudRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ei+vQcrT6VrBkLn96WiqLhimkLyPEd4XFGVI7D56B9k=; b=vQhBmVuFRj0YyvJh+DW3Reyl9YUeCoUS/d4h6odpo8sphN4GH90wL7HCvTJWp8+HspjjKg 97LUKIYaZz2WjRNMePId0OldNJQlpqd5Sg/lfoi4VMGLcmnhuFbyQNk94yGoBIxRd2CsBA yjzMUsVkeIuXDnvl18hGg4xWxqMhaOAUh4LACDGdhE6uDdLhsvX57viUCwAMbc5n/n2CSY D2lQp0afRJFkTrC2FU3cU9CfVqoKK0L7m9J37H6K8kQ0wKcASPNxMtNnATlJOkl70zae5a pw3I9rM3K019v61RIAZjfD6WbHHXiOdouzIOXJTHZGZ3/SYAi0QaYE2RXrfQ2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322535; a=rsa-sha256; cv=none; b=N0+L6k2LwVHZ6uNESPQ8lwij4xjHdcQL0HB3YxYhfSwaWo9wh5XSXeGUW3cNJyrCvZaOsh SOEkYYM+18MZ1WytKU0cqEILwnhXikAusqZfIiSbN/0ersZ9tOMBs2s4gff2LMz0CcYoQ1 35ggC2GisLV8O6Zt2rRouagtAa/JWwnRbU7DXjh76WgkyHH2YFuBhW4q9tondLmm54XawG SAacEteQEFzMKQoY6D9fGOaYxOxtvag4jx+GlZlUrRkjDCPZH2FoYJymTkNhIufIJe0wfr a2lLwR1vJtIriO9V4cbqlt1QDxqQQFiSoV5mYB7987bgT9N2yDBPEKFApLbcJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cBvYM5mhrzbyF; Wed, 27 Aug 2025 19:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RJMFMl041394; Wed, 27 Aug 2025 19:22:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJMFek041391; Wed, 27 Aug 2025 19:22:15 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:22:15 GMT Message-Id: <202508271922.57RJMFek041391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 59fb30e78554 - stable/13 - getmntpoint: Don't compare st_rdev for non-devices List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 59fb30e78554a587a0954351cc7a682b4e24ecdb Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=59fb30e78554a587a0954351cc7a682b4e24ecdb commit 59fb30e78554a587a0954351cc7a682b4e24ecdb Author: Dag-Erling Smørgrav AuthorDate: 2025-08-17 17:07:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-27 18:50:57 +0000 getmntpoint: Don't compare st_rdev for non-devices If the mntfromname of a mountpoint is not a device (e.g. nullfs, tarfs, procfs) we shouldn't compare st_rdev, as any match will be spurious. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D51945 (cherry picked from commit 8073a5137f223bb481606b15edaa5ecb93ceffcb) --- sbin/mount/getmntopts.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index 31987f7b0b78..fab25466425f 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -192,6 +192,7 @@ getmntpoint(const char *name) strncpy(statfsp->f_mntfromname, device, len); } if (stat(ddevname, &mntdevstat) == 0 && + S_ISCHR(mntdevstat.st_mode) && mntdevstat.st_rdev == devstat.st_rdev) return (statfsp); } From nobody Wed Aug 27 21:44:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cByjc3sW5z65jDw; Wed, 27 Aug 2025 21:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cByjc2h6Sz3D1P; Wed, 27 Aug 2025 21:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756331076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q95okO8gQIuG8g2JbaL0XszUxQCWwZXrRq6P/ANeXPs=; b=lwWkn3f/pGfPTGXHjPQQCJTSc+mKd4o3RBWcnHBhgd3y70bxv/QJl//neuzCcloyf/QlbT JeVMI3uRLXFBilb5YWZqpFCV27ihIDozOObrrqjyi9+hRNpVl+IT4elEQ8qHZPVCg7TYx/ 3BfEloJMv2/y0u4HogedIbFVLO1OpFT+BmvHoTY2ZM5wqmgoSK6vKz+C1EUeGOJQYuYMLM WJCYS/uIuGEHTnhRz+FiDENGSBCkK6n+WAAO0/OAoESCfNKzlKnqS9t747wWnN9nDRo2Xq yVGnzufy8MiiF+MYYbvzElUFLQO73r1TSKbBi+Oba97M7Mre2GGfuyt1UenEUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756331076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q95okO8gQIuG8g2JbaL0XszUxQCWwZXrRq6P/ANeXPs=; b=xG9b6NroG2q+2R5YbQgAIXg8mDEe7wr59a6/A5AzUzaBx4zUzHZtjrsW0K5eqPGuQiooq/ pKA3Is1BPacsuHPTDyfHZRvs/lY0NgYeyAmyG2OFsovKAAcMHqtXEkDrm8Z00y7EnTIRvP Mp18c/XTwcZB/i8NoVKXHdWnGpeGkYsCYogid9k0ZVrnDFqvMMW9DXnq4hmzfk5RjFbf8t itWWjfvWbLFjTSrQ8WkkSWdd6emdBlkr9khb4o2YVAGawqi7O5Ut3BUqfy56/SxJ5WxvI5 4FNf6tlBG8rwu3AKsXE39pQqDcFyBCreO18egsosUIJhbYoCBHod5rlSe+EXjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756331076; a=rsa-sha256; cv=none; b=f/ujhZDhit/ZernePYt8bsTEk/hCYRGF3L6A7eUtOPdQlJmQ/SKJ2LqP60+4kJAL5iQ1ta jkw00l9xWFHfL8hnrkA3gPskfz3v2ZkmLL4s15N4k0lEEofHebP1256zK9gxqj4DMO4+r7 2KMZB5Yf7Fneev543lXvfttnP/0D2Z7a2zd8Mmse3fJTX3gphzyYiIsYC8eNkyo+gN8BBP XA84kYr8ZyBPdsIh0qgPhvSHKoLliHLnFFWqMx7YbairSd5yLosyrK12cHzGhtM/S57Buf aMUU26HplQmAIE2jcuQ0hLUVto6/glQKjyj3W7AZnJXUxBfuAdllMivlhGFXUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cByjc2C5PzfyR; Wed, 27 Aug 2025 21:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57RLia48007432; Wed, 27 Aug 2025 21:44:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RLiasT007429; Wed, 27 Aug 2025 21:44:36 GMT (envelope-from git) Date: Wed, 27 Aug 2025 21:44:36 GMT Message-Id: <202508272144.57RLiasT007429@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: 62947e508161 - stable/14 - pkg: clarify argument parsing List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 62947e5081616bff1e9623a0e4292e92b49c3910 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=62947e5081616bff1e9623a0e4292e92b49c3910 commit 62947e5081616bff1e9623a0e4292e92b49c3910 Author: Isaac Freund AuthorDate: 2025-04-23 10:27:35 +0000 Commit: Ed Maste CommitDate: 2025-08-27 21:42:53 +0000 pkg: clarify argument parsing Currently pkg parses all arguments and subcommands in a single getopt_long() loop. This results in quite a bit of accidental complexity, especially around the -r option for the bootstrap and add subcommands. This also results in the undocumented behavior of all options understood by pkg(7) being accepted anywhere in the argument list regardless of their position. This contradicts the behavior of pkg(8) and I find it quite unexpected. This patch splits the argument parsing done by pkg(7) into two phases for global options and subcommand options. This gives behavior that matches pkg(8), accepting the subset of pkg(8) options supported by pkg(7) in the exact same positions that pkg(8) accepts them. This is however a somewhat breaking change, as options are no longer accepted by pkg(7) in places they are rejected by pkg(8). For example, `pkg -f bootstrap` no longer works, only `pkg bootstrap -f`. The original motivation for writing this patch was investigating support for --rootdir in pkg(7). Since pkg(8) uses -r as the short form for both --rootdir and --repository depending on the position, I decided that pkg(7) needed to be brought inline with pkg(8)'s argument parsing behavior to avoid confusion. This patch also gets rid of args_add_message (unused since 40b9f924b1) Relnotes: yes Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49977 (cherry picked from commit be61deae0aa2923bb9908fc5b37b35712603e622) pkg: suppress error on unknown options pkg(7) does not understand all the options that pkg(8) understands and should never log errors about unknown options that it will pass on to pkg(8) without touching. PR: 286510 Reviewed by: bapt Fixes: be61deae0aa2 ("pkg: clarify argument parsing") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50163 (cherry picked from commit 73ba568b1c35aabc1682540b5b4d5d77220c5468) --- usr.sbin/pkg/pkg.7 | 5 +- usr.sbin/pkg/pkg.c | 174 ++++++++++++++++++++++++++--------------------------- 2 files changed, 87 insertions(+), 92 deletions(-) diff --git a/usr.sbin/pkg/pkg.7 b/usr.sbin/pkg/pkg.7 index 467f62d5747b..d2246f74a3fc 100644 --- a/usr.sbin/pkg/pkg.7 +++ b/usr.sbin/pkg/pkg.7 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 30, 2025 +.Dd April 29, 2025 .Dt PKG 7 .Os .Sh NAME @@ -33,8 +33,9 @@ .Op Fl d .Ar command ... .Nm +.Op Fl d .Cm add -.Op Fl dfy +.Op Fl fy .Op Fl r Ar reponame .Ar pkg.pkg .Nm diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 305181699e4a..9617fcacf4a6 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -958,10 +958,6 @@ static const char args_bootstrap_message[] = "Too many arguments\n" "Usage: pkg [-4|-6] bootstrap [-f] [-y]\n"; -static const char args_add_message[] = -"Too many arguments\n" -"Usage: pkg add [-f] [-y] {pkg.pkg}\n"; - static int pkg_query_yes_no(void) { @@ -1088,137 +1084,138 @@ int main(int argc, char *argv[]) { char pkgpath[MAXPATHLEN]; + char **original_argv; const char *pkgarg, *repo_name; bool activation_test, add_pkg, bootstrap_only, force, yes; signed char ch; const char *fetchOpts; - char *command; struct repositories *repositories; activation_test = false; add_pkg = false; bootstrap_only = false; - command = NULL; fetchOpts = ""; force = false; + original_argv = argv; pkgarg = NULL; repo_name = NULL; yes = false; struct option longopts[] = { { "debug", no_argument, NULL, 'd' }, - { "force", no_argument, NULL, 'f' }, { "only-ipv4", no_argument, NULL, '4' }, { "only-ipv6", no_argument, NULL, '6' }, - { "yes", no_argument, NULL, 'y' }, { NULL, 0, NULL, 0 }, }; snprintf(pkgpath, MAXPATHLEN, "%s/sbin/pkg", getlocalbase()); - while ((ch = getopt_long(argc, argv, "-:dfr::yN46", longopts, NULL)) != -1) { + while ((ch = getopt_long(argc, argv, "+:dN46", longopts, NULL)) != -1) { switch (ch) { case 'd': debug++; break; - case 'f': - force = true; - break; case 'N': activation_test = true; break; - case 'y': - yes = true; - break; case '4': fetchOpts = "4"; break; case '6': fetchOpts = "6"; break; - case 'r': - /* - * The repository can only be specified for an explicit - * bootstrap request at this time, so that we don't - * confuse the user if they're trying to use a verb that - * has some other conflicting meaning but we need to - * bootstrap. - * - * For that reason, we specify that -r has an optional - * argument above and process the next index ourselves. - * This is mostly significant because getopt(3) will - * otherwise eat the next argument, which could be - * something we need to try and make sense of. - * - * At worst this gets us false positives that we ignore - * in other contexts, and we have to do a little fudging - * in order to support separating -r from the reponame - * with a space since it's not actually optional in - * the bootstrap/add sense. - */ - if (add_pkg || bootstrap_only) { - if (optarg != NULL) { - repo_name = optarg; - } else if (optind < argc) { - repo_name = argv[optind]; - } + default: + break; + } + } + if (debug > 1) + fetchDebug = 1; - if (repo_name == NULL || *repo_name == '\0') { - fprintf(stderr, - "Must specify a repository with -r!\n"); - exit(EXIT_FAILURE); - } + argc -= optind; + argv += optind; + + if (argc >= 1) { + if (strcmp(argv[0], "bootstrap") == 0) { + bootstrap_only = true; + } else if (strcmp(argv[0], "add") == 0) { + add_pkg = true; + } - if (optarg == NULL) { - /* Advance past repo name. */ - optreset = 1; - optind++; + optreset = 1; + optind = 1; + if (bootstrap_only || add_pkg) { + struct option sub_longopts[] = { + { "force", no_argument, NULL, 'f' }, + { "yes", no_argument, NULL, 'y' }, + { NULL, 0, NULL, 0 }, + }; + while ((ch = getopt_long(argc, argv, "+:fr:y", + sub_longopts, NULL)) != -1) { + switch (ch) { + case 'f': + force = true; + break; + case 'r': + repo_name = optarg; + break; + case 'y': + yes = true; + break; + case ':': + fprintf(stderr, "Option -%c requires an argument\n", optopt); + exit(EXIT_FAILURE); + break; + default: + break; } } - break; - case 1: - // Non-option arguments, first one is the command - if (command == NULL) { - command = argv[optind-1]; - if (strcmp(command, "add") == 0) { - add_pkg = true; - } - else if (strcmp(command, "bootstrap") == 0) { - bootstrap_only = true; + } else { + /* + * Parse -y and --yes regardless of the pkg subcommand + * specified. This is necessary to make, for example, + * `pkg install -y foobar` work as expected when pkg is + * not yet bootstrapped. + */ + struct option sub_longopts[] = { + { "yes", no_argument, NULL, 'y' }, + { NULL, 0, NULL, 0 }, + }; + while ((ch = getopt_long(argc, argv, "+:y", + sub_longopts, NULL)) != -1) { + switch (ch) { + case 'y': + yes = true; + break; + default: + break; } } - // bootstrap doesn't accept other arguments - else if (bootstrap_only) { - fprintf(stderr, args_bootstrap_message); + + } + argc -= optind; + argv += optind; + + if (bootstrap_only && argc > 0) { + fprintf(stderr, args_bootstrap_message); + exit(EXIT_FAILURE); + } + + if (add_pkg) { + if (argc < 1) { + fprintf(stderr, "Path to pkg.pkg required\n"); exit(EXIT_FAILURE); - } - else if (add_pkg && pkgarg != NULL) { + } else if (argc == 1 && pkg_is_pkg_pkg(argv[0])) { + pkgarg = argv[0]; + } else { /* - * Additional arguments also means it's not a - * local bootstrap request. + * If the target package is not pkg.pkg + * or there is more than one target package, + * this is not a local bootstrap request. */ add_pkg = false; } - else if (add_pkg) { - /* - * If it's not a request for pkg or pkg-devel, - * then we must assume they were trying to - * install some other local package and we - * should try to bootstrap from the repo. - */ - if (!pkg_is_pkg_pkg(argv[optind-1])) { - add_pkg = false; - } else { - pkgarg = argv[optind-1]; - } - } - break; - default: - break; } } - if (debug > 1) - fetchDebug = 1; if ((bootstrap_only && force) || access(pkgpath, X_OK) == -1) { struct repository *repo; @@ -1234,10 +1231,7 @@ main(int argc, char *argv[]) config_init(repo_name); if (add_pkg) { - if (pkgarg == NULL) { - fprintf(stderr, "Path to pkg.pkg required\n"); - exit(EXIT_FAILURE); - } + assert(pkgarg != NULL); if (access(pkgarg, R_OK) == -1) { fprintf(stderr, "No such file: %s\n", pkgarg); exit(EXIT_FAILURE); @@ -1279,7 +1273,7 @@ main(int argc, char *argv[]) exit(EXIT_SUCCESS); } - execv(pkgpath, argv); + execv(pkgpath, original_argv); /* NOT REACHED */ return (EXIT_FAILURE); From nobody Thu Aug 28 01:07:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cC3CG3yFsz65ylN; Thu, 28 Aug 2025 01:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cC3CG3P79z3Y9h; Thu, 28 Aug 2025 01:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756343226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVhVvCnRadLe3PvaSGvl/7aNVT5JkkqmVsnzW4aiqZo=; b=HZWVHi81B5cFYLNqTO2G+9vzYPAh5SDLcnktYp/Xwz4Q2Zql3Gn5o2hXOp3NkoEn06RQNX eFKNOZPogdyWJMMMi4n58nXl+HvMNc76cWeylwqHG6huOdC+s1V/BXSBNYOgfaDCbIZ5RW nEjyNBDlSZBKX9td2l+beBdEH7O4s7qxgSZr7MlGopGa554/z7f7Kx9NU+4NUTLsXyhJ6m JWZ961XGBNcn0tB+UymBtKN5mRCb7AMIr8NADoi3mmOV3M7dJsqpWenSyjSVgM0YQUAmb2 GVjqpG2Rh5N1paGnzfG52v2Pw6p016Ti0nv+rP+ff8U58gznXxX5NwCHfkOnDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756343226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVhVvCnRadLe3PvaSGvl/7aNVT5JkkqmVsnzW4aiqZo=; b=QNowi4mh44Pv2Z4izvPtqT5hLYupSa/LEQ29qaaYDCgR9yv8KJb1L7AZLR8AoexrDbKcnT 6Oi2Q2f0lJFkAJTgzbim9eRHWnQF6pbOUe0p7K9XjbVImhofmev849/8TqghHVWpZNcF1z 70ULWR9uDlx0Fb12bqPN1f6iLwiQnVRVzrrAHfRL0ykam4INJieF2m0jYE2p2lLTCwRw2d +1vyxg8ALY/O88V0xUf+Otndh/JIEWIGOUb9SjRZItiJ0vHTjHzWTt/KbwbtvUxLhuXreS qx1U3Xz5L4hnaMdWMX826T5+Ziz2Iq/RJzR7oxHq8m+ovmXrPjq1jtFahQMARw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756343226; a=rsa-sha256; cv=none; b=oFJcLDUXuiJjO7lz5Zq5RzQrcBHEcRaBViH14NVg1HTTbvhjXdBepUKOM6Vc/WDI5ZkklY vzF7XExiT5iNIwzytuohWhYWD2GHrg4hGfxygJ2LDQKMLMbn9r+H2DbhBJHaa8MSUfHxqv MpDpNNMTXy0Hb9nQ00YP9M+izOnKuynL7+eC5fhP/VPIHxs9E5vcDR1uJGFAUwJ4gPLhUx 0SGtzjexo/uZ4qhyQ5UokHXubhYA3NmhVTKrbIw8hc2vcWMbrauU6I/CNn/iDZl4hVXsc3 KiQDcpc1yHEtaCeKsq6ruT+bjCeomX8N3UnyWerENkGfTRzFM1s7c5WH3Wg9fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cC3CG2nD4znQk; Thu, 28 Aug 2025 01:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S176k2085226; Thu, 28 Aug 2025 01:07:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S176Ml085223; Thu, 28 Aug 2025 01:07:06 GMT (envelope-from git) Date: Thu, 28 Aug 2025 01:07:06 GMT Message-Id: <202508280107.57S176Ml085223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: 55403c7c559c - stable/14 - build: fix list-old-dirs / check-old-dirs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 55403c7c559c68c84070a49a5fdb6740cced0014 Auto-Submitted: auto-generated The branch stable/14 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=55403c7c559c68c84070a49a5fdb6740cced0014 commit 55403c7c559c68c84070a49a5fdb6740cced0014 Author: Maxim Sobolev AuthorDate: 2025-08-25 22:00:14 +0000 Commit: Maxim Sobolev CommitDate: 2025-08-28 01:04:36 +0000 build: fix list-old-dirs / check-old-dirs Fix list-old-dirs to not generate empty line at the end of the output if OLD_DIRS happens to have a space at the end of the last word of the output before the final \n. Then that space is turned into \n and we end up with a blank line. Futhermore this gets converted into a "/" i.e. root fs when calling check-old-dirs. This is the regression since a8267ecc3df0a. Reviewed by: emaste Approved by: emaste Sponsored by: Sippy Software, Inc. Differential Revision: https://reviews.freebsd.org/D52153 MFC After: 3 days --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ec1558e3daef..48245b06d463 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3547,7 +3547,7 @@ check-old-libs: .PHONY list-old-dirs: .PHONY @cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_DIRS | sed -E 's/[[:space:]]+/\n/g' | sort -r + -V "OLD_DIRS:ts\n" | sort -r delete-old-dirs: .PHONY @echo ">>> Removing old directories" From nobody Thu Aug 28 09:13:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG0q5w9zz65fqD; Thu, 28 Aug 2025 09:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG0q54Gpz3QRy; Thu, 28 Aug 2025 09:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCbQrz952gXGkz7mzfaxwbw7we0ikXL9eUcx6jSsPsk=; b=e9VpojYgG4+md8mosx4ZnEJyl4J6JNTxsFlzZBK+nloLkJCUeBMgVoqHHpkzStOWDcxwED FkjkyHBUtChRG+9HNLregGU5O/dg4PR8hkSB6tITsolKTtC7i6BtffVWX6JYrNd9OPZehy 1DIZk+gTpZ1XVYUSjD7n9WS+SZrKAsy8S3oVMeF8/2lmUPRksFNtpLGEuSZeBgd0hSZXDw N0rLk7cNX/ASsnNDCuv1KzX7TbwjpJ2qcKt0l4ivwgmC1xWvwwo5lgUYPFpQU4aEYokvLo IzguIV1QerbH6rjUuKViJJvkIUU0uvUQphYg1GU7jDUj3cZ+Q2Laqh9xKqwPoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCbQrz952gXGkz7mzfaxwbw7we0ikXL9eUcx6jSsPsk=; b=JgbZejJMF8y+sPHam/PKNs6HB9jsSe01p94ixrRAR45OUTPedb9UmJw3Zb8BGHDw/M4ZaC dQ1xAy2P9xZ9T4t8wwPTb4vX7MGY/ZWlMXArfu5zYJRlIg4tVDAMGrbqpKjCgKu1SxlupX /B4rpaOlJycG1pdJqMLAW7sUsjqRCqfKDqZaDBg5Axbw8TvrjfwaO3a4hErxbFUKH+LA8n RPux5QeSSvKQe09QhhKVTTdG72udfjmF8fBmSi/CCu8pSnqai/wPs4xsx8zQT1bxrsTlKh aqAsmC66iQOxN4CQUP/TvGyLvTW8Jp1N7y9T1R3Rn8Tz+ldyoRfXz62pPlFW0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372427; a=rsa-sha256; cv=none; b=F23JfIVXHpqrOO2B9dnu0MuFDxG3iFisfo9EZAOIA8dKvwwnyiQ4KAO0Qs1h5uauo+Kk+P q/PumUFSqIYBafAk02rzz48pvA9IWpmK0dSgsQIMVWpk20lMhRVqT9rgLqGRp032bwadwX Nd2Ua5jmdWltTz3rpZSGTgLt+MfEaA3L/EQqOSh9fSV+DoFRAam4cUx1/+YQSgXBj+ilxd wv1C9Q3aBQmdWYKiLc8cw/8rFu3SiIFtTUAhDgnaN81Akg/ddnufpM7HV01E/V//MlMx0Q uAungGDCHN5yr0fs/u/+n9Bjfb1cSLmwU5m940RBBLN+z6KEUr89+OqVjAwe3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG0q4LVqz13GX; Thu, 28 Aug 2025 09:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9DlXV009149; Thu, 28 Aug 2025 09:13:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9Dl2b009146; Thu, 28 Aug 2025 09:13:47 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:13:47 GMT Message-Id: <202508280913.57S9Dl2b009146@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: 6a4aae1ed69d - stable/14 - msdofs(5): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a4aae1ed69d365205d70098c6199c2bce52fe97 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6a4aae1ed69d365205d70098c6199c2bce52fe97 commit 6a4aae1ed69d365205d70098c6199c2bce52fe97 Author: Gordon Bergling AuthorDate: 2025-08-25 08:42:23 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:09:02 +0000 msdofs(5): Fix a typo in a source code comment - s/fist/first/ (cherry picked from commit ac4005219166fc94da4ebb7adce3da159072f6d3) --- sys/fs/msdosfs/bootsect.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/bootsect.h b/sys/fs/msdosfs/bootsect.h index 170d94cb9512..94b1137a153e 100644 --- a/sys/fs/msdosfs/bootsect.h +++ b/sys/fs/msdosfs/bootsect.h @@ -20,7 +20,7 @@ /* * Format of a boot sector. This is the first sector on a DOS floppy disk - * or the fist sector of a partition on a hard disk. But, it is not the + * or the first sector of a partition on a hard disk. But, it is not the * first sector of a partitioned hard disk. */ struct bootsector33 { From nobody Thu Aug 28 09:13:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG0r6wLtz65fJY; Thu, 28 Aug 2025 09:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG0r5ywdz3QVS; Thu, 28 Aug 2025 09:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V+JuRc1BIagBY54NmQTvOoEwbHy5RVvOzPwMPFIL2H8=; b=oU2YZbi1M2KWc5u1Igu2lHlmC66nSsckf6zLVErMWQkZ2AD57MKkjrE/O8O5u2VTzdpCi5 +ygRDOGbXhC2XrT19pWCTOlxjJZLagAHge+pcEF9nyafA7Nf0EUlSz8R5UbRLiyAoEUuJX ihwRzN7BV4DdbYgkOSwYVm+lCBggo4L83WM9kFOtohX/CtYJYY+rpU8lSQYpx5OES7/JdM gend0lyv9o67zOh1H+FMT+FPTjLCLaMkyUihXcaT6VaxYaEUtRLnSh7s+uzrK9bLZiesbP UiqzMdU5C7bP+sZb7nx8y5KkSFsmo9uIyrz7QstW4B0Y4ZiazftXZVSVGgglfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V+JuRc1BIagBY54NmQTvOoEwbHy5RVvOzPwMPFIL2H8=; b=fDDgk1P1+ejq1IcZtLWcWZrHEw2k7eMkMvkUlhRkYZ7jCn26IZvbFNXZEO1/jKNKviEcoj pi9MZAbhGz3C6yyJ1h454nsDtKLy16ZdWHXI1f3z+WKGAZC0TGXx/PU/UYakJEV6xVE0mu vOWPzuHrKe7eeaELG4yeUJREOGJsVzX8gGY5tzSb61v6eJfYE+PFb/SFlDHdRtlgTRxjLG oWIcLZbMzali5g+Gml6AKzXjX4lLBT3W0o4dDbhPVKg+qdzU4cgyvi3SLnoPPil0KMpR5J Z9hZpkgcPjKh7n/qNno1D9z22+GJ4mzRlmQSMmtwQuM+r2DJCfQKcgZvPXSkWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372428; a=rsa-sha256; cv=none; b=CHCiZneKjwji6dfymoe/GVOiFRmbQaZfDPZbp4kGhcPcYmDNtIp2gZMTDKITpMH48wz+c+ UbBtTKoivzNaJYAUMRR59xu6wvBJgI5KKXZGfQIUfWsYYx9ofOHcbQ0rzJ6qCx6sEwZriV czaIHPC7O+KsLThaG6HOOj2tkGSiseiXVYgd2gyd7aZpiI8E/KPTQDt/3UWoSJ5EHwfVPh S4yyAOI3qxyMnL6r8yrBEgiHKZapVoXb0Syr/Xb+dGO1VTgKelgrFKHOFyHrB9Ljbm9746 gHlRbgPjyorAtjuJswtLQgP72XUDaucmnis9c+6JnXVRFVOuqNwrFwMNHQebaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG0r5TTyz133Y; Thu, 28 Aug 2025 09:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9Dmnp009183; Thu, 28 Aug 2025 09:13:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9Dmm5009180; Thu, 28 Aug 2025 09:13:48 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:13:48 GMT Message-Id: <202508280913.57S9Dmm5009180@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: 36a4b027bb5f - stable/14 - hpt27xx(4): Fix a couple of 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 36a4b027bb5f2ab18a04434875577d18c870c769 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=36a4b027bb5f2ab18a04434875577d18c870c769 commit 36a4b027bb5f2ab18a04434875577d18c870c769 Author: Gordon Bergling AuthorDate: 2025-08-25 08:48:25 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:09:44 +0000 hpt27xx(4): Fix a couple of typos in source code comments - s/tranform/transform/ (cherry picked from commit 49ae0c259205e45267ed5d8dcc99132595cf1cec) --- sys/dev/hpt27xx/hptintf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/hpt27xx/hptintf.h b/sys/dev/hpt27xx/hptintf.h index 558b479ec2ee..eb8105ec5666 100644 --- a/sys/dev/hpt27xx/hptintf.h +++ b/sys/dev/hpt27xx/hptintf.h @@ -155,8 +155,8 @@ typedef HPT_U32 DEVICEID; #define ARRAY_FLAG_NEED_AUTOREBUILD 0x00000080 /* auto-rebuild should start */ #define ARRAY_FLAG_VERIFYING 0x00000100 /* is being verified */ #define ARRAY_FLAG_INITIALIZING 0x00000200 /* is being initialized */ -#define ARRAY_FLAG_TRANSFORMING 0x00000400 /* tranform in progress */ -#define ARRAY_FLAG_NEEDTRANSFORM 0x00000800 /* array need tranform */ +#define ARRAY_FLAG_TRANSFORMING 0x00000400 /* transform in progress */ +#define ARRAY_FLAG_NEEDTRANSFORM 0x00000800 /* array need transform */ #define ARRAY_FLAG_NEEDINITIALIZING 0x00001000 /* the array's initialization hasn't finished*/ #define ARRAY_FLAG_BROKEN_REDUNDANT 0x00002000 /* broken but redundant (raid6) */ #define ARRAY_FLAG_RAID15PLUS 0x80000000 /* display this RAID 1 as RAID 1.5 */ @@ -2018,7 +2018,7 @@ DEVICEID hpt_create_transform_v2(DEVICEID idArray, PCREATE_ARRAY_PARAMS_V3 destI #endif /* hpt_step_transform - * move a block in a tranform progress. + * move a block in a transform progress. * This function is called by mid-layer, not GUI (which uses set_array_state instead). * Version compatibility: v2.0.0.0 or later * Parameters: From nobody Thu Aug 28 09:13:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG0t45j0z65fhF; Thu, 28 Aug 2025 09:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG0s6bZ4z3QMT; Thu, 28 Aug 2025 09:13:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56VBcfsmcNSRdr+KvuiGbH18Cg4DQRGQVRECFZ9TUF8=; b=fc0Tnv7EfIJ1CbReUAVB3EhvTmOfKM84hETHFmP26td01oJxt6Yd3+X8EtCG7mi/YYzsaS GWM+5EvotuMjyArWSQYlgywDZhn7KqSgXgvwSEUSa+UofNnJCFD7dbhCXSPWONtrNJJJkZ 7/eJg4hhuSrAmhZGr2Jpx8hcwVEMn4YGSFb8UDewZUGlPiszY7E8305w3QsCbdtpia04vP VxD9sIgJzX4npqq6MG8Xaf7ldMQ8bppRDgwunvOMZ+XKFE5DdbYbVT60cJcO6/StMsi1Ew JCUaPxVy1zwyKVKuDI9SUXbjwGjCvQhVCCxO2bkQxeLCSOkI1A7AxbYcvZ6h+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56VBcfsmcNSRdr+KvuiGbH18Cg4DQRGQVRECFZ9TUF8=; b=wStv3dYGNX7JFDPyY4BE4ioXUBRdw3E6AaUMnL/K3w6RW+ayIsEvLuOZDpdQRWqzEPHyUC WNW3eX3C5IqpFKUDGGzWGqrcpi1MF1imyfPrNWf2V8BOSw6XGSXeuYOWwqgkg13rJ006Ls W91Y1riM2gsGuIjUavOMu0aw4g+jVq3NA97pVTrtR9VlesY7X4+dE6Yg3AVF2P3r9riT8K NgxzuvPgSxZ4vXHU5DHTJ7Tp+xNtQlsYksygAXdSAz4d5q/BF95cDN5ajmzcv1ybyZypp6 iqLvLYEl3pa/otQVokdmQTtElp8YMkPejXn3anaDQCh0k+xVeICN0m/kKZbrFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372429; a=rsa-sha256; cv=none; b=Ouj38uLqsqexHaId4XfszyEQaFPAvxjL3mypnHe0NgcU7N7I/8hPeWe7ZYVrnLP462N2dO m/oo5iK9Cd+QCoPZnud/+V8/siOzYT/L5vQiIjlS8l7f1Wj8l4AY+lHvKOH+GUjH5svOVx aGS+nhIjECqZC6QHXwZ+448fDPoTdqIxrhXDbrnLDzqCCat5yXtimpabWdAQ4Za4CdiRsy TqA2HUZ0y9lxbt+p2nYgQ8+NHZKBWXt8Qp4u7CV0mOJxzWbKBN6r7pWUB1F40GzKsV4+5S Rq/UzBcNkyFFo1EqnmG+7xIDvW0uheBdlmeniGhfkxpDdr/s/d1SYuSMKv8RbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG0s63K9z13Fb; Thu, 28 Aug 2025 09:13:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9Dnbn009218; Thu, 28 Aug 2025 09:13:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9Dnh5009215; Thu, 28 Aug 2025 09:13:49 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:13:49 GMT Message-Id: <202508280913.57S9Dnh5009215@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: b071ce1d8e49 - stable/14 - ffs(3): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b071ce1d8e4940bfe09139c782f99fa2143b0f1e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b071ce1d8e4940bfe09139c782f99fa2143b0f1e commit b071ce1d8e4940bfe09139c782f99fa2143b0f1e Author: Gordon Bergling AuthorDate: 2025-08-25 08:37:27 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:10:03 +0000 ffs(3): Fix a typo in a source code comment - s/fist/first/ (cherry picked from commit cc5623d8bda6ac24faf1c18ba9712e7f78dc127b) --- sys/ufs/ffs/ffs_rawread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_rawread.c b/sys/ufs/ffs/ffs_rawread.c index 3a415d766303..b5007b99b537 100644 --- a/sys/ufs/ffs/ffs_rawread.c +++ b/sys/ufs/ffs/ffs_rawread.c @@ -286,7 +286,7 @@ ffs_rawread_main(struct vnode *vp, if (error != 0) break; - if (resid > bp->b_bufsize) { /* Setup fist readahead */ + if (resid > bp->b_bufsize) { /* Setup first readahead */ if (rawreadahead != 0) nbp = uma_zalloc(ffsraw_pbuf_zone, M_NOWAIT); From nobody Thu Aug 28 09:13:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG0v43Dhz65fhG; Thu, 28 Aug 2025 09:13:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG0v09BVz3QYh; Thu, 28 Aug 2025 09:13:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cXTCpWJ3xdKVx1mBt/nchpyw8Mg8uQgwrEaq30nupJc=; b=OgnZ5K5B9S6b8KnvvrX5XJiFVTcvy6XZSZFbPmWBdN1UtZuJEWcXJVlv74XlS+UHx07bp3 MOO7pvw6pbrKVdUqGrx7qPITpoQ2h/g7RohicTgODLIqvENyUz1bg25KL+7SGL3Vxwh0Px cWRIVZ7MImrEqOrkd7WRYrvUbAa/7QKtrjTMoDwtox4x85DAjbgDvXuAF9oD7sFxczyVkO /PzL9W2v2F6j8A0arKizio6ghw8AeNk//DnDRVKzUdRCwGyrUvmLLHhOj5Txi8qqYrIYBZ QtIVMhAojtkM9sbhnAdRjMu0AU5DuDxR/cGEgmGozpCTm1UATEpEDVWREvR25g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cXTCpWJ3xdKVx1mBt/nchpyw8Mg8uQgwrEaq30nupJc=; b=wO9jETg7IV8OqueCmXEVtds9fEbcoc9URfkyeZH6EgY/sqono/XsXx1eu6sj6hkT1Erpkn D8vEH7lt5D+rPlG9drWNeSe7Fv11rShQyOMshANbYzuFcctSz01Y7lpeYJZfcCSD4fNDt5 V0ZTtucrUFUCe5JGCU6HhSqgQ5Ml/GGdxZf4dk+L4mryl2i+nUH9pFGfDhWuvrwkchcz9f Jnm4EgiPimQd4EeB/QAD0T5hxIgQTe4RWO7o/HHU0fQZWHS66Y9L1rQ2I3jmYCEsYFaF+K I3ShC1XFKJqw97epeoAFAgD3ePxFPwOqEs+AjjQvC6D5MwkHk/s2qKpsqaLPNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372431; a=rsa-sha256; cv=none; b=AzHN0fQ6B7lAgezZPQiFxAFtw5haNDrEXmlswxtwu9DcAMZ+AI0RiQmXJ03uvqw68gZKGJ Z9l3sKRmBdK+8MiWH7Gi7pdySxvC8VwBOmPESqeurk3xBeqNLvf5TXBGSHQ53gF6STxXoJ VbzjzYizFNHjUyHHh3GSrcRUjidTvucHHXmYuGyV9E+ZDqDDJn7AtEnViA5WQOK6k+Z05q 2fG6DwSDsEW1eFOKDtBiTyRuVDZSY52i6/ScK4HHMDSInF/K5XSQHwtdDL9Wzd5os46Cvf 1jbqSVvSMAQboXQbV+didV2NV1OF3JE0Py6r/aSN+vWKcY/jxx0Bctk95pn5Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG0t6kkLz13Fc; Thu, 28 Aug 2025 09:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9Dog9009252; Thu, 28 Aug 2025 09:13:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9DoMD009249; Thu, 28 Aug 2025 09:13:50 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:13:50 GMT Message-Id: <202508280913.57S9DoMD009249@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: ba027e7a117f - stable/14 - ice(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ba027e7a117f8245352167a123c964b39cf8ad1f Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ba027e7a117f8245352167a123c964b39cf8ad1f commit ba027e7a117f8245352167a123c964b39cf8ad1f Author: Gordon Bergling AuthorDate: 2025-08-25 08:46:20 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:10:24 +0000 ice(4): Fix a typo in a source code comment - s/firwmare/firmware/ (cherry picked from commit 62db40b5644726ca61e84aa56fff2fbaf30b05ca) --- sys/dev/ice/ice_fw_logging.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ice/ice_fw_logging.c b/sys/dev/ice/ice_fw_logging.c index 0025a65d73fc..16a9ab6823bf 100644 --- a/sys/dev/ice/ice_fw_logging.c +++ b/sys/dev/ice/ice_fw_logging.c @@ -48,7 +48,7 @@ SDT_PROVIDER_DEFINE(ice_fwlog); /* * SDT DTrace probe fired when a firmware log message is received over the - * AdminQ. It passes the buffer of the firwmare log message along with its + * AdminQ. It passes the buffer of the firmware log message along with its * length in bytes to the DTrace framework. */ SDT_PROBE_DEFINE2(ice_fwlog, , , message, "uint8_t *", "int"); From nobody Thu Aug 28 09:13:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG0x67Nqz65fyw; Thu, 28 Aug 2025 09:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG0x2Bw7z3Qby; Thu, 28 Aug 2025 09:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ffMu9wqEAWmZggk35RxqzZ3gbG6IukzRgCDTIEECThk=; b=mID4N4fC2uIRCMy68HgJRDC+uuZBLNFvL4kosKdQtX2qM/uAkb8LUglQFkBSvulDnBFmAp 9ZsjYiDdIpXm4ORaCrYDjKiOBC5tcChLhfLDJl70Ult3ByWO/+uNgUnYWpwRLztYucdyI/ NtqfrieMvh3Odrr1wtdqVhojP8gAM8JRpmlYdakUbGtupxYfrS/OIOWfLj/lJEQ9DFyIP6 czShWn9nhG4Po8YCugCzHuGXCnsq0ljW8Yiy8MmTuaRaspiNxde/1mB9UTkFHMYJasFDIG 6q/0dLgPMA2n9EClmCQg0SkPR6Bay5SDYh+GyQ6ShtbNflWqWjP+AQQQd+iStA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ffMu9wqEAWmZggk35RxqzZ3gbG6IukzRgCDTIEECThk=; b=Vro6zVWnLKWnbKA47SENTCzbLaO+dr4UHFMfYsIMSoDZeXaadQWq3vXUo2eTvKtBzBSTJU w1pIkc0qTCaqybfgOzV43QUgnLscjLYU1aaMzDjDV8MdrYvD+2okqpGRXTkkM0y1cUWzUg sJ36g+EqO11m3IpTPyP2shPWngbwoteeN2Or7iS+9qQoamtq3mxKWy4qj/4arjfsdXh0fl Zbm4/8yfZG3fseL3ojDTbSrlIFX8vKuYzi7/9G05pmDRlsb+2XuYMHDL6O34xx7dDt2cT9 L3UqZExXtkLL6dSmK/9i0RZiG4MPRNALVr7Qaa3dHoNtZcfLXm+IpH1QE/WTPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372433; a=rsa-sha256; cv=none; b=DQPEgQEPbEM40gXn2k/tAYgxCFFKEf+NBIVQhFBG7w3TwGMc/0X1zvIUHVD4t7EO0HSz4S 59eQaoRQ2ZZLMOnkofViQPgzI3cGpdXZ5CkujJAH42pxdWDyG7gyWaaH88O2vQTOBKTKXe PAPdtD013AzQFcR+9xiQNZRXB66AFMu44TMLLtSr8JrE/Lld1NL+6fI+shoUTDrthvxTo3 NuBetuDzyMb3aOjRCqgt1XvLGEP1T46Vc7pUJtV0kO06l3w8kW7TeRQRDD3ksE3ZsLB4Nx A8F8UeDJIIm4YORf52wT2pJsaTp7s/PQOH8UaP9z90FQ5LXsNfT/NoQ2uL9lVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG0x1khyz12fs; Thu, 28 Aug 2025 09:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9DrS5009330; Thu, 28 Aug 2025 09:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9Dr6W009327; Thu, 28 Aug 2025 09:13:53 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:13:53 GMT Message-Id: <202508280913.57S9Dr6W009327@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: cff9febe910e - stable/14 - bce(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cff9febe910eff82a2f0f992554e0c38112179ae Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=cff9febe910eff82a2f0f992554e0c38112179ae commit cff9febe910eff82a2f0f992554e0c38112179ae Author: Gordon Bergling AuthorDate: 2025-08-25 08:45:32 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:11:03 +0000 bce(4): Fix a typo in a source code comment - s/firwmare/firmware/ (cherry picked from commit a848c85d27c8f8d6b8394a372417703a2969314c) --- sys/dev/bce/if_bce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index 226fca16ac28..74d155a31ba6 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -1221,7 +1221,7 @@ bce_attach(device_t dev) sc->bce_bc_ver[j++] = '.'; } - /* Check if any management firwmare is enabled. */ + /* Check if any management firmware is enabled. */ val = bce_shmem_rd(sc, BCE_PORT_FEATURE); if (val & BCE_PORT_FEATURE_ASF_ENABLED) { sc->bce_flags |= BCE_MFW_ENABLE_FLAG; From nobody Thu Aug 28 09:13:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG0w2ysGz65fnB; Thu, 28 Aug 2025 09:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG0w1bZYz3Qs7; Thu, 28 Aug 2025 09:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9EftLN2NjKvG64iRpn5pzKmrFZvgIVhLCvc1sXnAVE=; b=RSZe6cs5mPUYUQwWZul740szgZrLCOkLPdG7UDaqbCcpsYcfVtVkoSyKQkpr/Y2A4/Ek5C 8JcRsGlLr7G4B5hx71M8Cm78GPB14168RMjZ1+XSUUpZmBxUzFQPtz44J5cxsJSQSPa/lJ rCnboyTQxGwyMT24ILOUYFURt5ccGiPiyOmtNYtS7FUbFURdrBYDXAWqlURsi64VkbNyof Sy5u0AOin2o/FyHAXRnqey4B6zpV8HAkytFyJtr6l/Ic8JVI6NbkXBtUQBzg8ECOC8rb9Z 0tsfs6w2/vAT0NKb23VN2zPi/fJxk62E3LVMHDfIGoVtt4TUekABXPl+0UFytQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9EftLN2NjKvG64iRpn5pzKmrFZvgIVhLCvc1sXnAVE=; b=cZogRETvGfMEy57CQ+jnZRklsG0MR2lRh/rTlZtBcOzSiup5EQEQ5VIVferkxOQFIyy43Z eSfkHsbVNMiaHP7RH7Ajxd2PrJL27beMHj3uJberqhSSiMkVYTIJqIUsd1SFyRD4EnD/dV fmChN45qJwLJ0/3eTJf2uxgB1y1IHAuUVF4i4E0l58vKeMPrxs4z84j499AMsoJ5sLKf5l sAtvEZGFSzk4pGhp3Km0lo6n9afVYYJQMbcmzihI8G6ou76Fm7L2oHEMUsedXbl+/uDSnq D1M//Y3xKXrGPNXcKLEyCR1lk89P1RWv+UxJuJ7mgOVzVZAnLt9y8HtBpr0Spw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372432; a=rsa-sha256; cv=none; b=rFqV4A6gXHIO9dkTLFB7ARYNPCnmtMwhFQFr2yDtR9iwykaQQs/VErlJCmmPqkN5WlThi9 batSgK5NSmUX4sh350k1gP/BdkClrgWDWaOdDqDochXSL35KOI0WBSz36umOBOgQR+YzSY /MK27fm6EpIFhEtKVZy93M6kfkx2EMtgLOMq+WAE1KTpjR6z62tbcaozfUg+mb7Kt44Wbj OrJHVuOW/hCYxbBNnDn95KmATSjXQmoXZvqbFuLBHNiRfF+Wo96zkIUKCFA4jQg02uZocO 4G1u0M67exFinaXT3ei4N4ZfNIRA+VdBg9El2OdxlG4OFVQFyIxyeFze6RLQOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG0w0s0Dz12jJ; Thu, 28 Aug 2025 09:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9DqIo009287; Thu, 28 Aug 2025 09:13:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9DqLx009284; Thu, 28 Aug 2025 09:13:52 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:13:52 GMT Message-Id: <202508280913.57S9DqLx009284@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: 526f1d34bf45 - stable/14 - cam(3): Fix a common typo 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 526f1d34bf450564a4b1461dfc4e0a3f26e18624 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=526f1d34bf450564a4b1461dfc4e0a3f26e18624 commit 526f1d34bf450564a4b1461dfc4e0a3f26e18624 Author: Gordon Bergling AuthorDate: 2025-08-25 08:35:01 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:10:43 +0000 cam(3): Fix a common typo in source code comments - s/tranferred/transferred/ (cherry picked from commit 90d7186379b08e5fb0f3d146a2e82a4fa8d9c9b8) --- sys/cam/ata/ata_all.c | 4 ++-- sys/cam/scsi/scsi_da.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/cam/ata/ata_all.c b/sys/cam/ata/ata_all.c index 7cc3d607f01d..68109b8d9ac5 100644 --- a/sys/cam/ata/ata_all.c +++ b/sys/cam/ata/ata_all.c @@ -1152,7 +1152,7 @@ ata_zac_mgmt_out(struct ccb_ataio *ataio, uint32_t retries, /* * For SEND FPDMA QUEUED, the transfer length is * encoded in the FEATURE register, and 0 means - * that 65536 512 byte blocks are to be tranferred. + * that 65536 512 byte blocks are to be transferred. * In practice, it seems unlikely that we'll see * a transfer that large. */ @@ -1221,7 +1221,7 @@ ata_zac_mgmt_in(struct ccb_ataio *ataio, uint32_t retries, /* * For RECEIVE FPDMA QUEUED, the transfer length is * encoded in the FEATURE register, and 0 means - * that 65536 512 byte blocks are to be tranferred. + * that 65536 512 byte blocks are to be transferred. * In practice, it is unlikely we will see a transfer that * large. */ diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index efa903c2e57a..d8bf0774eeec 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -6545,7 +6545,7 @@ scsi_ata_zac_mgmt_out(struct ccb_scsiio *csio, uint32_t retries, /* * For SEND FPDMA QUEUED, the transfer length is * encoded in the FEATURE register, and 0 means - * that 65536 512 byte blocks are to be tranferred. + * that 65536 512 byte blocks are to be transferred. * In practice, it seems unlikely that we'll see * a transfer that large, and it may confuse the * the SAT layer, because generally that means that @@ -6631,7 +6631,7 @@ scsi_ata_zac_mgmt_in(struct ccb_scsiio *csio, uint32_t retries, /* * For RECEIVE FPDMA QUEUED, the transfer length is * encoded in the FEATURE register, and 0 means - * that 65536 512 byte blocks are to be tranferred. + * that 65536 512 byte blocks are to be transferred. * In practice, it seems unlikely that we'll see * a transfer that large, and it may confuse the * the SAT layer, because generally that means that From nobody Thu Aug 28 09:13:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG0z5TyCz65fXG; Thu, 28 Aug 2025 09:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG0y35k1z3Qvf; Thu, 28 Aug 2025 09:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OveaKvt4dgq/8bA4FitxNfJKNMIPIZvQduN12K/02os=; b=tjhWYT6v24IhxJ5Z/ZUYuXb8DhgYgdLwTrIWb0TuDShuWRPZSqzLDNDitaDU/6OYQFsYuf yVCZ1qQ4M+66JW30qQ7LbAmcKamyX2uX4FuYh6y0j4s3ze44Ny4Da1EQPxudiYXrikeRmM pn/1qc5CKgAhQrK6nb7uV2RE49UZusgNc8pXwXDnIi8U1DBrgJ/CAaNiIWB8MAz+V6KfvC ilLlxygpR7GUcLbF0qPBywXqbc8Oe+C9xD0xyTf/xQc4GiHwhMiqQsE+l48XJVgxayCcp8 s7MAmHnu52VHdsL6sE/40HEzqbZwcTWF1lVWBex/fFltUTaVzqR1F05+K5hs/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OveaKvt4dgq/8bA4FitxNfJKNMIPIZvQduN12K/02os=; b=wpdTk/IuYS3xxB4PtAlkkV1trVT2Ifbdoeeado4vmoQ15hwNasmUAx1868Cayc0zaP3t+5 aIUjpZcFAjoJZOEJcyR+XHk76R8gDukjPUjZcJqkOC9tvHfoQ5CofDQBcUPsfdragZOvJ4 sVo/uEExvpo0c+y9QMDPpc3hcyFgvbp4bcbUyn/1VCoeKmPwdA7xgIrtpDbACQfC1kPk/Z /n9vsxz759Puuvhpn5PKKbZubkOG43YGUVujR/n0pihhR7SlmMcmCHXpu2ASwVm/V0jlKp L3n9ZkUg3dTXNlJtZxk2kj5IIPOh+3Y/4qowoSJK/ADEIwkADyCfu7K0EUSSJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372434; a=rsa-sha256; cv=none; b=XokHEKqvE81q2B9gJ309CownH48Abo/vuOsgru8EKhxPrQ2JJoC/+1AQ70xsMEXaT1lchV 3wm37W8m4bL71pA9Jhp5RlZYBYR4xqY6R1qZkKRkuUdV+sXeioFBnmllY5y6JAkIIcxRXh XqRF4SuPmAs+FTd1LcnEUsTZW2qVWl3Bs8JHl8QUYurBsycPWEMiPYRnbaXbQoZqbyH8xE fuOHpPac9jIScMlxynpPz4Q92p5NBTmf0nEoaRHXD0X+zCkUqTZLw4jW+T/F4t+TbbB5+n yklshBRMSO5HnpPO1Ah2ufrlJgXY1UwvOAdpuRlaZv7ubk1OwhbcSgkyk523Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG0y2g8gz133Z; Thu, 28 Aug 2025 09:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9Ds7u009366; Thu, 28 Aug 2025 09:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9Ds8p009363; Thu, 28 Aug 2025 09:13:54 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:13:54 GMT Message-Id: <202508280913.57S9Ds8p009363@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: a1def923143d - stable/14 - mwl(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a1def923143dd73d8d9e48d0bafb2d2fb577afcd Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a1def923143dd73d8d9e48d0bafb2d2fb577afcd commit a1def923143dd73d8d9e48d0bafb2d2fb577afcd Author: Gordon Bergling AuthorDate: 2025-08-25 08:44:41 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:11:38 +0000 mwl(4): Fix a typo in a source code comment - s/firwmare/firmware/ (cherry picked from commit 4f768b8acdf818f08f4f0124c1df418127720266) --- sys/dev/mwl/if_mwl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c index 2d9b146c9f60..b79a1d39f472 100644 --- a/sys/dev/mwl/if_mwl.c +++ b/sys/dev/mwl/if_mwl.c @@ -1801,7 +1801,7 @@ mwl_updateslot(struct ieee80211com *ic) return; /* - * Calculate the ERP flags. The firwmare will use + * Calculate the ERP flags. The firmware will use * this to carry out the appropriate measures. */ prot = 0; From nobody Thu Aug 28 09:13:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG102fjRz65ff0; Thu, 28 Aug 2025 09:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG0z4jZCz3R1Y; Thu, 28 Aug 2025 09:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/VqgRQ8XZdbUo5JIOg4pHes/qJzzNlyJXEXrwzQx+3s=; b=NpCcMDxCnSnbg9aIHhSBJHwIasj4GaA3SP4NMXmECiCqv5eVDYmuRgLBZbxOGn5zRmf7XJ 9+GryNq5NXbIzRzlh1eLTU/36fmSYqqyq5VVaBi2WNdDZNIUkBbTOGjIX39KipoMBqk9QH Lswa7P4Gh8zyJuyL+yd8DaO4OMytmIX8q0SMrm4RvEO4r+ASGBufqPqrDoD3UfG3RkVY4n d29aYe6z0T/bXVHr0pWQx3VqVK1jbsXC/M8Neh1tLI6WGIfHxlWakjupgziB0E9voPP24B Beqtm66BnUkJhrcuCZMtwEg1Kf9nVqEe2PYxEAvtbK0K4fMIMyWaLbMQLWwmSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/VqgRQ8XZdbUo5JIOg4pHes/qJzzNlyJXEXrwzQx+3s=; b=kCWwJu2OLUG1STutPezveyuOf7xOMfYjPzeMX6Brm7YnDOeRvmkQhyYvBb9Ogq2xsn2R99 sw5A48AbSHtXIor1+IO5wlPr2592BcQGAu4TFQae22vMFdl9Toxmc/JWdlPBe6b1d9JJ0j MPr6fH+1m9ITYDBYsPKeiOxP/sQam7riYvARKFtj8Mhu2tVZRGYd+nPgGwgUlVry7LzQlZ SfGi3Wns2UoIO59EXj2UAFymyJPTDgFKKQzIC7rfFVn4IodwvoAFFW4x/Wmuj3+gMnS8p7 I3VpD9Pdz7J5158eHojyk75DI1WFFf2cLx8ugkE9nUtnXQxthxplv452ISRlAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372435; a=rsa-sha256; cv=none; b=Lgpl229QKw1i6s4s2RsMehXFfvWnh3zSKX0Tl26x8CK0s0imoYhRsY+yjR9PpKZhVy/Mkg qFpnQb5dHfnDCYOr+AsJ7Dwu21G9GiV/uYqe1daNZ+vwsBDV499/fB949uD5J8f3pfsNr/ GAkeooOPcNFWsS2AuvUIKZLe4tX5fmV2WruEMoy/MylWP4TA+cSRW0S9hUX1qA98EQ3Hjw EpQLqMwSsKuqYt2Vmvp9mIcxXMeri5maP1i15bZrC+BoIAqAHqNPNi3zCV64kRyjdFsqJ0 KWOzTM9mWBJg2dDN2YTHOnrQUklAvJ3iZ10moskpWaU6EBuo5tYSRjbhTljLsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG0z3NG2z134v; Thu, 28 Aug 2025 09:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9DtYo009400; Thu, 28 Aug 2025 09:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9Dtei009397; Thu, 28 Aug 2025 09:13:55 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:13:55 GMT Message-Id: <202508280913.57S9Dtei009397@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: b8259e215043 - stable/14 - mod_cc(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b8259e21504330940b90714372bfdf9a592ce928 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b8259e21504330940b90714372bfdf9a592ce928 commit b8259e21504330940b90714372bfdf9a592ce928 Author: Gordon Bergling AuthorDate: 2025-08-25 08:39:11 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:11:57 +0000 mod_cc(4): Fix a typo in a source code comment - s/assigments/assignments/ (cherry picked from commit 88ed58d7f88471dc69e943e94d420cd4ef090042) --- sys/netinet/cc/cc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index ea8cb904c7aa..af32817a547c 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -618,7 +618,7 @@ cc_modevent(module_t mod, int event_type, void *data) case MOD_SHUTDOWN: break; case MOD_QUIESCE: - /* Stop any new assigments */ + /* Stop any new assignments */ err = cc_stop_new_assignments(algo); break; case MOD_UNLOAD: From nobody Thu Aug 28 09:17:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG5609sBz65g2Q; Thu, 28 Aug 2025 09:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG556gmWz3SfD; Thu, 28 Aug 2025 09:17:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKERsZZ2Xw2SdYgrzfBH1RKNY1QoDCgyOvxlfxiR4CY=; b=a76pOvSUVnFcRNUzv4fuX+FYXVZHyJKQFOgs51VK2b7vRfnhFvtiLQDEXpd3F6axNL+bJ3 IuLh3v6eumCyXYp60rQIgHjoD1SG7lIb8n4Y9sMfb9j8WgULRZ/A4hEs0h+QRpTdebeeta oG6gn3eXvJ4VLtWbQ7kE1r1FhHeekQXakaug9v+ZnNqFfWzALCIKeun9gM3YwLGjBLmnet anDPlx03dQDu/SPrxAZbUD7kFG69xNRmJbPtmFXdCtotlIPCw+5DKwD08Rc135JNof1yuL EOA5dKQodE/DQcR1M+mc4dLYqXqdc89b2zxyHWJaP1uuvPwtMUd+SgbMwkPGwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKERsZZ2Xw2SdYgrzfBH1RKNY1QoDCgyOvxlfxiR4CY=; b=LPK/7KjxSfsYJiWC30bvyP2nOe6qi+KEG21GFjJiBPfvsUqT04F4Yg5Bc+KbRGDTY33VC+ KJNwT+o4luX2MpE7fj/wweyLXT1VPwyd03cx1cmFtiUzc1QXUm7CCGZLkhedSOOAztoFVr d1CHLolcWH1Yvl7LR4qOh0GcaHvZKgRQG8nRCLp04jCUl29dLYY+gMWnGlhWDGZHrfa1r7 STqL1o//9/mq4EqwhY6fEwaBjAO4ug874lmZGIBA/52wUNlxMfB+K/OBmIac+DUQpcS810 bjGzJvsIY9aFiBUlKz+Ynj2ftWzrn0cWuoJTIRElTiP5OOl6RQtfp6a27BYF1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372650; a=rsa-sha256; cv=none; b=UMR3qPjdUjO/GVtNvptAvQ1xFEbJgx5hYczLX65v0cyfBS5ilrck6i/hk/MhdigYSQUEd2 loszYd5UfDSGJJuvPkgOb0KVeQVPNzYDoHAkNS9plGmsI2yecXdOEqmn25DEHMWHwPQWks IIPMbZSy0iMynQ//t2AaimrL5I8nmF/oUTLlpjF2utvt/BJlm/Ok3YiW6l182sd2DjMZuw n48ehTwnwKHxrlDrn1Y+WkkYQp7+j2sYYV+IJ11LTWcue8j+vsSEUIyufyxxpu3wDqIrfr 7xZxRM3UfJ+eJgbl1JMxUsEZoDOAU8IDLSC02rNYUwV70ZdJ8IK5ebwoeOfB7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG555zz5z13Gb; Thu, 28 Aug 2025 09:17:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9HTbo010636; Thu, 28 Aug 2025 09:17:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9HTir010633; Thu, 28 Aug 2025 09:17:29 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:17:29 GMT Message-Id: <202508280917.57S9HTir010633@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: 87e0274be959 - stable/13 - msdofs(5): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 87e0274be95993dd3652d5eec9f6b45c7ecd41a4 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=87e0274be95993dd3652d5eec9f6b45c7ecd41a4 commit 87e0274be95993dd3652d5eec9f6b45c7ecd41a4 Author: Gordon Bergling AuthorDate: 2025-08-25 08:42:23 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:14:33 +0000 msdofs(5): Fix a typo in a source code comment - s/fist/first/ (cherry picked from commit ac4005219166fc94da4ebb7adce3da159072f6d3) --- sys/fs/msdosfs/bootsect.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/bootsect.h b/sys/fs/msdosfs/bootsect.h index 170d94cb9512..94b1137a153e 100644 --- a/sys/fs/msdosfs/bootsect.h +++ b/sys/fs/msdosfs/bootsect.h @@ -20,7 +20,7 @@ /* * Format of a boot sector. This is the first sector on a DOS floppy disk - * or the fist sector of a partition on a hard disk. But, it is not the + * or the first sector of a partition on a hard disk. But, it is not the * first sector of a partitioned hard disk. */ struct bootsector33 { From nobody Thu Aug 28 09:17:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG572gPmz65g9m; Thu, 28 Aug 2025 09:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG570LZYz3Shp; Thu, 28 Aug 2025 09:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BcAh1VJpTwWBnr2AfxCOr8a30WP4qt6vVtej6PxJXGU=; b=B2qhs79+AGJv32RJwmuMzRtO5XnBk5W68Cj9FoJcttcmb+GO1d/4DyH+f5228FKpLj3gJq inl6f7iMUw3mCjx9QLO8vD5i39sImA5tE9zLkjr0NZe3GAoORzK+1G9MpwSkNsal8JmvZK IiVKxTib9dhR316sPe+bP5LDV7oIc64Bg39Vhwg3vqI/eRxJix0Z68KiiNB0adgj/SmfjS SMtpTJRLODepS3wxYA3LdOfG9HR6VwxeqH+WMVYKuRfutjOYXVPghvUVnCt+uqynsX24/c Y0WTLr1HkuMbvTelZDfk6xnZcXPwnbOvqtCErclPnBRq8u8btgYcj2TI+m895g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BcAh1VJpTwWBnr2AfxCOr8a30WP4qt6vVtej6PxJXGU=; b=IEpMSTZC7WtbBRDS+YyE0RGCJTThw27buINwwZ+6CMa5gMQy5eKwBD6OsHYz2AvQ3CILq6 W/GW2ho/7yc4ShxWiOTdBGAc0qiE5uLy6w0TIxJfTvGfP1RvIz9TXvSeytdY2Ltxmy7ciC KfbjEBHf10EM1dUEU8OULPA8fRezYBMOcS2jSZp2vrSqpSF1WAS1Z0Clbvrphu/K2DERSL zt2MdxprtQ7QUErh+tUF4tAB88tP6VkoKF6fVxImoizbGGgRsoCjb0Jejjut08UrCk/Owl //5bMhCU/31RCoe0UewI+OiiywowfhXBIR/M+6QfXjHPtLem1kno2D5eiwDPSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372651; a=rsa-sha256; cv=none; b=wmp+UMCMoCwMRRUaG6aFHqv5jKVanV2LzYk1z7pf1Pb8V45fC6fhnVuYAS5jf/MdoOoSOm QRbUbE4r391YBuZuAQoyAh8CGpHDauNl9/QFkuaqIzx8+zEofDw0X2Pgg6AR028n99+fwn HOE6V0TVPNRpIXJ0yEOe7XaBPOeyxadDjxkK/kq8eF8jRRjv6cBv/rcAnDhlLVNmVq8h8y qovcLl1fPHXQpT3f88gdanOYGCs94lWr1O3cgOZTXBSZpgxXbG+or/NZl3N2y6Cb+HQi8L Gm+Rqviz0DKeTt1aP3vDAHO08l8v/mw/JOtV5o4p0gMTJhDwD76vwZrz9z7Tpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG566wlwz13Gc; Thu, 28 Aug 2025 09:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9HUEe010676; Thu, 28 Aug 2025 09:17:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9HUxe010673; Thu, 28 Aug 2025 09:17:30 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:17:30 GMT Message-Id: <202508280917.57S9HUxe010673@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: d0fc19ab9f0f - stable/13 - hpt27xx(4): Fix a couple of 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d0fc19ab9f0f982721c8026709e831fe9bf2db43 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d0fc19ab9f0f982721c8026709e831fe9bf2db43 commit d0fc19ab9f0f982721c8026709e831fe9bf2db43 Author: Gordon Bergling AuthorDate: 2025-08-25 08:48:25 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:14:50 +0000 hpt27xx(4): Fix a couple of typos in source code comments - s/tranform/transform/ (cherry picked from commit 49ae0c259205e45267ed5d8dcc99132595cf1cec) --- sys/dev/hpt27xx/hptintf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/hpt27xx/hptintf.h b/sys/dev/hpt27xx/hptintf.h index 5356e73bc194..a4ecdcf75d71 100644 --- a/sys/dev/hpt27xx/hptintf.h +++ b/sys/dev/hpt27xx/hptintf.h @@ -155,8 +155,8 @@ typedef HPT_U32 DEVICEID; #define ARRAY_FLAG_NEED_AUTOREBUILD 0x00000080 /* auto-rebuild should start */ #define ARRAY_FLAG_VERIFYING 0x00000100 /* is being verified */ #define ARRAY_FLAG_INITIALIZING 0x00000200 /* is being initialized */ -#define ARRAY_FLAG_TRANSFORMING 0x00000400 /* tranform in progress */ -#define ARRAY_FLAG_NEEDTRANSFORM 0x00000800 /* array need tranform */ +#define ARRAY_FLAG_TRANSFORMING 0x00000400 /* transform in progress */ +#define ARRAY_FLAG_NEEDTRANSFORM 0x00000800 /* array need transform */ #define ARRAY_FLAG_NEEDINITIALIZING 0x00001000 /* the array's initialization hasn't finished*/ #define ARRAY_FLAG_BROKEN_REDUNDANT 0x00002000 /* broken but redundant (raid6) */ #define ARRAY_FLAG_RAID15PLUS 0x80000000 /* display this RAID 1 as RAID 1.5 */ @@ -2018,7 +2018,7 @@ DEVICEID hpt_create_transform_v2(DEVICEID idArray, PCREATE_ARRAY_PARAMS_V3 destI #endif /* hpt_step_transform - * move a block in a tranform progress. + * move a block in a transform progress. * This function is called by mid-layer, not GUI (which uses set_array_state instead). * Version compatibility: v2.0.0.0 or later * Parameters: From nobody Thu Aug 28 09:17:31 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG584BPbz65g2W; Thu, 28 Aug 2025 09:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG580wXLz3Sj5; Thu, 28 Aug 2025 09:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KATxvd6aRpBOApfL8gpHL+b4EFdFwdtnWKYxscswosA=; b=UvAiw5l6V4ZkinxUrhrTfe0d1OPfrAyM2xO9OhOrIyaoRFQspRYwTYK0rd0B/OaZ0RhNLm +RCCZ0kCaZxkJiKQZm+GEs/IlJD7wMb/syqkyyhPUMhFZKZ82UtPudktDO7pOff6ZvbZqD g2khYPqxurHKfMe4eqVO71RZu2r3sL91mrXzXhGFqih7kTjJYZJ6HoX3PGLvkVcrCvzk7Q 2PPvZ83e0dIKa/dUh5+MMKHg9cnaDx+90k4ls5zCuS/N4E1koLFWeoOjlnYFSX1KgWEZZn KVCNrBR6Idy6PIsEljOZmlTQZSUwKYbiS8ba0a2zbUa36lqby7SnuMbIRgYvIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KATxvd6aRpBOApfL8gpHL+b4EFdFwdtnWKYxscswosA=; b=L6n53/v+gtNrfPbUvSreuEzTwiniIT7crIyaU/iypiwuHdIKummL+w6bxCemvPQPGLXvhK ImhhzxmEvD3ZEsoS/Xea5rxvo9b53oPAbFxnQJCScEgHSN5EoceYEhDW3sKI7yrsL1weXl 1zUi40lL++pDvlEDHjLMfhXuAOmJySqopmEAWpIqilkazN5eLLKvwgVwKS3qehj8L7pC1i B5vfMT6Fh/xH6fDYaGMdbIeh+V+a6Gu8g7CeAHfcOLDr8+82A+9HNWJZEXxbuhRIa48vAn VHwvuJksvRuwWLOnloh59LAzr65Hh6S5eT6imcWepJrpsOVJC3py7yvwfP8lDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372652; a=rsa-sha256; cv=none; b=Pi5UHkmojQip3ZLCIzKTEW77m9R34nLg9eqNtFzhdaF20Z2nmIpv/AP9JkTaR8uNVR3OzT wdKVAr4+rn5pcicL48CrE8hZjaI3UBEYNX7bPY170Mvod0Jd24W0qA+SZb1teC95PA2dwj zqT9E2JCi+sEEK//7kPC+uqOzTnoRZZwGkNHhELKI6WRIoVlLf3rHq+EGxrBxUehKFjARH dMRGm7wTAamQB1NKRly3QVNeZlhNphN2KAaMAq1gx6uZsPCn15dgDPD1cKzNz3OD2FioYa YHh6wytkGg4CEWOyl4PJskQB0LWEeeTDwkhQbCbc7Fdd6/Wfc4tPRlwrQu23zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG580HzBz13Fd; Thu, 28 Aug 2025 09:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9HVPn010710; Thu, 28 Aug 2025 09:17:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9HVDN010707; Thu, 28 Aug 2025 09:17:31 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:17:31 GMT Message-Id: <202508280917.57S9HVDN010707@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: 6062ccb1fb7f - stable/13 - ffs(3): 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6062ccb1fb7fd4b5de6ab43846ce16738612960a Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6062ccb1fb7fd4b5de6ab43846ce16738612960a commit 6062ccb1fb7fd4b5de6ab43846ce16738612960a Author: Gordon Bergling AuthorDate: 2025-08-25 08:37:27 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:15:01 +0000 ffs(3): Fix a typo in a source code comment - s/fist/first/ (cherry picked from commit cc5623d8bda6ac24faf1c18ba9712e7f78dc127b) --- sys/ufs/ffs/ffs_rawread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_rawread.c b/sys/ufs/ffs/ffs_rawread.c index 3a415d766303..b5007b99b537 100644 --- a/sys/ufs/ffs/ffs_rawread.c +++ b/sys/ufs/ffs/ffs_rawread.c @@ -286,7 +286,7 @@ ffs_rawread_main(struct vnode *vp, if (error != 0) break; - if (resid > bp->b_bufsize) { /* Setup fist readahead */ + if (resid > bp->b_bufsize) { /* Setup first readahead */ if (rawreadahead != 0) nbp = uma_zalloc(ffsraw_pbuf_zone, M_NOWAIT); From nobody Thu Aug 28 09:17:33 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG5B052Fz65gLn; Thu, 28 Aug 2025 09:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG59215Tz3SWX; Thu, 28 Aug 2025 09:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rlIyZsBBlqRTomPyoqtewOBZjW5uB8TAps5vz+8wKU=; b=GrbH36n0O0wUBsfWS+QLCJDHVn35cQbGTUPLf1q94do9xNSDfcRzHvGX+YNU7IdPqVXQIC K6wtCIws2DNv+3xHYkZhpW54t/33u2mADlCKwG0i78RVAvOTkjxgLsi8mWA8TOHxSQIaTv uAaEgdPiuHWvTuJTXmzD/0cE1e41zwClO8fm+o8cYWd4ZH5k9Wd6HjwLB+uQTbKuOAFa4N kJ4cFEFI0eeqPmIlD03d/o2iXlCkx9pNKLh9J8ciRU222WKe4qQIqKkbyoAKMOzfqf2qoG 4qfxtxUSxIhkT+4VuH8gyx2b1P/FdYLSGMz6pf2GV/fGgcgmexQejf+qB06hwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rlIyZsBBlqRTomPyoqtewOBZjW5uB8TAps5vz+8wKU=; b=bNHrjBC6CMLY/jRR4tmKxdJx//8FplciAeLyylFGFfIn9EhD+klErvOQRgvZ1XhFO+g/f/ vc80VliNdH9mIcNiR5QLMgoRK+D1mnU1VYnMCl0nyfGNpRUpYVCAP62AI19tNycO/jsjMs Cdqi+aza9qaqzpTsSNoxyvXGfQeO5I7V0BWZBX/4rtqU+ncigLhoQ4Wad8uCWlKY9eFbWw BB4DpmyolX9H7I9oHbNuC3l13wU8es1GC6nY8Y8D4NPGX+jjY5wvlEG9FtlFMb90XUVdd1 xaJxC/9Gl2o+thHtAIq9eNalLdYii8HMNPVME89Y95boiaLB5NbqI7sDQrQkAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372653; a=rsa-sha256; cv=none; b=ErbErUgpgbt1O4KVBtoGWjMrAWgvIdWglfqzi90YYJSV46pg1gRK7UjFO11iBwrKtcUHPf QMplDuL/eje99vFqATkHyXpWbgActNUdVj84D6khBBGcjkFheb31JohJef+KuccJIjL4Tj dKvvwg+G4TpphDSeBqzOpiYJokWahit5M/J+SK4KSmxVOr+wUvIH4+FqKHt4Iagxt8Mzws rqi9yrW/yuhPs9P5+IH7O8jVzME2PXLL2e+GABtNa9VwGIs1TvLnS1Joo09zmxy+N5FwmV yg882VWMxVUXgbDnQy1mhcQ0OkANhdKdoHcLMDkPlCyTpdGu7wMvttl6BNZqgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG591YQGz12jM; Thu, 28 Aug 2025 09:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9HXKa010744; Thu, 28 Aug 2025 09:17:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9HX6U010741; Thu, 28 Aug 2025 09:17:33 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:17:33 GMT Message-Id: <202508280917.57S9HX6U010741@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: ee72210b7c3c - stable/13 - ice(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ee72210b7c3c0dab73fd1c435dc7cb262ba6c2ac Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ee72210b7c3c0dab73fd1c435dc7cb262ba6c2ac commit ee72210b7c3c0dab73fd1c435dc7cb262ba6c2ac Author: Gordon Bergling AuthorDate: 2025-08-25 08:46:20 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:15:14 +0000 ice(4): Fix a typo in a source code comment - s/firwmare/firmware/ (cherry picked from commit 62db40b5644726ca61e84aa56fff2fbaf30b05ca) --- sys/dev/ice/ice_fw_logging.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ice/ice_fw_logging.c b/sys/dev/ice/ice_fw_logging.c index 0025a65d73fc..16a9ab6823bf 100644 --- a/sys/dev/ice/ice_fw_logging.c +++ b/sys/dev/ice/ice_fw_logging.c @@ -48,7 +48,7 @@ SDT_PROVIDER_DEFINE(ice_fwlog); /* * SDT DTrace probe fired when a firmware log message is received over the - * AdminQ. It passes the buffer of the firwmare log message along with its + * AdminQ. It passes the buffer of the firmware log message along with its * length in bytes to the DTrace framework. */ SDT_PROBE_DEFINE2(ice_fwlog, , , message, "uint8_t *", "int"); From nobody Thu Aug 28 09:17:34 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG5B4rhKz65gLp; Thu, 28 Aug 2025 09:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG5B2jhCz3Sns; Thu, 28 Aug 2025 09:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pp55Dkf+2yQQN/KYC9EICmwBLZQEEur84767TIEQyYI=; b=wFMm0jiUh7sSyXB+Ks1qKq4wmAFEZp7llbQZ7n0wnYLCUnJFZCYlvFx9geBJoPAxiiMdea Og0G/WBt0tUta4LZIlzMjZSP/2GlJOB83Nh8RrcYotQg5+HL7i5njNYmADAkceCYzae3Jx ZcTaLVjhKUth5m1GHZI9mfOyrS0nt5MSTP37ElqKM8lX8qEMgDcjWHu0Dma4dgJ87Gwd9J 1dqAMG2Ita2YLkk9qWglsjIJno3/16vrPt9QoNnt9F4LfR7szfcrtfjLqMVWhGNhJs8lC3 NGB4RwxU9+1FMgx4zFvccEPUGm2Z0aIn2BU7JGfnzszzxsiCidOkup319L3tDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pp55Dkf+2yQQN/KYC9EICmwBLZQEEur84767TIEQyYI=; b=k+A5Bz/MPl0bQqfXKu+dFP7C4k+c6+0eCl/5hqxcLShI3KwfpTgFltWUdVmPRnCSMFHFU3 qE5aYvioJDOcsZO+6zWPXB8fLae6/4c39G9IM3P3ttcoLcpOifViNjhlLMsfxIPYLFtQYn QWrX9OiFtRZ5WbjL5OSL9zDtqZrcy7hvWen0PnGQZXetqjoF9zMegvc5nZOG8/atsDTTtA fcyo8zGc+kI/JdBNBD+EKYoKQRIzAlCTn4h+dE8anuUIItTdAV9P0QzNHI1Vnz1fEaKOaz A47e/UCtTpPTC4fTyDfe1LJwNBcB5+hdJ6TdiMPDyPmWiCIADwls1SafZMwM6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372654; a=rsa-sha256; cv=none; b=vqnSPqJpy8+mTR2iFgYJsrgdkj/bYqwCbIMzABk0Ijt+iod2ynGij8Mth0x+VfuwURU+k2 G6qsQXJRNRBuCN3dIQWAIdB32C7M0faUwID1cUtYwH2+hqIMDa1hvPgDDBFQ/t5wxuATYZ fOzzGeYZoTGePWX4BpfaMQqGNpKmxSMeS/UWiICG6M4IDnvuPg9rlaFGVd+MRFP6QVZR9y AstiLVzKWKAggzHvmOH0lG/3saYUdi+N2GFcBQz/ccdNCPWKGhMqnN0VbKTqWxpm13cOzp /fw4UK4lRsmEII21I1jJ1FtfaDkWDyq8TU1jpD3WqMrsLaLstmj1zZb0zfTzjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG5B2HDhz1350; Thu, 28 Aug 2025 09:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9HYNv010778; Thu, 28 Aug 2025 09:17:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9HY81010775; Thu, 28 Aug 2025 09:17:34 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:17:34 GMT Message-Id: <202508280917.57S9HY81010775@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: f9fab6aa832e - stable/13 - cam(3): Fix a common typo 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f9fab6aa832ea4972548d82b1640c87ae4867c1a Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f9fab6aa832ea4972548d82b1640c87ae4867c1a commit f9fab6aa832ea4972548d82b1640c87ae4867c1a Author: Gordon Bergling AuthorDate: 2025-08-25 08:35:01 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:15:25 +0000 cam(3): Fix a common typo in source code comments - s/tranferred/transferred/ (cherry picked from commit 90d7186379b08e5fb0f3d146a2e82a4fa8d9c9b8) --- sys/cam/ata/ata_all.c | 4 ++-- sys/cam/scsi/scsi_da.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/cam/ata/ata_all.c b/sys/cam/ata/ata_all.c index 1bba00bc1a16..d7b649e54214 100644 --- a/sys/cam/ata/ata_all.c +++ b/sys/cam/ata/ata_all.c @@ -1152,7 +1152,7 @@ ata_zac_mgmt_out(struct ccb_ataio *ataio, uint32_t retries, /* * For SEND FPDMA QUEUED, the transfer length is * encoded in the FEATURE register, and 0 means - * that 65536 512 byte blocks are to be tranferred. + * that 65536 512 byte blocks are to be transferred. * In practice, it seems unlikely that we'll see * a transfer that large. */ @@ -1221,7 +1221,7 @@ ata_zac_mgmt_in(struct ccb_ataio *ataio, uint32_t retries, /* * For RECEIVE FPDMA QUEUED, the transfer length is * encoded in the FEATURE register, and 0 means - * that 65536 512 byte blocks are to be tranferred. + * that 65536 512 byte blocks are to be transferred. * In practice, it is unlikely we will see a transfer that * large. */ diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 2161e3340ff6..8ca64e7a8665 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -6518,7 +6518,7 @@ scsi_ata_zac_mgmt_out(struct ccb_scsiio *csio, uint32_t retries, /* * For SEND FPDMA QUEUED, the transfer length is * encoded in the FEATURE register, and 0 means - * that 65536 512 byte blocks are to be tranferred. + * that 65536 512 byte blocks are to be transferred. * In practice, it seems unlikely that we'll see * a transfer that large, and it may confuse the * the SAT layer, because generally that means that @@ -6604,7 +6604,7 @@ scsi_ata_zac_mgmt_in(struct ccb_scsiio *csio, uint32_t retries, /* * For RECEIVE FPDMA QUEUED, the transfer length is * encoded in the FEATURE register, and 0 means - * that 65536 512 byte blocks are to be tranferred. + * that 65536 512 byte blocks are to be transferred. * In practice, it seems unlikely that we'll see * a transfer that large, and it may confuse the * the SAT layer, because generally that means that From nobody Thu Aug 28 09:17:35 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG5D1T96z65gCl; Thu, 28 Aug 2025 09:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG5C3gSfz3Sp6; Thu, 28 Aug 2025 09:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3wTywt1y4uBXcevgsh7Zw18g29pmmegDj1xQTKLj1fQ=; b=GqM1JgRDCw1ZK4lzmjFXVevCJrAHDQtJtXh9eZmtTPIuyx1bKXVaQ8a9OxAStfSdfY5BjG axDh8/+61pUfYj05t6ErW+hD3TmnQNB1hceull65YRi6HrJkV9ROBGxFuZ7FUylaji23E1 cKdxIdOeKvVPcjA3k6o9gGi4ScRkC40kA9eqSA+IFf65rqUt1mm1kIEhxO/KH5ORiTYM3N cUsKZxasidwT8G1R8BqYdwQDer0d3TiPNZ3ACRsg01hIlvQ7he/vh8GSiVVwsaNBi3PCXC e44gekOS9UX4PXOYTH4wxNvp23WUZ8hsLpmEC+CKxss/OfBdGaU5W1YlLf83Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3wTywt1y4uBXcevgsh7Zw18g29pmmegDj1xQTKLj1fQ=; b=LrskXFOhEHBKFFl7Uph+j0sIsb5jrrpckuCb42Oe3vNhg1MAiOotE1eYY53XgKpBwaFXKH Tdqoni8hWMSe7tFvD7O4ygYzsv6nmmJeXzF0jrufEKr1TP3yzhpCEuSOK4i2hrcA47MMQt 6ULnXiF8acYXobpmBaeHaqTypMGyYdIQx7XNd6ktcouboLLlE1+c2sZB9nIRX9ARsM0Jt0 suSCXmsFtv529araT83x6EXHvTYulcwp8RgUfIIFCPbjxK4VzPRNdY+h1PMmjAkYrueLuI 0Yo+etSEIKCazSGfkO3TDRUWFv+Td8ujwOe3Hv/MubMEePoDZm/UI5b6APnewQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372655; a=rsa-sha256; cv=none; b=Uip39DHZ1gvp+UEe2QPdZwlojhnLj1W2ZgvP/t2IfnAk2xwoU7I2N+pNYuSq643OCNO14S 8A7Slgza4ckH9sB5cSpWt9vTkEmuHni+FlQrPauYlL9oz9iNZPKW5Cr8wohfya40PAcnVb 099AdSCXU0khEu/PPAGaguBgoQDQNBqRRlA0XiEKgWoiPB103aw3Hhnqcj3ubrDnGBQ6Gi 9HfD05b/Cv9cg3y335jXaSx0NdHXSEkI+eUPEY83EEFLd8tbUS5g6D+tJuV3AB5CNOorDt J3DNwjPKUWgykA3q9K4W2Qe/r3YDUyd4cCeHFNLVWploDPhz0TLmggG7hNcTYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCG5C3GfNz12jN; Thu, 28 Aug 2025 09:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9HZ4P010812; Thu, 28 Aug 2025 09:17:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9HZgS010809; Thu, 28 Aug 2025 09:17:35 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:17:35 GMT Message-Id: <202508280917.57S9HZgS010809@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: 59088fa39159 - stable/13 - bce(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 59088fa3915920371ce21360217d3415ae0c1331 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=59088fa3915920371ce21360217d3415ae0c1331 commit 59088fa3915920371ce21360217d3415ae0c1331 Author: Gordon Bergling AuthorDate: 2025-08-25 08:45:32 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:15:37 +0000 bce(4): Fix a typo in a source code comment - s/firwmare/firmware/ (cherry picked from commit a848c85d27c8f8d6b8394a372417703a2969314c) --- sys/dev/bce/if_bce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index 721db7ff592b..83d04b5e2214 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -1233,7 +1233,7 @@ bce_attach(device_t dev) sc->bce_bc_ver[j++] = '.'; } - /* Check if any management firwmare is enabled. */ + /* Check if any management firmware is enabled. */ val = bce_shmem_rd(sc, BCE_PORT_FEATURE); if (val & BCE_PORT_FEATURE_ASF_ENABLED) { sc->bce_flags |= BCE_MFW_ENABLE_FLAG; From nobody Thu Aug 28 09:17:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCG5D72RLz65g7W; Thu, 28 Aug 2025 09:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCG5D4FZqz3Slv; Thu, 28 Aug 2025 09:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NPTTwiXaCGp0RIUusZaD15mD0+iqdfSUWzUDOJ/+fXM=; b=a5lC0nGjXZb/1Wu3EsjOpo4KwEcT7gu8yajiJG16IDZX1i6+Op/TVWyq3dwlZcHZKpV8lw nZ7o4IH9vxyEUlOycfSFq2qXVqYIgQ4YLdXOpCdlBfQna2Xp0XE5aYKukh9bJaMT0WNWJX k2z8YqzLR1fPjeopUK5cw4wlvymUQ9GxVK8A+VeD8ZWnRCnvJwGV/gTAeuK3aje/WYou1q iWpQ2Om9wOWdfyxdsqhuT8+Zn9HTujrdcToZmqMY5q3gyyv+q/XKtc0mHyAAnAil1eQBpY YcgNtwh3NJ1evjrCzS4vtcHS8w+XfOWAzOPUfmDAnYsTpP9QwkFimGI6aGXOXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756372656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NPTTwiXaCGp0RIUusZaD15mD0+iqdfSUWzUDOJ/+fXM=; b=kmgTO78aSUq+8c4pb0cxmsKOWYcKDU1APsP3CRQZ+T/pvj5CefYRvta4NzRD+qHbdT0ksf mRpPYEe7P6KMe/bYgkgvxiz4tDPpKgnXuDuT8O5eu4ik9KvL0eNjh1iP7r1A5hEEXrv5Dk 3sosRiDjt1WKep308A0wEqXraUWws2Ielvbk8cHpxDMEawA4vrm4VkKJJSq2NermaQXjBW tELoXFlo4XRMIaLZzyqXUGT4O0ol8QKJqiGJj7C5C9wuUjuMdxGWmZ2o7n0318IuBxOCkG PQBS7GnBrRVqCb9mg7nntPTWZi2svKC8n5kl9+OiuH7NxKvfUXZpGk61+gwM1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756372656; a=rsa-sha256; cv=none; b=Vd323DEuQx43a14pT5Qt95VGxa/ftKli+h6DkEVpah8sDdh9r+nFuxZGXA45pM+K2rosu6 HojgIy7aVyQAu/Wy07ZT9N/eMYSly4T/bZsNSkIgGhMxJCmKVnb3L0mUf1XYt0n0nft9P3 9Q7NZgLL6ZcATY6e9UutcEm6FW6TXN/8OB2EQR9foIwdGV1YLeAlNLgQZizksEE1TNyHoc orw0VpGctqM6kfn8sBzv8cuEHcFNwOViuPFoByFQ9XDkPeK375VGddCfe0MO/MpZL02tCS 1FudQqfAqhzi2sR+aqG96DAwQez8JoDK6Wg7+eAm8+sKInkpZ/3XJgmBXJ1l+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 4cCG5D3m5cz1380; Thu, 28 Aug 2025 09:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57S9HaEZ010855; Thu, 28 Aug 2025 09:17:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57S9HaWS010852; Thu, 28 Aug 2025 09:17:36 GMT (envelope-from git) Date: Thu, 28 Aug 2025 09:17:36 GMT Message-Id: <202508280917.57S9HaWS010852@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: 7cad1e5478d7 - stable/13 - mwl(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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7cad1e5478d7c4f8116235dc7550e4309561cc78 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7cad1e5478d7c4f8116235dc7550e4309561cc78 commit 7cad1e5478d7c4f8116235dc7550e4309561cc78 Author: Gordon Bergling AuthorDate: 2025-08-25 08:44:41 +0000 Commit: Gordon Bergling CommitDate: 2025-08-28 09:15:51 +0000 mwl(4): Fix a typo in a source code comment - s/firwmare/firmware/ (cherry picked from commit 4f768b8acdf818f08f4f0124c1df418127720266) --- sys/dev/mwl/if_mwl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c index 5d726cbb18fe..771d2417fc3a 100644 --- a/sys/dev/mwl/if_mwl.c +++ b/sys/dev/mwl/if_mwl.c @@ -1801,7 +1801,7 @@ mwl_updateslot(struct ieee80211com *ic) return; /* - * Calculate the ERP flags. The firwmare will use + * Calculate the ERP flags. The firmware will use * this to carry out the appropriate measures. */ prot = 0; From nobody Thu Aug 28 13:55:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCNFk0V8Mz663WR; Thu, 28 Aug 2025 13:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCNFj5BGNz3vYY; Thu, 28 Aug 2025 13:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756389321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jW4TB0tOXbdj2txrN88SNAbkJ/YlcYOBf7R9B01hEvY=; b=HX8Q1Zs94s70jiG3wpNWqTAzqZQ9vRL28uHF1BWVFE+Xn9/HtFpYKrNkGVKiqwQgjpxxM5 Og/H/74PJc0u3pBZbm3LB6oxTNuROUWifcdIhSBPzzHy3o4NHC5P9+7BZtY4Ft8cKxHbme SSRn2LTYXCA83b2+X0gzqmNxh+Onz5VXBfEJaAq9TXn4MW74pS/uSrHcMRJ3ePvHl3ts5/ 4KyhgOpYZQwqGbbpkp6W15vmesnjcIDigmFfOi0aNSpALmjiJtwD9/Omgcs1DNardBl/g4 nJdJFaa2b2XIlI/0lR3kEA9uJDvHv3DpzwbeLcsg8x/N2PmC9KjBOd+psDAR/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756389321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jW4TB0tOXbdj2txrN88SNAbkJ/YlcYOBf7R9B01hEvY=; b=OrVlzEuSkBYgk4U64hEoeZZxGxRJIZ12JJ+EfrY3ka7quRhyo25oGnFAkPnjlNP1gSX8vD 7qNKdBbRwycpsVaYWUdQ2pZv9TMplZ5g2xasHZ8Irtpsq+50qgb/6Q+bhB9F04LdgLU3Bm T1SJM7RJBrXk7ONtIH7g2HomIVbslwQOHz3dPSLIsewj4J1WNE3aPF/R9TzTkZGIFDOS/r /Pc8sHukohgeHAVmbH1ozj6Nf11UjSvIv3EAzX1ADAUaEkUMYMNCYhWvaz4D/5iI4H7yLX JaU9vYeviXJgBQRPZ6yjd+aHlupwD1noDKTkl87jXiH5sOgCO+zZn62AkFq39Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756389321; a=rsa-sha256; cv=none; b=limIIWjbJSM7FdeFgS7cG/VbNZtQJ+qBZ435jgwIgDwf53Eux0m9Z03sx9E7bOi+p5blu/ oV8MNomNslmB2BFBvVC183EDUZ2duo8OGdOXYEszDEtyU1se/mU9AJIirRN0IIunHLgcE4 RE50h3zXdEBNOU7f6PdZ8iZW7f8afzV8HtZ2b5esUzaeavpDwPx1P4zsgeOeRDgrOuizP6 pzVO5NxxIBlW9JdGpLdA00tX036TX1w/dqNDY4zfC090545bsJuhnfMMvEbROCIyDzslo1 2hsZoqQxoIbkl3MpuWBunMod9Qb3T3tF/OdqgLhcr3sfJDnMowcusSs1hoP9cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCNFj4hZQz1BXl; Thu, 28 Aug 2025 13:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57SDtLxq040547; Thu, 28 Aug 2025 13:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57SDtLfW040544; Thu, 28 Aug 2025 13:55:21 GMT (envelope-from git) Date: Thu, 28 Aug 2025 13:55:21 GMT Message-Id: <202508281355.57SDtLfW040544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: c73d3c6c960b - stable/14 - mbuf: improve KASSERT(9) falure messages in the m_apply() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c73d3c6c960bef6222fa03a1119df0bb5380a611 Auto-Submitted: auto-generated The branch stable/14 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=c73d3c6c960bef6222fa03a1119df0bb5380a611 commit c73d3c6c960bef6222fa03a1119df0bb5380a611 Author: Maxim Sobolev AuthorDate: 2024-09-10 01:51:05 +0000 Commit: Maxim Sobolev CommitDate: 2025-08-28 13:54:34 +0000 mbuf: improve KASSERT(9) falure messages in the m_apply() - Make less ambiguous; - extend to provide more context for post-mortem. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43776 MFC after: 2 weeks (cherry picked from commit a43fb3653b35ab88b72e1277dccc26328363cdb7) --- sys/kern/uipc_mbuf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index b10e524e6e4b..1ce049014711 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1375,14 +1375,16 @@ m_apply(struct mbuf *m, int off, int len, KASSERT(off >= 0, ("m_apply, negative off %d", off)); KASSERT(len >= 0, ("m_apply, negative len %d", len)); while (off > 0) { - KASSERT(m != NULL, ("m_apply, offset > size of mbuf chain")); + KASSERT(m != NULL, ("m_apply, offset > size of mbuf chain " + "(%d extra)", off)); if (off < m->m_len) break; off -= m->m_len; m = m->m_next; } while (len > 0) { - KASSERT(m != NULL, ("m_apply, offset > size of mbuf chain")); + KASSERT(m != NULL, ("m_apply, length > size of mbuf chain " + "(%d extra)", len)); count = min(m->m_len - off, len); rval = m_apply_one(m, off, count, f, arg); if (rval) From nobody Thu Aug 28 13:55:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCNFl15g7z663vK; Thu, 28 Aug 2025 13:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCNFk61t5z3vvp; Thu, 28 Aug 2025 13:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756389322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=48N0bKqk03tq95zbeviugH2M5UhHhI1n1VNcHHUQPpQ=; b=j9JmYpQY8PXnaOiEhMvvHHwx3RPZdo63wAUB5t3/by0hCjS5oHlAH9EOrTMXfzB1DPKgWM +alwmYB/2uHPZfZ0Z8yDDyrTDxxtFDM7jDX/UlXIa4geQrIKc1vvqSPBO6jTjQvECVZcbz mmMSK/XPujYwJO4JKcGVk0aA/pZkg/IPTG4k28I6knGX4c/0/uaGDuz0WEv8Q+8QhbB0LB SbI21Z1oCWAX0XQNrJc1lbxsltgOJxfqMbvLDBz8LM6KbYmgpynsOPTB2+E/76gXIe3IOD XwG0wzXfM9u3bO67x9YcXx+H4J4cvdp2ZkxlcQI9ZOqML/jyBUzHQ5Yy2pFFOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756389322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=48N0bKqk03tq95zbeviugH2M5UhHhI1n1VNcHHUQPpQ=; b=KDIi9NY6/UAocpg/vf44RSerHzKLdjAOd8te92a5jY0hK0D3BzhTn9be/VYhLqzVEm2Toz A+DIQ7O4ko6BUjHMhZIlIWRJKO8IRwtqVC0SgErIyGNWksxT7EVHgDMK8iywCbpUTOzgh8 d6CcwXrj3zNp9hxr5TrpVaXp6AQVjSxN3WUOncKd6DwpTk6Ji7DFQhOgFiCnZJOMF38M8N gxsg50fzcRwqjMa+ZDOZKChtd2WyhA0VH3EI3PpuYINuHjjduejAp09kzvOXe94M/ndQCm swVynYBHqheC42+bwa+q5jBW2XHr6qUYcsjs+Dmwptp1ZrDk9rCPVgXh9EQ2Lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756389322; a=rsa-sha256; cv=none; b=ZHu5SXcFndiWkSHcJbT2ZpLKIPzuwW3a+L4ZoAq65KXITiTUTZn0OnSVL1pNujxql6H1vg 8E4Y/IQ7inR+3c+ggy9jqM8bVhLWkw8l8BVteurSe2IQjLv/FoyKe7YI09wG6s4a1o1ZK6 s20oIssUh2HOJJnFAyxFwwd6lpJJXKEShAaQhTiYnH7CuHICzThvvmWlveBQRheQr5FY5Y 3aQauSgDyMYeAZx6srSehA8aXNlDVo+OSwf26Inri7jDjwYOK9ay3PTrn4z/K/aIoGy6BW oc7ya+Wsv8V0imDhutCMKwuzFBpbfiubUWLH5YYvtAwXSiEbalZ8ZcccdK98Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCNFk5QNVz1B7V; Thu, 28 Aug 2025 13:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57SDtMKn040580; Thu, 28 Aug 2025 13:55:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57SDtMPF040577; Thu, 28 Aug 2025 13:55:22 GMT (envelope-from git) Date: Thu, 28 Aug 2025 13:55:22 GMT Message-Id: <202508281355.57SDtMPF040577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: 05fe8c88e1ce - stable/14 - libc: lib_malloc_aligned(): add a missing NULL check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 05fe8c88e1ce7904a14997a5e5e253d92fbe3e42 Auto-Submitted: auto-generated The branch stable/14 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=05fe8c88e1ce7904a14997a5e5e253d92fbe3e42 commit 05fe8c88e1ce7904a14997a5e5e253d92fbe3e42 Author: Maxim Sobolev AuthorDate: 2024-12-08 19:08:43 +0000 Commit: Maxim Sobolev CommitDate: 2025-08-28 13:54:34 +0000 libc: lib_malloc_aligned(): add a missing NULL check For some reason return value of the __je_bootstrap_malloc() is not checked and then de-referenced few lines below, causing a SEGV if an early allocation fails. MFC after: 1 month (cherry picked from commit 1e99be5dcda222d47a77715e190a381a14f46ece) --- lib/libc/gen/tls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c index 3c1a5472c0e5..30b4fc583c98 100644 --- a/lib/libc/gen/tls.c +++ b/lib/libc/gen/tls.c @@ -113,6 +113,8 @@ libc_malloc_aligned(size_t size, size_t align) align = sizeof(void *); mem = __je_bootstrap_malloc(size + sizeof(void *) + align - 1); + if (mem == NULL) + return (NULL); res = (void *)roundup2((uintptr_t)mem + sizeof(void *), align); *(void **)((uintptr_t)res - sizeof(void *)) = mem; return (res); From nobody Fri Aug 29 03:15:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCk0S2TqPz65vnC; Fri, 29 Aug 2025 03:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCk0S2BDfz3Y2f; Fri, 29 Aug 2025 03:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XWXkGce6Hp+HHMCWAKXgNYoXx/425eXQvZzxfHQe76c=; b=xb31o1G/xG3Pcl3lHDJGdgfryv4Dt2KoL0VaM59UZ89ViFRtKNOMqFjjBPvse91V6+jlvE GK8x5/MHMwpi972iYadY32p6k3VyY4LV5zVRM2gtEeumzDOp7saph7pMXSg4ogMQ2JaMLz 0bva+eIQDqhhikz3PrNnQR8MnCnfU4DLJ4/PZtsRzgSnTT97c9CnsNjQiHhdZgLbhFD82j g5hy+HNV5+yaBSSBizpUKc2FybHMMozrvu78E1/KiwUF1ZgwhSGLQfodaqYlOqTKjpPYkH DIJT2gOBMMK73CkcM5Lh1tpMsoj6UJn3Klhq7GfcP+FrmUT43X3ZC0HYVYckaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XWXkGce6Hp+HHMCWAKXgNYoXx/425eXQvZzxfHQe76c=; b=ZJBgUjThNUIhaS8ibslNHU6J3F9yEaxSTTu7GsjYxXW25OBeMHmuVtlfU9jcZ09Vm2tFGq 5DEMBbY7V3HfmoUxQhPlMGcUEBDuvCW25xD2Z07VBwerau4awQRjSZygP/lB4ywB27Jtbd IcUl/YzWHlMv1N9BVvtfNePI2nF+5UarBbp4wozW9FdTIUY3IoqBAQ63W8epwyETgmb6pU PbURSDiPIWETct/kwjZEt0J0aehKqaLSS0+8iiKLI5PDwkt/U48TbzxKYkWyEzUpNvic/O of+3aFzahdJqLv6++Di28dPPw4MFM4mKf3DQJWyH0OpgR0++914Kq+G2A2hliQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756437304; a=rsa-sha256; cv=none; b=QTUIm7cO8Xq0hGIi432Lz7q+rFVOiL6+Q/PyJCePUw6OfSfVCf0WmH9Sxz6urHD1Ga2Cwk JLhiVynLz6IZ7a4JGBd73K81bgrUN1IGg5zGJ38+C/gIcnsi3fFwnOHeYh8KWv5E437rln 6gAOtlKow+Xg8F16cjJYp7500MU8wr8d9iyl+eY/4a7jCylEn/UdIf7GbyMYYneRnOSl7P yv5njegzp+2s/yCu4BSjzh8svvxwa6H/Of6+w/NRqT1R0bx1vnNDWUYOFtn4ZoRtnqkMzY Wy6sv8jIh27bOgB4jV89d9jkJmrhGIwb8XA5uVL4bsOutoqqix54tZtfhZem6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCk0S1bLDz6Np; Fri, 29 Aug 2025 03:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57T3F41J047780; Fri, 29 Aug 2025 03:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57T3F4BK047777; Fri, 29 Aug 2025 03:15:04 GMT (envelope-from git) Date: Fri, 29 Aug 2025 03:15:04 GMT Message-Id: <202508290315.57T3F4BK047777@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: 4612f5f2d233 - stable/14 - vfs: Introduce VN_ISDEV() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4612f5f2d23348c8a861834d4c9f98b0a2742f56 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4612f5f2d23348c8a861834d4c9f98b0a2742f56 commit 4612f5f2d23348c8a861834d4c9f98b0a2742f56 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-17 17:08:10 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-28 18:14:23 +0000 vfs: Introduce VN_ISDEV() macro (cherry picked from commit 567e6250c003eeb251b4bc8dbe60d2adabab2988) --- lib/libprocstat/libprocstat.c | 3 +-- sys/fs/cd9660/cd9660_vnops.c | 12 ++++++------ sys/fs/ext2fs/ext2_vnops.c | 14 +++++++------- sys/fs/fuse/fuse_vnops.c | 2 +- sys/fs/nfsclient/nfs_clvnops.c | 2 +- sys/fs/p9fs/p9fs_vnops.c | 2 +- sys/fs/tarfs/tarfs_vnops.c | 5 ++--- sys/fs/tmpfs/tmpfs_subr.c | 2 +- sys/fs/tmpfs/tmpfs_vnops.c | 17 +++++++---------- sys/kern/vfs_bio.c | 2 +- sys/kern/vfs_syscalls.c | 2 +- sys/sys/param.h | 2 +- sys/sys/vnode.h | 9 +++++++++ sys/ufs/ffs/ffs_vnops.c | 12 ++++++------ sys/ufs/ufs/ufs_vnops.c | 16 ++++++---------- sys/vm/vnode_pager.c | 3 +-- 16 files changed, 52 insertions(+), 53 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index bd314f481e32..fa1c943bd931 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -1327,8 +1327,7 @@ procstat_get_vnode_info_kvm(kvm_t *kd, struct filestat *fst, return (1); } vn->vn_mntdir = getmnton(kd, vnode.v_mount); - if ((vnode.v_type == VBLK || vnode.v_type == VCHR) && - vnode.v_rdev != NULL){ + if (VTYPE_ISDEV(vnode.v_type) && vnode.v_rdev != NULL) { vn->vn_dev = dev2udev(kd, vnode.v_rdev); (void)kdevtoname(kd, vnode.v_rdev, vn->vn_devname); } else { diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index ddc5fa8b0f38..95ca535a225c 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -127,7 +127,7 @@ cd9660_access(struct vop_access_args *ap) uid_t uid; gid_t gid; - if (vp->v_type == VCHR || vp->v_type == VBLK) + if (VN_ISDEV(vp)) return (EOPNOTSUPP); /* @@ -165,7 +165,7 @@ cd9660_open(struct vop_open_args *ap) struct vnode *vp = ap->a_vp; struct iso_node *ip = VTOI(vp); - if (vp->v_type == VCHR || vp->v_type == VBLK) + if (VN_ISDEV(vp)) return (EOPNOTSUPP); vnode_create_vobject(vp, ip->i_size, ap->a_td); @@ -245,7 +245,7 @@ cd9660_ioctl(struct vop_ioctl_args *ap) VOP_UNLOCK(vp); return (EBADF); } - if (vp->v_type == VCHR || vp->v_type == VBLK) { + if (VN_ISDEV(vp)) { VOP_UNLOCK(vp); return (EOPNOTSUPP); } @@ -283,7 +283,7 @@ cd9660_read(struct vop_read_args *ap) int seqcount; long size, n, on; - if (vp->v_type == VCHR || vp->v_type == VBLK) + if (VN_ISDEV(vp)) return (EOPNOTSUPP); seqcount = ap->a_ioflag >> IO_SEQSHIFT; @@ -714,7 +714,7 @@ cd9660_strategy(struct vop_strategy_args *ap) struct bufobj *bo; ip = VTOI(vp); - if (vp->v_type == VBLK || vp->v_type == VCHR) + if (VN_ISDEV(vp)) panic("cd9660_strategy: spec"); if (bp->b_blkno == bp->b_lblkno) { bp->b_blkno = (ip->iso_start + bp->b_lblkno) << @@ -821,7 +821,7 @@ cd9660_getpages(struct vop_getpages_args *ap) struct vnode *vp; vp = ap->a_vp; - if (vp->v_type == VCHR || vp->v_type == VBLK) + if (VN_ISDEV(vp)) return (EOPNOTSUPP); if (use_buf_pager) diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c index 79d50a6a64cb..036b1fe0d21c 100644 --- a/sys/fs/ext2fs/ext2_vnops.c +++ b/sys/fs/ext2fs/ext2_vnops.c @@ -225,7 +225,7 @@ ext2_itimes_locked(struct vnode *vp) ip = VTOI(vp); if ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_UPDATE)) == 0) return; - if ((vp->v_type == VBLK || vp->v_type == VCHR)) + if (VN_ISDEV(vp)) ip->i_flag |= IN_LAZYMOD; else ip->i_flag |= IN_MODIFIED; @@ -279,7 +279,7 @@ static int ext2_open(struct vop_open_args *ap) { - if (ap->a_vp->v_type == VBLK || ap->a_vp->v_type == VCHR) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); /* @@ -1574,7 +1574,7 @@ ext2_strategy(struct vop_strategy_args *ap) daddr_t blkno; int error; - if (vp->v_type == VBLK || vp->v_type == VCHR) + if (VN_ISDEV(vp)) panic("ext2_strategy: spec"); if (bp->b_blkno == bp->b_lblkno) { if (VTOI(ap->a_vp)->i_flag & IN_E4EXTENTS) @@ -1736,7 +1736,7 @@ ext2_deleteextattr(struct vop_deleteextattr_args *ap) if (!EXT2_HAS_COMPAT_FEATURE(ip->i_e2fs, EXT2F_COMPAT_EXT_ATTR)) return (EOPNOTSUPP); - if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, @@ -1774,7 +1774,7 @@ ext2_getextattr(struct vop_getextattr_args *ap) if (!EXT2_HAS_COMPAT_FEATURE(ip->i_e2fs, EXT2F_COMPAT_EXT_ATTR)) return (EOPNOTSUPP); - if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, @@ -1817,7 +1817,7 @@ ext2_listextattr(struct vop_listextattr_args *ap) if (!EXT2_HAS_COMPAT_FEATURE(ip->i_e2fs, EXT2F_COMPAT_EXT_ATTR)) return (EOPNOTSUPP); - if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, @@ -1858,7 +1858,7 @@ ext2_setextattr(struct vop_setextattr_args *ap) if (!EXT2_HAS_COMPAT_FEATURE(ip->i_e2fs, EXT2F_COMPAT_EXT_ATTR)) return (EOPNOTSUPP); - if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index d4809b647143..52e62f121808 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -1742,7 +1742,7 @@ fuse_vnop_open(struct vop_open_args *ap) if (fuse_isdeadfs(vp)) return ENXIO; - if (vp->v_type == VCHR || vp->v_type == VBLK || vp->v_type == VFIFO) + if (VN_ISDEV(vp) || vp->v_type == VFIFO) return (EOPNOTSUPP); if ((a_mode & (FREAD | FWRITE | FEXEC)) == 0) return EINVAL; diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index a0bb781e5e5d..ae69d499c425 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1655,7 +1655,7 @@ nfs_mknodrpc(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, int error = 0, attrflag, dattrflag; u_int32_t rdev; - if (vap->va_type == VCHR || vap->va_type == VBLK) + if (VATTR_ISDEV(vap)) rdev = vap->va_rdev; else if (vap->va_type == VFIFO || vap->va_type == VSOCK) rdev = 0xffffffff; diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index 227e2b93883e..acb73973d93b 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -1326,7 +1326,7 @@ p9fs_read(struct vop_read_args *ap) np = P9FS_VTON(vp); error = 0; - if (vp->v_type == VCHR || vp->v_type == VBLK) + if (VN_ISDEV(vp)) return (EOPNOTSUPP); if (vp->v_type != VREG) return (EISDIR); diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c index afb8e05f5929..acf18de5ab51 100644 --- a/sys/fs/tarfs/tarfs_vnops.c +++ b/sys/fs/tarfs/tarfs_vnops.c @@ -208,8 +208,7 @@ tarfs_getattr(struct vop_getattr_args *ap) vap->va_birthtime = tnp->birthtime; vap->va_gen = tnp->gen; vap->va_flags = tnp->flags; - vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? - tnp->rdev : NODEV; + vap->va_rdev = VN_ISDEV(vp) ? tnp->rdev : NODEV; vap->va_bytes = round_page(tnp->physize); vap->va_filerev = 0; @@ -515,7 +514,7 @@ tarfs_read(struct vop_read_args *ap) uiop = ap->a_uio; vp = ap->a_vp; - if (vp->v_type == VCHR || vp->v_type == VBLK) + if (VN_ISDEV(vp)) return (EOPNOTSUPP); if (vp->v_type != VREG) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index de2c342e41c4..bca6bf911eb1 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -549,7 +549,7 @@ tmpfs_alloc_node(struct mount *mp, struct tmpfs_mount *tmp, __enum_uint8(vtype) MPASS(IMPLIES(tmp->tm_root == NULL, parent == NULL && type == VDIR)); MPASS((type == VLNK) ^ (target == NULL)); - MPASS((type == VBLK || type == VCHR) ^ (rdev == VNOVAL)); + MPASS(VTYPE_ISDEV(type) ^ (rdev == VNOVAL)); if (tmp->tm_nodes_inuse >= tmp->tm_nodes_max) return (ENOSPC); diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index f875c6387673..813ffe25a973 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -280,8 +280,7 @@ tmpfs_mknod(struct vop_mknod_args *v) struct componentname *cnp = v->a_cnp; struct vattr *vap = v->a_vap; - if (vap->va_type != VBLK && vap->va_type != VCHR && - vap->va_type != VFIFO) + if (!VATTR_ISDEV(vap) && vap->va_type != VFIFO) return (EINVAL); return (tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL)); @@ -462,8 +461,7 @@ tmpfs_stat(struct vop_stat_args *v) sb->st_nlink = node->tn_links; sb->st_uid = node->tn_uid; sb->st_gid = node->tn_gid; - sb->st_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? - node->tn_rdev : NODEV; + sb->st_rdev = VN_ISDEV(vp) ? node->tn_rdev : NODEV; sb->st_size = node->tn_size; sb->st_atim.tv_sec = node->tn_atime.tv_sec; sb->st_atim.tv_nsec = node->tn_atime.tv_nsec; @@ -521,8 +519,7 @@ tmpfs_getattr(struct vop_getattr_args *v) vap->va_birthtime = node->tn_birthtime; vap->va_gen = node->tn_gen; vap->va_flags = node->tn_flags; - vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? - node->tn_rdev : NODEV; + vap->va_rdev = VN_ISDEV(vp) ? node->tn_rdev : NODEV; if (vp->v_type == VREG) { #ifdef __ILP32__ vm_object_t obj = node->tn_reg.tn_aobj; @@ -1886,7 +1883,7 @@ tmpfs_deleteextattr(struct vop_deleteextattr_args *ap) node = VP_TO_TMPFS_NODE(vp); tmp = VFS_TO_TMPFS(vp->v_mount); - if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, ap->a_cred, ap->a_td, VWRITE); @@ -1924,7 +1921,7 @@ tmpfs_getextattr(struct vop_getextattr_args *ap) int error; node = VP_TO_TMPFS_NODE(vp); - if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, ap->a_cred, ap->a_td, VREAD); @@ -1961,7 +1958,7 @@ tmpfs_listextattr(struct vop_listextattr_args *ap) int error; node = VP_TO_TMPFS_NODE(vp); - if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, ap->a_cred, ap->a_td, VREAD); @@ -2005,7 +2002,7 @@ tmpfs_setextattr(struct vop_setextattr_args *ap) tmp = VFS_TO_TMPFS(vp->v_mount); attr_size = ap->a_uio->uio_resid; diff = 0; - if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, ap->a_cred, ap->a_td, VWRITE); diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 92d850381e06..62d70c04f6ea 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -5145,7 +5145,7 @@ bufstrategy(struct bufobj *bo, struct buf *bp) vp = bp->b_vp; KASSERT(vp == bo->bo_private, ("Inconsistent vnode bufstrategy")); - KASSERT(vp->v_type != VCHR && vp->v_type != VBLK, + KASSERT(!VN_ISDEV(vp), ("Wrong vnode in bufstrategy(bp=%p, vp=%p)", bp, vp)); i = VOP_STRATEGY(vp, bp); KASSERT(i == 0, ("VOP_STRATEGY failed bp=%p vp=%p", bp, bp->b_vp)); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index ded3a87e7f8b..9c5c5b9dfa80 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -2755,7 +2755,7 @@ setfflags(struct thread *td, struct vnode *vp, u_long flags) * if they are allowed to set flags and programs assume that * chown can't fail when done as root. */ - if (vp->v_type == VCHR || vp->v_type == VBLK) { + if (VN_ISDEV(vp)) { error = priv_check(td, PRIV_VFS_CHFLAGS_DEV); if (error != 0) return (error); diff --git a/sys/sys/param.h b/sys/sys/param.h index d3863d670431..26f201a21715 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -76,7 +76,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1403505 +#define __FreeBSD_version 1403506 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 22839659f047..bc98c2155cb7 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -69,6 +69,11 @@ __enum_uint8_decl(vtype) { VLASTTYPE = VMARKER, }; +/* + * We frequently need to test is something is a device node. + */ +#define VTYPE_ISDEV(vtype) ((vtype) == VCHR || (vtype) == VBLK) + __enum_uint8_decl(vstate) { VSTATE_UNINITIALIZED, VSTATE_CONSTRUCTED, @@ -199,6 +204,8 @@ struct vnode { int v_seqc_users; /* i modifications pending */ }; +#define VN_ISDEV(vp) VTYPE_ISDEV((vp)->v_type) + #ifndef DEBUG_LOCKS #ifdef _LP64 /* @@ -304,6 +311,8 @@ struct vattr { long va_spare; /* remain quad aligned */ }; +#define VATTR_ISDEV(vap) VTYPE_ISDEV((vap)->va_type) + /* * Flags for va_vaflags. */ diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index bf90387ccd59..7eddb5a10861 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -1553,7 +1553,7 @@ ffs_openextattr( } */ *ap) { - if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); return (ffs_open_ea(ap->a_vp, ap->a_cred, ap->a_td)); @@ -1575,7 +1575,7 @@ ffs_closeextattr( struct vnode *vp; vp = ap->a_vp; - if (vp->v_type == VCHR || vp->v_type == VBLK) + if (VN_ISDEV(vp)) return (EOPNOTSUPP); if (ap->a_commit && (vp->v_mount->mnt_flag & MNT_RDONLY) != 0) return (EROFS); @@ -1613,7 +1613,7 @@ ffs_deleteextattr( vp = ap->a_vp; ip = VTOI(vp); - if (vp->v_type == VCHR || vp->v_type == VBLK) + if (VN_ISDEV(vp)) return (EOPNOTSUPP); if (strlen(ap->a_name) == 0) return (EINVAL); @@ -1691,7 +1691,7 @@ ffs_getextattr( ip = VTOI(ap->a_vp); - if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, @@ -1741,7 +1741,7 @@ ffs_listextattr( ip = VTOI(ap->a_vp); - if (ap->a_vp->v_type == VCHR || ap->a_vp->v_type == VBLK) + if (VN_ISDEV(ap->a_vp)) return (EOPNOTSUPP); error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, @@ -1806,7 +1806,7 @@ ffs_setextattr( ip = VTOI(vp); fs = ITOFS(ip); - if (vp->v_type == VCHR || vp->v_type == VBLK) + if (VN_ISDEV(vp)) return (EOPNOTSUPP); if (strlen(ap->a_name) == 0) return (EINVAL); diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index d9e9397631f4..4dfd327f1494 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -158,7 +158,7 @@ ufs_itimes_locked(struct vnode *vp) if ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_UPDATE)) == 0) return; - if ((vp->v_type == VBLK || vp->v_type == VCHR) && !DOINGSOFTDEP(vp)) + if (VN_ISDEV(vp) && !DOINGSOFTDEP(vp)) UFS_INODE_SET_FLAG(ip, IN_LAZYMOD); else if (((vp->v_mount->mnt_kern_flag & (MNTK_SUSPENDED | MNTK_SUSPEND)) == 0) || @@ -321,7 +321,7 @@ ufs_open(struct vop_open_args *ap) struct vnode *vp = ap->a_vp; struct inode *ip; - if (vp->v_type == VCHR || vp->v_type == VBLK) + if (VN_ISDEV(vp)) return (EOPNOTSUPP); ip = VTOI(vp); @@ -542,8 +542,7 @@ ufs_stat(struct vop_stat_args *ap) sb->st_uid = ip->i_uid; sb->st_gid = ip->i_gid; if (I_IS_UFS1(ip)) { - sb->st_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? - ip->i_din1->di_rdev : NODEV; + sb->st_rdev = VN_ISDEV(vp) ? ip->i_din1->di_rdev : NODEV; sb->st_size = ip->i_din1->di_size; sb->st_mtim.tv_sec = ip->i_din1->di_mtime; sb->st_mtim.tv_nsec = ip->i_din1->di_mtimensec; @@ -554,8 +553,7 @@ ufs_stat(struct vop_stat_args *ap) sb->st_blocks = dbtob((uint64_t)ip->i_din1->di_blocks) / S_BLKSIZE; sb->st_filerev = ip->i_din1->di_modrev; } else { - sb->st_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? - ip->i_din2->di_rdev : NODEV; + sb->st_rdev = VN_ISDEV(vp) ? ip->i_din2->di_rdev : NODEV; sb->st_size = ip->i_din2->di_size; sb->st_mtim.tv_sec = ip->i_din2->di_mtime; sb->st_mtim.tv_nsec = ip->i_din2->di_mtimensec; @@ -607,8 +605,7 @@ ufs_getattr( vap->va_uid = ip->i_uid; vap->va_gid = ip->i_gid; if (I_IS_UFS1(ip)) { - vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? - ip->i_din1->di_rdev : NODEV; + vap->va_rdev = VN_ISDEV(vp) ? ip->i_din1->di_rdev : NODEV; vap->va_size = ip->i_din1->di_size; vap->va_mtime.tv_sec = ip->i_din1->di_mtime; vap->va_mtime.tv_nsec = ip->i_din1->di_mtimensec; @@ -617,8 +614,7 @@ ufs_getattr( vap->va_bytes = dbtob((uint64_t)ip->i_din1->di_blocks); vap->va_filerev = ip->i_din1->di_modrev; } else { - vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ? - ip->i_din2->di_rdev : NODEV; + vap->va_rdev = VN_ISDEV(vp) ? ip->i_din2->di_rdev : NODEV; vap->va_size = ip->i_din2->di_size; vap->va_mtime.tv_sec = ip->i_din2->di_mtime; vap->va_mtime.tv_nsec = ip->i_din2->di_mtimensec; diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 63ca629cc598..c3e1e995e011 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -886,8 +886,7 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int count, int error, before, after, rbehind, rahead, poff, i; int bytecount, secmask; - KASSERT(vp->v_type != VCHR && vp->v_type != VBLK, - ("%s does not support devices", __func__)); + KASSERT(!VN_ISDEV(vp), ("%s does not support devices", __func__)); if (VN_IS_DOOMED(vp)) return (VM_PAGER_BAD); From nobody Fri Aug 29 03:15:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCk0T3jYGz65vlJ; Fri, 29 Aug 2025 03:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCk0T2lXjz3Xnk; Fri, 29 Aug 2025 03:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NVJUDnDQNNkrHqIKmLeIrxdHcDKyacC37n0P4+szLTY=; b=ZRXW8pLzQGL1EAZ/oP+y2d7aZSZzpp/9oCCig7Yc0uj3erdUXqcITFVzqXPZkozUrnD7s9 ezqDac+1Bv5fRP1BBzmXvzUa9wZ5A+p16xAH/5EJZwWKHtpnWRjYWqt9f4xHU/CFXePDIk mgzynX2+PepU9o8PEZsTlHv9Az8cM1GHaSmpNafW3TIzQ7Uj3qUAkl4WntsKqSQ14f+gf9 Aca/jrI59UzFLUrDcAqwut/gELdmAqs5Sbtd0VJlQTKkr1RGY06ceh1Bk3rnWPm4Q0sKd6 BTCR4UgdhrCbYIkFH29TKsCa1WB4EzcnlzEgpyHEusHP+Tp8NGHgDrwB1YIdnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NVJUDnDQNNkrHqIKmLeIrxdHcDKyacC37n0P4+szLTY=; b=Qtf0Utkl1y2o6DmBZ/pey8Sz1YdHf9QgDra2jG0/EEm3An2l42M8WS/ZSWs1nLZ/6Ozd8W ntxgcG2FKdjapzIPHilGunB/wXly2fw/C5XZcgDI2HNYLbhSK6pHarDrwraMY394TYx0h7 R3UORVzZf2c+YHKVQH+GnR7No1K7b4tBhKeRcxNeksApfb2dOtimYpS/K6tz/M/oE25Duw akPSokg90AnU5rl/4jc2zLNNs0heLsWm1mAYYAaR+FvWcnvqowvIekgzoADxZ/SZRmjfpp sJNK3vtDqMrf7JHYX2BBColGFvGv4kKHIpYtEB4jbwkNlwj1gnszzP4OJMjdbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756437305; a=rsa-sha256; cv=none; b=bLgtYTdsY798ZgJpq/Njy6mOQJo1jvS1kRUuPloT82WrnVHJrb8bf9ZigftQ0xZ/Vo2UTb MztvrqyP9kxx52P5NLIpXi5CXk+PXcgtBoSpbA1pBtgvp/vZHo2icknAnmjs1rJKEfef4p fms5vi+ks3wrWXdwAFuQ4leV165Vg0lRdsAf8Wl1LXJtjdQdwPAu+y1/QqMSLzO7OhE0Ot HzowsKglBfpC9mo8xT891yhmp/1MQEmz6ziIKg5vxGQAo6CBTcUTz01a+R9bsakz9XOQQf OKtyPZTIrfFIuVZVkFaHD+Ahg1rhErBUTU4hORdHHohQ/DurZpC/stU4GYVXDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCk0T2KYrz69Y; Fri, 29 Aug 2025 03:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57T3F5i0047813; Fri, 29 Aug 2025 03:15:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57T3F5PQ047810; Fri, 29 Aug 2025 03:15:05 GMT (envelope-from git) Date: Fri, 29 Aug 2025 03:15:05 GMT Message-Id: <202508290315.57T3F5PQ047810@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: f47e963c432f - stable/14 - cd9660: va_rdev should be NODEV for non-special inodes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f47e963c432f43a3edc62a89ea95a8c44bc0c19a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f47e963c432f43a3edc62a89ea95a8c44bc0c19a commit f47e963c432f43a3edc62a89ea95a8c44bc0c19a Author: Konstantin Belousov AuthorDate: 2025-08-18 02:45:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-28 18:14:23 +0000 cd9660: va_rdev should be NODEV for non-special inodes (cherry picked from commit fba63c09ed0fd21865bfd0ec3b9e0c3840a55dd6) --- sys/fs/cd9660/cd9660_vnops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 95ca535a225c..4554f844104d 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -194,7 +194,7 @@ cd9660_getattr(struct vop_getattr_args *ap) vap->va_atime = ip->inode.iso_atime; vap->va_mtime = ip->inode.iso_mtime; vap->va_ctime = ip->inode.iso_ctime; - vap->va_rdev = ip->inode.iso_rdev; + vap->va_rdev = VN_ISDEV(vp) ? ip->inode.iso_rdev : NODEV; vap->va_size = (u_quad_t) ip->i_size; if (ip->i_size == 0 && (vap->va_mode & S_IFMT) == S_IFLNK) { From nobody Fri Aug 29 03:15:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCk0W2zNfz65vgS; Fri, 29 Aug 2025 03:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCk0V3tBPz3Y1K; Fri, 29 Aug 2025 03:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=od/ifHK/urio2QQehFD9E1a/M03FOKKOtABA6xT2AF4=; b=MQKpWNwQHX+2b7VH40/IpeHty6j5mlYwlCL0h7ijQ9VT7QBUlEG/qz1uT1ek2+pOOcxoeW atDVBYeTZz/s9DJ9Wvrulj8UrIA36hbovzI7E6cvzekjdmq4fuXJK3mF2NDgK0eJPHzmx2 gqa2I5h+h27KB1PphvwpAhp5DrPIuD71gEeNflTQkkEE33OhxUyOTXdZSSumWokAjBNVf/ B3AJpM14X110sompHNb+oW00Pa54U9lj765noSBUsps2E/90m0Yh4o7E7fdgFZB/1E9QYR W4aYqa50XBbOvz7flHaN+2niD8nTlPQsE7QGqeIlUeSKTVIuqTHzuQ+bFHb93w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=od/ifHK/urio2QQehFD9E1a/M03FOKKOtABA6xT2AF4=; b=HfVCBLS23pCQCUauo/so/cGIGQHiVxyfCEYYA+80/mc6SY5GA6A7F4x0xdirOqRviIbmmX rvBE7cimi1A3twzzz4wKeiwGQKoNxME+45io6+dVmJdxa6EILPSOKmfN5cDreRb8Jda34u CF4Yc8PhKjenWbWFVyjY8ZtG3rWfi6o4s/vxbc4Rq++LTIoLwRhk5PeF2cgV99S9c1+f3e hFKisWfaaSumx1FEP+q4RCxqc4ZHsAB9RkDHONGIX/zmjj2QbPgfB1ZFefdDD7lNktY+o3 cyNJnAVEK+FjBtXmuTdcQJYnKs0pLuWqBH2FVvp/N+TxlE0857c1CBMhHy/9rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756437306; a=rsa-sha256; cv=none; b=cXJ4hAP07Tw5efwphRhOLTgpnRpi9AxQ6es+Hl3L6jwczBId+ZXNcOfv9ULWcZWhKUvkE3 ZPo8WJ1IwthZQalBBXU0uYRWaq6KSg76UamfW8MQpwB5GA4YnDbBASUsRxJjKx6hljUbXv EOCokOpFmlLf/I0vF1drYMzIyiwmgtF3gLOZ69viLSYakClF9ctdHt5irIK0ISKyHPOD23 7T+g3skdNoY+igMCll57kpWHICDVeo4Ucj9U/XRpkqhg7fTHv/YDh6FZ1Rp4znc9vIPRp0 IgNIK+9ZnhU3Z3+s40VzV7ToPjvnp/uKT2gt+mBdKMVQ76jQiHs0sRlZaZWXOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCk0V2w5Yz6RW; Fri, 29 Aug 2025 03:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57T3F6h5047846; Fri, 29 Aug 2025 03:15:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57T3F6ck047843; Fri, 29 Aug 2025 03:15:06 GMT (envelope-from git) Date: Fri, 29 Aug 2025 03:15:06 GMT Message-Id: <202508290315.57T3F6ck047843@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: 4d294b72f8e3 - stable/14 - nfsclient: va_rdev should be NODEV for non-special nodes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4d294b72f8e31c0f9589d2f9cb3799d4391e0189 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4d294b72f8e31c0f9589d2f9cb3799d4391e0189 commit 4d294b72f8e31c0f9589d2f9cb3799d4391e0189 Author: Konstantin Belousov AuthorDate: 2025-08-18 02:46:18 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-28 18:14:24 +0000 nfsclient: va_rdev should be NODEV for non-special nodes (cherry picked from commit 6acc5ed5f9c3e1b462e7ae0d1ae1c5196328fa9f) --- sys/fs/nfs/nfsport.h | 2 +- sys/fs/nfsclient/nfs_clport.c | 6 +++--- sys/fs/nfsclient/nfs_clvnops.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index 557ed0a5dfc9..7dab98b06e70 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -1010,7 +1010,7 @@ MALLOC_DECLARE(M_NEWNFSDSESSION); int nfscl_loadattrcache(struct vnode **, struct nfsvattr *, void *, int, int); int newnfs_realign(struct mbuf **, int); bool ncl_pager_setsize(struct vnode *vp, u_quad_t *nsizep); -void ncl_copy_vattr(struct vattr *dst, struct vattr *src); +void ncl_copy_vattr(struct vnode *vp, struct vattr *dst, struct vattr *src); /* * If the port runs on an SMP box that can enforce Atomic ops with low diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index 4e3a699fb170..27d96f19420e 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -412,7 +412,7 @@ nfscl_warn_fileid(struct nfsmount *nmp, struct nfsvattr *oldnap, } void -ncl_copy_vattr(struct vattr *dst, struct vattr *src) +ncl_copy_vattr(struct vnode *vp, struct vattr *dst, struct vattr *src) { dst->va_type = src->va_type; dst->va_mode = src->va_mode; @@ -429,7 +429,7 @@ ncl_copy_vattr(struct vattr *dst, struct vattr *src) dst->va_birthtime = src->va_birthtime; dst->va_gen = src->va_gen; dst->va_flags = src->va_flags; - dst->va_rdev = src->va_rdev; + dst->va_rdev = VN_ISDEV(vp) ? src->va_rdev : NODEV; dst->va_bytes = src->va_bytes; dst->va_filerev = src->va_filerev; } @@ -595,7 +595,7 @@ nfscl_loadattrcache(struct vnode **vpp, struct nfsvattr *nap, void *nvaper, KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp); } if (vaper != NULL) { - ncl_copy_vattr(vaper, vap); + ncl_copy_vattr(vp, vaper, vap); if (np->n_flag & NCHG) { if (np->n_flag & NACC) vaper->va_atime = np->n_atim; diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index ae69d499c425..7f751d81d5e5 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1004,7 +1004,7 @@ nfs_getattr(struct vop_getattr_args *ap) * cached attributes should be ignored. */ if (nmp->nm_fhsize > 0 && ncl_getattrcache(vp, &vattr) == 0) { - ncl_copy_vattr(vap, &vattr); + ncl_copy_vattr(vp, vap, &vattr); /* * Get the local modify time for the case of a write From nobody Fri Aug 29 03:19:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCk602wMLz65wP6; Fri, 29 Aug 2025 03:19:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCk601m3Mz3Yn2; Fri, 29 Aug 2025 03:19:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EfNf4zLfiwDPhq8sIlWLEHIPpdhMbeWynv7595gS/U0=; b=OfSjMR8ZVFPlqMOc39nD1oYS0bj7KcXntSz0X+WoLqUleY1Ljtdb/nTSf4N7AIek8XMI2P AAXqKWLhiJtRMJAwmz1QoNKaqRXmx0LwXlPqoncgr15ozYlUbJoXowuDk++PxE4FN9VVaB F7bxy+mdaygJsoJUU5XqgUgmOpdj77A92zpWjGL4pd4mveEoUGaMttKK8zWfYgkUUUF0kF vNfJHAO9cmSBjWZ6oghWiOJvoEGoHHKCwjqwcCvVUew6nEeCm8r/AjY0g5ZCY78Pui9EtO LHBdO8WFxxi05JrojUGg4J2t1Lkx7s2DKggpXuWIwhBWdUHe6+QFkVScx1K57Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EfNf4zLfiwDPhq8sIlWLEHIPpdhMbeWynv7595gS/U0=; b=R5RGw6S72KoEAWxoJR2NIrl+rrIFN0hMq2+GVdAWfBlEPgSQ+2HqBCvy6OebZHN/u7Qjm3 6jgtIhZltDGJ/p3M7HzJcJ9ik1m/iSBHiVFIzm2823aWClSGZhbTKYspGNfFcCj4KCKASB FI3tUFw4ubhpyHxfH5pCs9eE0Sss8+RRCVQOic7HsGPI9CgNyQHaIKplAkXLthUi/zXME9 7qhiIxxup17f1J6msYp6VMD8lNH2ARmb2PUmAFC1LemgZNSY0DIoCI+VCdyt2I/8nNCU7y HCyXDRc3kd8w5hSw9nxCU8LgNl7QuC/4yH3U+qM0jdGmK3KPOmE0mI2e+gNApw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756437592; a=rsa-sha256; cv=none; b=DYoY4nUxZuxrdnhukGDzuV4tvWX9WIx+oHULefzQGNzxSHO6MhiWArLUcLAqjxFGoG+Evb B4lh+QRPJR+h0Q5z5hMF49WN8v1WTXlw6dcW9iNvpHJeUiR7zkpr+QpjtudcqiBhsUY5bX goGALg1XmuvWB8oIhz7ifoStX9Cx/fTFdqX2Y1Jmbs+BHy36ENEM/mXrMlrwsmElr4wQ84 6gZI90EH/8kdqBwCSi6s8phm6KBr9x9/52tXto9+d/eOBe2WGSnmaVAgefnYCxQmGGBMZq 0LBH4CMgeHZdAyoV5FLar7/VkUIEBl7wSFeiDQMGulKug56GhMfiohHtpZ1gKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCk601DtFz6Lh; Fri, 29 Aug 2025 03:19:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57T3JqV3049215; Fri, 29 Aug 2025 03:19:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57T3JqRa049212; Fri, 29 Aug 2025 03:19:52 GMT (envelope-from git) Date: Fri, 29 Aug 2025 03:19:52 GMT Message-Id: <202508290319.57T3JqRa049212@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: f5d312cb4d60 - stable/14 - linuxkpi: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5d312cb4d605c9d60ac1510d7063b234fbc7861 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f5d312cb4d605c9d60ac1510d7063b234fbc7861 commit f5d312cb4d605c9d60ac1510d7063b234fbc7861 Author: Gordon Bergling AuthorDate: 2025-08-26 07:46:00 +0000 Commit: Gordon Bergling CommitDate: 2025-08-29 03:18:26 +0000 linuxkpi: Fix a typo in a source code comment - s/__FreeBSD_verison/__FreeBSD_version/ (cherry picked from commit e0875bf019e11f93d5e23b9839e1a7f0c4317320) --- sys/compat/linuxkpi/common/include/acpi/acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi.h b/sys/compat/linuxkpi/common/include/acpi/acpi.h index 1e398d05ba20..016c7ede0f6e 100644 --- a/sys/compat/linuxkpi/common/include/acpi/acpi.h +++ b/sys/compat/linuxkpi/common/include/acpi/acpi.h @@ -37,7 +37,7 @@ /* * LINUXKPI_WANT_LINUX_ACPI is a temporary workaround to allow drm-kmod * to update all needed branches without breaking builds. - * Once that happened and checks are implemented based on __FreeBSD_verison + * Once that happened and checks are implemented based on __FreeBSD_version * we will remove these conditions again. */ From nobody Fri Aug 29 03:23:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cCk9m2Swbz65wkv; Fri, 29 Aug 2025 03:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCk9m1sbxz3bLv; Fri, 29 Aug 2025 03:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yqAXrybVOA2us87laJIdut6oKdePRbL5YpRVEaNvavs=; b=DE+MZN0ojwUQ1Vvm4eqNvnNkAI/TPwusQShmzouFaye+GNFF3a3rBO3EqjeHaXdPusqWeW fEBuC1qnZ22sil5nqpi8hTGbAZEAsk4N1Vt8My+CqvWHCs0rzVd+b8RfhGGVRuHY65IplJ khYbToRr3qkz2NxCArNalNw8WPCXWQTdjPry+W6RwoalZc3o4SfUbzEAu5vWqdX06sXlNb dkrP2Pj3Xo2xRUa/zw/X8HJjKvpHZOBn5xxsmFvOoSNcs9uOXHatDj9xuilk2czWt8WDSP JocpW/VNdVhPoBnahNBqSs2b1SDgR5sRqd4YcqrM9WPeVm0K6a9zJHe0iOEcIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756437788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yqAXrybVOA2us87laJIdut6oKdePRbL5YpRVEaNvavs=; b=x4DoN0bq5H2TTCwua6jTczOWIpIFyuGJvjG13LdR2d5DpO3566yd1jmPqirvaeoxwMxlih VkATSYuvppD+juKnU5q1bceYC/OWzBzySsqVU9+kZoU/dsYWTv8HqrkbYX/VB+iFZqLo8x SQmjxFF3NCX3d0FegFw4r31h+GMll93NqO2JV160IuHGA7X3D9O55ZKu5pAN7dgh0fqMub LJL85ybVBgqqw7Wm3Plf3HQdToh8dbJ/U3IK1unPqR/XLPKICpgz8iAWS9PaOijtiALWbV TOhmWX8jCbQ5oavMcU0CcDC10HYvjwsJTij8q+5+YOMVdFXaGY82j71hA7dDew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756437788; a=rsa-sha256; cv=none; b=gf9kGci2V3O/Lo+uW3JR2XmvdZTHx/eIykWmuP5pwfjI8ffY3wQFnKRAwc3kTisXkPk+Qv 0aOc82nJAv5CbZ3cL9G0CU15XdiSfgxwpcipepuQPBPrgAEpivPbvipayJda63swPnFDJr ujoITMrEYk9BZHESuyj7m5bRpR5biNCt5NKN2+5fn4NFMSQr9rQGO1E3rJPFvFzfXN8z4W UPVM2ppNUXVnszAW5Pj9l8PqkIiOEk8OoNofkYIatsrBHzW+oeFt0rrZREGZYyltse0+Hn 8Casx6Ti5Njxu5v7NGSuwwYgIDyT+cP6TNhKgL+4FGMSiW9i+559P0pMgVu15w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCk9m1FdPz6qn; Fri, 29 Aug 2025 03:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57T3N8gQ065676; Fri, 29 Aug 2025 03:23:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57T3N8nJ065673; Fri, 29 Aug 2025 03:23:08 GMT (envelope-from git) Date: Fri, 29 Aug 2025 03:23:08 GMT Message-Id: <202508290323.57T3N8nJ065673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: b06973a2f2a8 - stable/14 - nfsd: Fix slow leaks of NAMEI buffers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b06973a2f2a8854b4803c9a4d00dc0482be8f268 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b06973a2f2a8854b4803c9a4d00dc0482be8f268 commit b06973a2f2a8854b4803c9a4d00dc0482be8f268 Author: Rick Macklem AuthorDate: 2025-08-15 19:11:08 +0000 Commit: Rick Macklem CommitDate: 2025-08-29 03:20:15 +0000 nfsd: Fix slow leaks of NAMEI buffers Commit 5b5b7e2ca2fa changed namei()s behaviour such that it does not free the NAMEI buffer unless returning an error. The nfsd was not fixed for this. Fortunately, the only leak would be one NAMEI buffer each time mountd(8) reloads the exports. (There were also leaks in the pNFS server configuration, but almost no one uses it.) This patch fixes the leaks by adding NDFREE_PNBUF() macros in the appropriate places. MFC after: 2 weeks Discussed with: kib Fixes: 5b5b7e2ca2fa ("vfs: always retain path buffer after lookup") (cherry picked from commit 9cd3860c10b6afaaaeb118dafc166ab168bc9083) --- sys/fs/nfsserver/nfs_nfsdport.c | 1 + sys/fs/nfsserver/nfs_nfsdstate.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index a4a729613038..c22d06ef0aeb 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -3589,6 +3589,7 @@ nfsrv_v4rootexport(void *argp, struct ucred *cred, struct thread *p) NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, nfsexargp->fspec); if ((error = namei(&nd)) != 0) goto out; + NDFREE_PNBUF(&nd); error = nfsvno_getfh(nd.ni_vp, &fh, p); vrele(nd.ni_vp); if (!error) { diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 0f556adb697b..cca977b31e8e 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -7724,6 +7724,7 @@ nfsrv_setdsserver(char *dspathp, char *mdspathp, NFSPROC_T *p, NFSD_DEBUG(4, "lookup=%d\n", error); if (error != 0) return (error); + NDFREE_PNBUF(&nd); if (nd.ni_vp->v_type != VDIR) { vput(nd.ni_vp); NFSD_DEBUG(4, "dspath not dir\n"); @@ -7760,6 +7761,7 @@ nfsrv_setdsserver(char *dspathp, char *mdspathp, NFSPROC_T *p, NFSD_DEBUG(4, "dsdirpath=%s lookup=%d\n", dsdirpath, error); if (error != 0) break; + NDFREE_PNBUF(&nd); if (nd.ni_vp->v_type != VDIR) { vput(nd.ni_vp); error = ENOTDIR; @@ -7788,6 +7790,7 @@ nfsrv_setdsserver(char *dspathp, char *mdspathp, NFSPROC_T *p, NFSD_DEBUG(4, "mds lookup=%d\n", error); if (error != 0) goto out; + NDFREE_PNBUF(&nd); if (nd.ni_vp->v_type != VDIR) { vput(nd.ni_vp); error = ENOTDIR; @@ -8647,6 +8650,7 @@ nfsrv_mdscopymr(char *mdspathp, char *dspathp, char *curdspathp, char *buf, NFSD_DEBUG(4, "lookup=%d\n", error); if (error != 0) return (error); + NDFREE_PNBUF(&nd); if (nd.ni_vp->v_type != VREG) { vput(nd.ni_vp); NFSD_DEBUG(4, "mdspath not reg\n"); @@ -8668,6 +8672,7 @@ nfsrv_mdscopymr(char *mdspathp, char *dspathp, char *curdspathp, char *buf, vput(vp); return (error); } + NDFREE_PNBUF(&nd); if (nd.ni_vp->v_type != VDIR) { vput(nd.ni_vp); vput(vp); @@ -8710,6 +8715,7 @@ nfsrv_mdscopymr(char *mdspathp, char *dspathp, char *curdspathp, char *buf, vput(curvp); return (error); } + NDFREE_PNBUF(&nd); if (nd.ni_vp->v_type != VDIR || nd.ni_vp == curvp) { vput(nd.ni_vp); vput(vp); From nobody Fri Aug 29 14:58:46 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD1cQ6zwbz65gVR; Fri, 29 Aug 2025 14:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD1cQ5wRvz3tN5; Fri, 29 Aug 2025 14:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNuPIEg/8wJce9P3C0e0QjocoiwXGwNB4I7AxyXqS0s=; b=OS8AYg9+nWT/qaSEv17Uql6VxzftPeqflMTpXfWlspixNuNZh2vxSOZTHuMCzKyfz+D+YZ r4BzBh0hRC8dpnZ9ehTPZXdgT96AhgT4RVeNgUkyhx+C1Vu3OfdgnT7SOQJsyrd/I2qAKk W0ZmThLVMVL+8W22zqVUg4ac0bEITxSyhZtIWrSWGN6ZoZcTspQ1aUpak+T21q95NznUwK KmUj4oHje1tdewe9A7sEhavyxLxDJEj2FfdcNQb3WHDpZcA2zNNBxDI3Xs+aEG+CPn7MW6 xqEaqfLd6c15B3p/p4qWaXO+/5GkOl93Uq28jJW4piDLmOA20n1gDCOJIgYFog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNuPIEg/8wJce9P3C0e0QjocoiwXGwNB4I7AxyXqS0s=; b=hPSACWXmBpard8oXkK8phjJ3PIO61MJ9S0/O4fYrOKtAMgwjZF6VgqAasMmWcUXDoyJyFS Ass/9vWjA8DIKNZwPosYwD+dB212wxsHlIwkbsccFXFL0i99omqfmOhMGxBY2oPCgG6V+i oEeoC2saGipzgnUhmiJpoTSqDVYQ6uPTJYyZtfk5UVa3sWWwqbf7uZrkWuj5aa0i1dXUSN LXur/umC9PGPjjMivWhJnQGMavIMEUNWAs6urWPsOQOWGu+F5qQPZTGSig15TywtTGyCX2 bW7k7BxQVZCPojIumKQgZVuU7gmfJ1azKca/Iz4lYmhYl4hd9F9CWI3ABRvtsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756479526; a=rsa-sha256; cv=none; b=iKmCHJKbhks2ILbsFQAyFXPWAiXV7H6ADd0Uj6fHNUPNbC4aDBxinwBnM0WMm4N2bFT+6H 9X3nADBRZi1y1Yr4yTOvD9ipQHV8RXj+eMXHI4S7ARFIXiiOW4CNglpf9zMa+FkuAQ9Eg6 plfpM3dUbMBJJPsxUhkYw359zU12H86N1qVPPJ2BGMNTiNU8lGXdds/ljciens5k+ZuzUP Fx9gU/NnrVswGM+I9FGreqNu9OWejXDYNHqExhD13dcE3Iqwc4y6lKCotTemXxlQ27juel fr+QIAmRyafCVv6/Cj69w+/CdJj7z/byM5e5me0GdGvtA8lFSlFKWLDG1V1UaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD1cQ56PMzlSJ; Fri, 29 Aug 2025 14:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TEwk4w061912; Fri, 29 Aug 2025 14:58:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TEwk5C061909; Fri, 29 Aug 2025 14:58:46 GMT (envelope-from git) Date: Fri, 29 Aug 2025 14:58:46 GMT Message-Id: <202508291458.57TEwk5C061909@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: eac6f90ce161 - stable/14 - flua: Connect man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eac6f90ce161775ac803747c24680eb3d4a921ff Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=eac6f90ce161775ac803747c24680eb3d4a921ff commit eac6f90ce161775ac803747c24680eb3d4a921ff Author: Ed Maste AuthorDate: 2025-04-15 15:23:39 +0000 Commit: Ed Maste CommitDate: 2025-08-29 14:57:36 +0000 flua: Connect man page The flua man page was MFC'd but the Makefile update was dropped accidentally. (cherry picked from commit 550289771d5cb73befb6a1645fb9cdf0b9fb65a7) Fixes: d967c87d073d1307dfd51ab9335ead472a05e6bd Sponsored by: The FreeBSD Foundation --- libexec/flua/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index a788bb57dcd7..2cfa8649fc01 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -12,7 +12,6 @@ LUASRC?= ${SRCTOP}/contrib/lua/src PROG= flua WARNS?= 3 -MAN= # No manpage; this is internal. CWARNFLAGS.gcc+= -Wno-format-nonliteral From nobody Fri Aug 29 15:05:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD1lj4vjRz65hC2; Fri, 29 Aug 2025 15:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD1lj4LcLz3vLK; Fri, 29 Aug 2025 15:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EmlmIahHXDdZSkHfFQkg5SfSMbQoJiWljJV6vTVxTg0=; b=uQPiYvzf1DQhX5B5JrPrsuX3JUEZs1QXdAHvGNFgDn6oVIGTd+BhpNPV+MMW+z7NnV9mvn xALMEQIUG3/MleTb04J/OI44ZGSr6TN0V6EAgLB7TnQaJEIy56FX++ANRwiiEQUOsm2Dam Jav0cSjPr776dLpcsM36Scl8cGepkWrM4RSavpRmE9C6IgHye1fLgyw9bbJRfvbX8LiI3v 2TkDbfauFcmYOI/oNbUnkS8SRanETa0P+yC7V6f8JWr40HiH9haJ1FudV3jE3/f99qcV/j tfPne8y6azxVTN3lvwUtINHROjKfUot8s7ThoG5zQI3OainudMfb997b76/nxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EmlmIahHXDdZSkHfFQkg5SfSMbQoJiWljJV6vTVxTg0=; b=tlRgF1OUl2XfXFJ31JPwYZGqquqKzH/GP/8Q9QZQnyBAdcDS4nd5LqYb1GSDJIP6CACMag 21N+POxuB6wd2g7277T+hBGap2gPEIVS6YuwYniKYyN2Hw+p5BgXrjqr3FJ6bJoOGgQbX0 0MARF3mael5Kde+ZMdn8WCR2t2mxvujcurPmy5tHm+uA9jATQfoYG7RHJvduedOhlu9X2q T8dlUre39DtutLsGs6hWGu41AWLhilISZ3Z1AEjaZy6CwsUMtKzdsquL93pJtH/7Z2TukT /ekN6HZoeeF4d8dNHJxNap3ajIHJoIu6+KUojwcOkMNWBN/JzBpYNdcIqMExaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756479905; a=rsa-sha256; cv=none; b=eUAqeAQHdvKcBWwHQCuLMELGX3SRWG361ZeHjjCRIWl6WqP0IKOz/G7hs16jra0+68pTSJ qqHa1KtPV/Fg7ulvHVh3YfvNE7S3MgfspXLsuvlJxn6NGird5fxiwdDgcCyyjCkL802rt4 ojITB/fxUdB1dwe+e/6M1XtuGu+6EpiTuDToziqDRG4C1CWrK4B/XgCyLuzO2/Qd5C7bDc R1ZuY0Q6cPaAugIf9nzX2MWsJuYQvD5kBiVgPbSewCGcVYDICJlZZr1otzCV3rRX3A5Q99 CDash+elwayX1w8H6LnEgPAiNtPZZHwHZ6jgz2vz6QoDW46kffFMg6WcN+onng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD1lj3mMHzlWy; Fri, 29 Aug 2025 15:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TF557g080491; Fri, 29 Aug 2025 15:05:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TF55EO080488; Fri, 29 Aug 2025 15:05:05 GMT (envelope-from git) Date: Fri, 29 Aug 2025 15:05:05 GMT Message-Id: <202508291505.57TF55EO080488@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: d2be11512ede - stable/14 - flua: lposix: add more useful functions for general purpose scripts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d2be11512ede667398e7ed90a548205fc76553ea Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d2be11512ede667398e7ed90a548205fc76553ea commit d2be11512ede667398e7ed90a548205fc76553ea Author: Kyle Evans AuthorDate: 2023-03-11 06:03:02 +0000 Commit: Ed Maste CommitDate: 2025-08-29 14:57:36 +0000 flua: lposix: add more useful functions for general purpose scripts unistd: - _exit - close - fork - getpid - pipe - read - write libgen: - basename, dirname stdlib: - realpath These are sufficient for a number of real world scenarios. In our first application of them, we use the libgen+stdlib additions to grab the script dir based on argv[0]. The unistd assortment is then used to outsource a bunch of work to forks and report back to the main process. Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D39083 (cherry picked from commit c2caf3b3313fe73bfc9b4b984c21da8d571f8798) --- libexec/flua/linit_flua.c | 3 + libexec/flua/modules/lposix.c | 415 ++++++++++++++++++++++++++++++++++++++---- libexec/flua/modules/lposix.h | 3 + 3 files changed, 388 insertions(+), 33 deletions(-) diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c index 87cabb58deb2..13c2c7fcc52f 100644 --- a/libexec/flua/linit_flua.c +++ b/libexec/flua/linit_flua.c @@ -56,8 +56,11 @@ static const luaL_Reg loadedlibs[] = { #endif /* FreeBSD Extensions */ {"lfs", luaopen_lfs}, + {"posix.libgen", luaopen_posix_libgen}, + {"posix.stdlib", luaopen_posix_stdlib}, {"posix.sys.stat", luaopen_posix_sys_stat}, {"posix.sys.utsname", luaopen_posix_sys_utsname}, + {"posix.sys.wait", luaopen_posix_sys_wait}, {"posix.unistd", luaopen_posix_unistd}, {NULL, NULL} }; diff --git a/libexec/flua/modules/lposix.c b/libexec/flua/modules/lposix.c index bc55f35a942a..78fafbaa1982 100644 --- a/libexec/flua/modules/lposix.c +++ b/libexec/flua/modules/lposix.c @@ -1,35 +1,18 @@ /*- - * Copyright (c) 2019 Kyle Evans - * - * 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. + * Copyright (c) 2019, 2023 Kyle Evans * + * SPDX-License-Identifier: BSD-2-Clause */ #include #include +#include #include #include +#include #include +#include #include #include @@ -40,6 +23,39 @@ /* * Minimal implementation of luaposix needed for internal FreeBSD bits. */ +static int +lua__exit(lua_State *L) +{ + int code, narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg == 1, 1, "_exit takes exactly one argument"); + + code = luaL_checkinteger(L, 1); + _exit(code); +} + +static int +lua_basename(lua_State *L) +{ + char *inpath, *outpath; + int narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg > 0, 1, "at least one argument required"); + inpath = strdup(luaL_checkstring(L, 1)); + if (inpath == NULL) { + lua_pushnil(L); + lua_pushstring(L, strerror(ENOMEM)); + lua_pushinteger(L, ENOMEM); + return (3); + } + + outpath = basename(inpath); + lua_pushstring(L, outpath); + free(inpath); + return (1); +} static int lua_chmod(lua_State *L) @@ -57,10 +73,10 @@ lua_chmod(lua_State *L) lua_pushnil(L); lua_pushstring(L, strerror(errno)); lua_pushinteger(L, errno); - return 3; + return (3); } lua_pushinteger(L, 0); - return 1; + return (1); } static int @@ -129,14 +145,32 @@ lua_chown(lua_State *L) } static int -lua_getpid(lua_State *L) +lua_pclose(lua_State *L) { - int n; + int error, fd, n; n = lua_gettop(L); - luaL_argcheck(L, n == 0, 1, "too many arguments"); - lua_pushinteger(L, getpid()); - return 1; + luaL_argcheck(L, n == 1, 1, + "close takes exactly one argument (fd)"); + + fd = luaL_checkinteger(L, 1); + if (fd < 0) { + error = EBADF; + goto err; + } + + if (close(fd) == 0) { + lua_pushinteger(L, 0); + return (1); + } + + error = errno; +err: + lua_pushnil(L); + lua_pushstring(L, strerror(error)); + lua_pushinteger(L, error); + return (3); + } static int @@ -172,7 +206,271 @@ lua_uname(lua_State *L) return (1); } -#define REG_SIMPLE(n) { #n, lua_ ## n } +static int +lua_dirname(lua_State *L) +{ + char *inpath, *outpath; + int narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg > 0, 1, + "dirname takes at least one argument (path)"); + inpath = strdup(luaL_checkstring(L, 1)); + if (inpath == NULL) { + lua_pushnil(L); + lua_pushstring(L, strerror(ENOMEM)); + lua_pushinteger(L, ENOMEM); + return (3); + } + + outpath = dirname(inpath); + lua_pushstring(L, outpath); + free(inpath); + return (1); +} + +static int +lua_fork(lua_State *L) +{ + pid_t pid; + int narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg == 0, 1, "too many arguments"); + + pid = fork(); + if (pid < 0) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + + lua_pushinteger(L, pid); + return (1); +} + +static int +lua_getpid(lua_State *L) +{ + int narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg == 0, 1, "too many arguments"); + lua_pushinteger(L, getpid()); + return (1); +} + +static int +lua_pipe(lua_State *L) +{ + int error, fd[2], narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg == 0, 1, "too many arguments"); + + error = pipe(fd); + if (error != 0) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (1); + } + + lua_pushinteger(L, fd[0]); + lua_pushinteger(L, fd[1]); + return (2); +} + +static int +lua_read(lua_State *L) +{ + char *buf; + ssize_t ret; + size_t sz; + int error, fd, narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg == 2, 1, + "read takes exactly two arguments (fd, size)"); + + fd = luaL_checkinteger(L, 1); + sz = luaL_checkinteger(L, 2); + + if (fd < 0) { + error = EBADF; + goto err; + } + + buf = malloc(sz); + if (buf == NULL) + goto err; + + /* + * For 0-byte reads, we'll still push the empty string and let the + * caller deal with EOF to match lposix semantics. + */ + ret = read(fd, buf, sz); + if (ret >= 0) + lua_pushlstring(L, buf, ret); + else if (ret < 0) + error = errno; /* Save to avoid clobber by free() */ + + free(buf); + if (error != 0) + goto err; + + /* Just the string pushed. */ + return (1); +err: + lua_pushnil(L); + lua_pushstring(L, strerror(error)); + lua_pushinteger(L, error); + return (3); +} + +static int +lua_realpath(lua_State *L) +{ + const char *inpath; + char *outpath; + int narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg > 0, 1, "at least one argument required"); + inpath = luaL_checkstring(L, 1); + + outpath = realpath(inpath, NULL); + if (outpath == NULL) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + + lua_pushstring(L, outpath); + free(outpath); + return (1); +} + +static int +lua_wait(lua_State *L) +{ + pid_t pid; + int options, status; + int narg; + + narg = lua_gettop(L); + + pid = -1; + status = options = 0; + if (narg >= 1 && !lua_isnil(L, 1)) + pid = luaL_checkinteger(L, 1); + if (narg >= 2 && !lua_isnil(L, 2)) + options = luaL_checkinteger(L, 2); + + pid = waitpid(pid, &status, options); + if (pid < 0) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + + lua_pushinteger(L, pid); + if (pid == 0) { + lua_pushliteral(L, "running"); + return (2); + } + + if (WIFCONTINUED(status)) { + lua_pushliteral(L, "continued"); + return (2); + } else if(WIFSTOPPED(status)) { + lua_pushliteral(L, "stopped"); + lua_pushinteger(L, WSTOPSIG(status)); + return (3); + } else if (WIFEXITED(status)) { + lua_pushliteral(L, "exited"); + lua_pushinteger(L, WEXITSTATUS(status)); + return (3); + } else if (WIFSIGNALED(status)) { + lua_pushliteral(L, "killed"); + lua_pushinteger(L, WTERMSIG(status)); + return (3); + } + + return (1); +} + +static int +lua_write(lua_State *L) +{ + const char *buf; + size_t bufsz, sz; + ssize_t ret; + off_t offset; + int error, fd, narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg >= 2, 1, + "write takes at least two arguments (fd, buf, sz, off)"); + luaL_argcheck(L, narg <= 4, 5, + "write takes no more than four arguments (fd, buf, sz, off)"); + + fd = luaL_checkinteger(L, 1); + if (fd < 0) { + error = EBADF; + goto err; + } + + buf = luaL_checkstring(L, 2); + + bufsz = sz = lua_rawlen(L, 2); + if (narg >= 3 && !lua_isnil(L, 3)) + sz = luaL_checkinteger(L, 3); + + offset = 0; + if (narg >= 4 && !lua_isnil(L, 4)) + offset = luaL_checkinteger(L, 4); + + if ((size_t)offset > bufsz || offset + sz > bufsz) { + lua_pushnil(L); + lua_pushfstring(L, + "write: invalid access offset %zu, size %zu in a buffer size %zu", + offset, sz, bufsz); + lua_pushinteger(L, EINVAL); + return (3); + } + + ret = write(fd, buf + offset, sz); + if (ret < 0) { + error = errno; + goto err; + } + + lua_pushinteger(L, ret); + return (1); +err: + lua_pushnil(L); + lua_pushstring(L, strerror(error)); + lua_pushinteger(L, error); + return (3); +} + +#define REG_DEF(n, func) { #n, func } +#define REG_SIMPLE(n) REG_DEF(n, lua_ ## n) +static const struct luaL_Reg libgenlib[] = { + REG_SIMPLE(basename), + REG_SIMPLE(dirname), + { NULL, NULL }, +}; + +static const struct luaL_Reg stdliblib[] = { + REG_SIMPLE(realpath), + { NULL, NULL }, +}; + static const struct luaL_Reg sys_statlib[] = { REG_SIMPLE(chmod), { NULL, NULL }, @@ -183,18 +481,69 @@ static const struct luaL_Reg sys_utsnamelib[] = { { NULL, NULL }, }; +static const struct luaL_Reg sys_waitlib[] = { + REG_SIMPLE(wait), + {NULL, NULL}, +}; + static const struct luaL_Reg unistdlib[] = { - REG_SIMPLE(getpid), + REG_SIMPLE(_exit), REG_SIMPLE(chown), + REG_DEF(close, lua_pclose), + REG_SIMPLE(fork), + REG_SIMPLE(getpid), + REG_SIMPLE(pipe), + REG_SIMPLE(read), + REG_SIMPLE(write), { NULL, NULL }, }; + #undef REG_SIMPLE +#undef REG_DEF + +int +luaopen_posix_libgen(lua_State *L) +{ + luaL_newlib(L, libgenlib); + return (1); +} + +int +luaopen_posix_stdlib(lua_State *L) +{ + luaL_newlib(L, stdliblib); + return (1); +} int luaopen_posix_sys_stat(lua_State *L) { luaL_newlib(L, sys_statlib); - return 1; + return (1); +} + +int +luaopen_posix_sys_wait(lua_State *L) +{ + luaL_newlib(L, sys_waitlib); + +#define lua_pushflag(L, flag) do { \ + lua_pushinteger(L, flag); \ + lua_setfield(L, -2, #flag); \ +} while(0) + + /* Only these two exported by lposix */ + lua_pushflag(L, WNOHANG); + lua_pushflag(L, WUNTRACED); + + lua_pushflag(L, WCONTINUED); + lua_pushflag(L, WSTOPPED); + lua_pushflag(L, WTRAPPED); + lua_pushflag(L, WEXITED); + lua_pushflag(L, WNOWAIT); +#undef lua_pushflag + + return (1); } int @@ -208,5 +557,5 @@ int luaopen_posix_unistd(lua_State *L) { luaL_newlib(L, unistdlib); - return 1; + return (1); } diff --git a/libexec/flua/modules/lposix.h b/libexec/flua/modules/lposix.h index e37caaae9d04..9d2c97b0d2dc 100644 --- a/libexec/flua/modules/lposix.h +++ b/libexec/flua/modules/lposix.h @@ -7,6 +7,9 @@ #include +int luaopen_posix_libgen(lua_State *L); +int luaopen_posix_stdlib(lua_State *L); int luaopen_posix_sys_stat(lua_State *L); int luaopen_posix_sys_utsname(lua_State *L); +int luaopen_posix_sys_wait(lua_State *L); int luaopen_posix_unistd(lua_State *L); From nobody Fri Aug 29 15:05:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD1lk6dsRz65gsV; Fri, 29 Aug 2025 15:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD1lk5CNsz3vNM; Fri, 29 Aug 2025 15:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xP0Ff9CgGgINbEzQAglqjlWOhHiKiAVzFaeRjtx8Zyw=; b=lEkYJ4xPe9PydLhoPTmrkaR1sW6OmoQplXyvCARvSK78+279IMwmg+CQsPmd5o5tTKwBcP 339wfntAas1hJdVXdpdwxxu5LBM+yQzdMxK5axZJETw71lzkefE0cgMSwX09pEeDMLTqAn js3UzcscVyLmE+Nu132/v++jYBBn0E3FFOQ75upq6u5RpJGzKH+ZCibUALnH43S5mOY/5r M+2ykWJDQJ9Cczu1X+uxbwQbFWy2yaDEUe2EHilDCH8SSjyYGR98PLf6o8ri4n0QuKQ3EO 4FClfWMhouyNOnnhK3uxv0f4AJ8fkEiOKzFWgMI4bjzvn6TNBG5eOx/HGyKbKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xP0Ff9CgGgINbEzQAglqjlWOhHiKiAVzFaeRjtx8Zyw=; b=YNUDvjpelH7dXgC96MdKS3l2Onw8EufvTR9Ezs9nXoYCPLkT3StLUezZprt8KPHjlr/iez CGvSARH3al5lOOdmo8wi7tEE34o4vJAc3SeFa136NbF3YM+Qa9xBg21ixcZqEOQIddtXu2 L3H3BrCd+yf8tL/pt4Vx9wpOqh0owbuBkeAZl+GKaeTjSmDObeTwcDwVF6VZ+WThzG+ezV 3bJ4i9xNqR9rATpX1Fe9RsZTh/dGY+xTUFN86qJQlMbdOihWOy4Fwhv8I3a81MYcl8yJ8I WpVfvqyL7OXdML8mins4aSOPC4M/gInzbH+GOE+IHhh6W0qiw0hXWK14uEpqGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756479906; a=rsa-sha256; cv=none; b=Z/1ZqRa4vDVJpzN3lya0HZrAX3EA5FnTtepQRm+eT/2isVkOEqg+jmxcQi1bf/LuzvL2Fg 97HYYDXub6WdFAknhzaWtAKE3eGLBtlyvxSq3QX/SEvxNbE28HD2H6f0zs8Dd9RuRC2JJb 2jGZB2qpUQzNmcFYSOwVyT+RXO3HyTGCfJ9BXWQ90uapmTTb2mupJrm5+pBRxL5Z422qzG LeOClYz38IU2D4HBQ3GurZPWhnm2S7dG3soyoetX4u5YC5435oPe8sDbw+iYa22tvrP/+X iI927r5ofT8AiIbrSjn1DMUQBaUH/xDTxkQUtbnWUA0mWOsDudQCn3ks4hV/9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD1lk4f89zlX0; Fri, 29 Aug 2025 15:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TF56F0080527; Fri, 29 Aug 2025 15:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TF56Bt080524; Fri, 29 Aug 2025 15:05:06 GMT (envelope-from git) Date: Fri, 29 Aug 2025 15:05:06 GMT Message-Id: <202508291505.57TF56Bt080524@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: 069a0460280b - stable/14 - Fix the cross-build after recent commits List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 069a0460280b5356162feffed66dd70f89d02ee3 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=069a0460280b5356162feffed66dd70f89d02ee3 commit 069a0460280b5356162feffed66dd70f89d02ee3 Author: Kyle Evans AuthorDate: 2024-09-30 04:54:32 +0000 Commit: Ed Maste CommitDate: 2025-08-29 14:57:36 +0000 Fix the cross-build after recent commits - Provide a sys/md4.h in the cross-build environment to fix bootstrap of libmd. - flua now exposes WTRAPPED which isn't incredibly common- make it conditional, we probably won't be using it in any bootstrap context any time soon. Fixes: 442e0975ee4b3 ("Consolidate md4 implementations written in C") Fixes: c2caf3b3313fe ("flua: posix: add more useful functions [...]") (cherry picked from commit aad507854efd13c4387394e88d5667cc6f060933) --- libexec/flua/modules/lposix.c | 2 + tools/build/cross-build/include/common/sys/md4.h | 91 ++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/libexec/flua/modules/lposix.c b/libexec/flua/modules/lposix.c index 78fafbaa1982..4422d54917e1 100644 --- a/libexec/flua/modules/lposix.c +++ b/libexec/flua/modules/lposix.c @@ -538,7 +538,9 @@ luaopen_posix_sys_wait(lua_State *L) lua_pushflag(L, WCONTINUED); lua_pushflag(L, WSTOPPED); +#ifdef WTRAPPED lua_pushflag(L, WTRAPPED); +#endif lua_pushflag(L, WEXITED); lua_pushflag(L, WNOWAIT); #undef lua_pushflag diff --git a/tools/build/cross-build/include/common/sys/md4.h b/tools/build/cross-build/include/common/sys/md4.h new file mode 100644 index 000000000000..e00675e9f462 --- /dev/null +++ b/tools/build/cross-build/include/common/sys/md4.h @@ -0,0 +1,91 @@ +/* MD4.H - header file for MD4C.C + */ + +/*- + SPDX-License-Identifier: RSA-MD + + Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All + rights reserved. + + License to copy and use this software is granted provided that it + is identified as the "RSA Data Security, Inc. MD4 Message-Digest + Algorithm" in all material mentioning or referencing this software + or this function. + License is also granted to make and use derivative works provided + that such works are identified as "derived from the RSA Data + Security, Inc. MD4 Message-Digest Algorithm" in all material + mentioning or referencing the derived work. + + RSA Data Security, Inc. makes no representations concerning either + the merchantability of this software or the suitability of this + software for any particular purpose. It is provided "as is" + without express or implied warranty of any kind. + + These notices must be retained in any copies of any part of this + documentation and/or software. + */ + +#ifndef _SYS_MD4_H_ +#define _SYS_MD4_H_ +/* MD4 context. */ +typedef struct MD4Context { + u_int32_t state[4]; /* state (ABCD) */ + u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */ + unsigned char buffer[64]; /* input buffer */ +} MD4_CTX; + +#include + +#ifndef _KERNEL + +/* Ensure libmd symbols do not clash with libcrypto */ + +#ifndef MD4Init +#define MD4Init _libmd_MD4Init +#endif +#ifndef MD4Update +#define MD4Update _libmd_MD4Update +#endif +#ifndef MD4Pad +#define MD4Pad _libmd_MD4Pad +#endif +#ifndef MD4Final +#define MD4Final _libmd_MD4Final +#endif +#ifndef MD4End +#define MD4End _libmd_MD4End +#endif +#ifndef MD4Fd +#define MD4Fd _libmd_MD4Fd +#endif +#ifndef MD4FdChunk +#define MD4FdChunk _libmd_MD4FdChunk +#endif +#ifndef MD4File +#define MD4File _libmd_MD4File +#endif +#ifndef MD4FileChunk +#define MD4FileChunk _libmd_MD4FileChunk +#endif +#ifndef MD4Data +#define MD4Data _libmd_MD4Data +#endif + +#endif + +__BEGIN_DECLS +void MD4Init(MD4_CTX *); +void MD4Update(MD4_CTX *, const unsigned char *, unsigned int); +void MD4Pad(MD4_CTX *); +void MD4Final(unsigned char [__min_size(16)], MD4_CTX *); +#ifndef _KERNEL +char * MD4End(MD4_CTX *, char *); +char * MD4Fd(int, char *); +char * MD4FdChunk(int, char *, off_t, off_t); +char * MD4File(const char *, char *); +char * MD4FileChunk(const char *, char *, off_t, off_t); +char * MD4Data(const void *, unsigned int, char *); +#endif +__END_DECLS + +#endif /* _SYS_MD4_H_ */ From nobody Fri Aug 29 15:05:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD1lm32M0z65gmG; Fri, 29 Aug 2025 15:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD1ll61Bvz3txd; Fri, 29 Aug 2025 15:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b1P0RwX5jPuaZn//f3iq1bURcV6NMYb8zgQwZ7PZjJY=; b=gco1UuP10zMBLmdl4VG/F/dwoNzxmpglihYRW5AKKVpb02S3oIdHkIEkxNPlAOY9An2f3x BxZdKfWmKT55t0YLGdZFBM812oB4lbJz8oluQRjLdF5c9GmoOcVwSdR4zTUnppcHyR9rm8 iJ0QhY8XPglJ64x7j4h/ddA1+RZYvrmPWaN92JqgA+oSd6iBtuTuEnrfiWp9W/wQCnID8H Xors/U9/ym2/ob0pFiO9hHSLJNkBoE9yVn+jGBV96/eg6ZC+Cuqm7+vVPu7Pi6A3AaOQFC GONjwCfki4dxMfTXEQWUqRa7DKw/8BN5Ox4jrcSouFd7BBVM5j7C8+x0WlsPFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b1P0RwX5jPuaZn//f3iq1bURcV6NMYb8zgQwZ7PZjJY=; b=RaeqC0ZA4EVvzSTzOLThZ8bbBtBMmgdfkLtW5tXoUWnCSf15OmeAw/JDJ/WNWoNCCcp3Pg 1ZhMCrHyLPo+j7PHmGqBbnaieal7yS5R5UOa32RGm3el/8Kte1JWdVka7TadkP5ZbgsEHj mD04LMvwmxpu7F4d7Wqz9DFLu3DqRSk9DSXQtGZlxuxTdEWicPfJiMf0y1BUDqgl1V2xuz HvYEJuYACMumk+E5DPAHdkay1vHwUnc+W5zdnF02Gf0NG/7QnEw36WGVXNlSnWSAbEvo7N f88r8oxkYsuoa5AwZtxHgp2I/8F1kGEZvsOtwks5IPMt8qbDGI6+Kwt2PdAtLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756479907; a=rsa-sha256; cv=none; b=IrooHvWLdZHAjuLKE5pShCjjBgwtbyQU//MZol+RZ09DRZ51WGQBl4nw2nEmvjr+FgzDOw tVj3MSWX9ywTiChbcPO0/6OSpsYjIjiQ5mLyFF1BRtOVEPmCuZq5Bk6hlTYrIDAtrzcLN6 1HKXYX8rCEgcGLbSVBUqOdpkGBuqVuV2ZrEOF7Enowh0IylG8/G3EXQ0O6lFWBTCX3NQ9f sZwT5RPhqFr1f40NbZMDTZofoLa3LcDrd346X6dy2jkofIGgldIr1/p+OVgc7IFIYpnbAo 0YeNZAdyegO21N0FFft3vIoEIWvw9gaIpt/zqvL6ZTn4KlEylqH9tZzvwdKgWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD1ll5Xyvzlnk; Fri, 29 Aug 2025 15:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TF5743080564; Fri, 29 Aug 2025 15:05:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TF57Fh080561; Fri, 29 Aug 2025 15:05:07 GMT (envelope-from git) Date: Fri, 29 Aug 2025 15:05:07 GMT Message-Id: <202508291505.57TF57Fh080561@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: d52dc0b4bf6c - stable/14 - flua: lposix: add fnmatch function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d52dc0b4bf6c2fb34b4a9ab614247b7c5524ff32 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d52dc0b4bf6c2fb34b4a9ab614247b7c5524ff32 commit d52dc0b4bf6c2fb34b4a9ab614247b7c5524ff32 Author: Stefan Eßer AuthorDate: 2024-10-28 15:22:08 +0000 Commit: Ed Maste CommitDate: 2025-08-29 14:57:36 +0000 flua: lposix: add fnmatch function The fnmatch function matches a string against a shell-style filename pattern. It is a complex function and cannot easily be implenented using regular expressions. Adding fnmatch to flua increases the amd64 binary by less than 1 KB. Approved by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46849 (cherry picked from commit f35ccf46c7c6cb7d26994ec5dc5926ea53be0116) --- libexec/flua/linit_flua.c | 1 + libexec/flua/modules/lposix.c | 41 +++++++++++++++++++++++++++++++++++++++++ libexec/flua/modules/lposix.h | 1 + 3 files changed, 43 insertions(+) diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c index 13c2c7fcc52f..9d712066485a 100644 --- a/libexec/flua/linit_flua.c +++ b/libexec/flua/linit_flua.c @@ -56,6 +56,7 @@ static const luaL_Reg loadedlibs[] = { #endif /* FreeBSD Extensions */ {"lfs", luaopen_lfs}, + {"posix.fnmatch", luaopen_posix_fnmatch}, {"posix.libgen", luaopen_posix_libgen}, {"posix.stdlib", luaopen_posix_stdlib}, {"posix.sys.stat", luaopen_posix_sys_stat}, diff --git a/libexec/flua/modules/lposix.c b/libexec/flua/modules/lposix.c index 4422d54917e1..2e8e9bfc389e 100644 --- a/libexec/flua/modules/lposix.c +++ b/libexec/flua/modules/lposix.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -173,6 +174,23 @@ err: } +static int +lua_fnmatch(lua_State *L) +{ + const char *pattern, *string; + int flags, n; + + n = lua_gettop(L); + luaL_argcheck(L, n == 2 || n == 3, 4, "need 2 or 3 arguments"); + + pattern = luaL_checkstring(L, 1); + string = luaL_checkstring(L, 2); + flags = luaL_optinteger(L, 3, 0); + lua_pushinteger(L, fnmatch(pattern, string, flags)); + + return (1); +} + static int lua_uname(lua_State *L) { @@ -471,6 +489,11 @@ static const struct luaL_Reg stdliblib[] = { { NULL, NULL }, }; +static const struct luaL_Reg fnmatchlib[] = { + REG_SIMPLE(fnmatch), + { NULL, NULL }, +}; + static const struct luaL_Reg sys_statlib[] = { REG_SIMPLE(chmod), { NULL, NULL }, @@ -515,6 +538,24 @@ luaopen_posix_stdlib(lua_State *L) return (1); } +int +luaopen_posix_fnmatch(lua_State *L) +{ + luaL_newlib(L, fnmatchlib); + +#define setkv(f) do { \ + lua_pushinteger(L, f); \ + lua_setfield(L, -2, #f); \ +} while (0) + setkv(FNM_PATHNAME); + setkv(FNM_NOESCAPE); + setkv(FNM_NOMATCH); + setkv(FNM_PERIOD); +#undef setkv + + return 1; +} + int luaopen_posix_sys_stat(lua_State *L) { diff --git a/libexec/flua/modules/lposix.h b/libexec/flua/modules/lposix.h index 9d2c97b0d2dc..da7079056826 100644 --- a/libexec/flua/modules/lposix.h +++ b/libexec/flua/modules/lposix.h @@ -7,6 +7,7 @@ #include +int luaopen_posix_fnmatch(lua_State *L); int luaopen_posix_libgen(lua_State *L); int luaopen_posix_stdlib(lua_State *L); int luaopen_posix_sys_stat(lua_State *L); From nobody Fri Aug 29 15:06:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD1n05b9Wz65gmP; Fri, 29 Aug 2025 15:06:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD1n04vPTz3vwd; Fri, 29 Aug 2025 15:06:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZr+aVQcT2hGujHHFBfd6Ysd89KCPq8NRkXIiXb/Mlg=; b=NofaZ00/iFDH0cN4bNa5WLsph1ki6H0tggBuM0NAZ7MwIoMV2DfL+eL12H59rWyUvbhQlD RSuqbEUX2WcCH0RMp+NBi8JeIpIQkYlQtwGVmZo4x+OU7FDIwvSBZ0FRSazJB4XNAYzjgK 6MtlHC1fKlrHxnq8ndqHb/bDrIr83UD76qvY/k3L54HaRdN9eRU7UPzgwfprss8mEzRnO1 FAGssSOE5979izFyK3xqsKNXN9fMhJ4iVmkc4703KvQeRzry6Ebt4oLVj0d+Qvb7L1RU4J BoIRvDbRFSjOudDekLPMmkuMKRR1dqkAoCO5d6f0whhV5n0E5qTBfAoP+Ype4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZr+aVQcT2hGujHHFBfd6Ysd89KCPq8NRkXIiXb/Mlg=; b=MoW+v/Y2zaW4y/z0vpH2pq1U/i3BPxHpEIvD2XWWePbxPUyH8LLgkGAc+0qTon97JIM7Fu tgmKXaTyAdtqiZmXFp5zX/Br+wycr+Wm4aa4ZeusRsisL3CDSSRpHFdvcypZhhLKq1Eqy4 xn18i5Q/ZqMeWSxrPXyroudyAFVUcpZ04BgSubIc9qi7Wi6eO6dD+T4YyVl9TKnhjsQNua cPv6pUgSRHNNjYwhWN82Lb/lSACiuPiqgeJaQ5AzMtXLJ3kHzosKEA7vQDhfcESP1cIUiD rwJnx7HL3ROoZ7CjhSHSpi6tkffqn1Xkw6eZBZctptHBaTdT2E3vhLALCNPHMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756479972; a=rsa-sha256; cv=none; b=jTg5klGCKStw8sjqYtuoQGqQOB2iD67eUrP/42OotovbqiYu2QGW+W1ZyU9M3cFk0s5tLu idhIMo1celThFywHVYEKiLxJs9cp/bWA5X8sX7aPv7xFNE9FmM+3fXIV5hc6Ux9xArhD4Q cQpt7OoZ/mGz6vrBfvOWMA3hS4ZfN3u1ha8V8xzPwHmZj60EpQr9hjiqgAUSJ0AR4DA5Gd OiTUdE37LmEeRMfoSs0CfeeRknGQRfP6ISpX46jbQggH0mZIjYUb+8zuBVqnnWuM2RU02Y DTLuuuX2eCTJMrk29FwUm+qYJdijh70iyu5cDPEaDlB2deQEoXQkd81aJDvU0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD1n04QdVzlYb; Fri, 29 Aug 2025 15:06:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TF6CbK080947; Fri, 29 Aug 2025 15:06:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TF6CFm080944; Fri, 29 Aug 2025 15:06:12 GMT (envelope-from git) Date: Fri, 29 Aug 2025 15:06:12 GMT Message-Id: <202508291506.57TF6CFm080944@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: f5f07b9c8912 - stable/14 - asa.1: Drop SEE ALSO reference to long-gone f77(1) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5f07b9c891253187fedff27228f54eca66ffd31 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f5f07b9c891253187fedff27228f54eca66ffd31 commit f5f07b9c891253187fedff27228f54eca66ffd31 Author: Ed Maste AuthorDate: 2025-07-24 17:23:26 +0000 Commit: Ed Maste CommitDate: 2025-08-29 15:05:52 +0000 asa.1: Drop SEE ALSO reference to long-gone f77(1) Sponsored by: The FreeBSD Foundation (cherry picked from commit 58d9d2f8daef8f646372efd6e87a7d4f5e05656b) --- usr.bin/asa/asa.1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.bin/asa/asa.1 b/usr.bin/asa/asa.1 index da1af0e8ce84..68d0735774a6 100644 --- a/usr.bin/asa/asa.1 +++ b/usr.bin/asa/asa.1 @@ -84,8 +84,6 @@ To format the output of a program and redirect it to a line-printer: .Pp .Dl "a.out | asa | lpr" -.Sh SEE ALSO -.Xr f77 1 .Sh STANDARDS The .Nm From nobody Fri Aug 29 15:06:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD1n16jcdz65gmQ; Fri, 29 Aug 2025 15:06:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD1n15LGtz3w4f; Fri, 29 Aug 2025 15:06:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=741rr+KDO6cm7to84ew/gnFwbyiWkK3MGCdt6MFfTqo=; b=aHHPExYHiuccVdGj8AIPjVpQiii9ZUXoQ+kV4nOKnhUo741XGGW4L1ZYT+JWerCro8gKE+ WFDPCdMEEIVajPhXWOQdG6XxNimd1JBXc4c+GznmDSOon1GFccGB8lrXdlQjXLzyjk+rPj onHnLdd547+PvnSUN25SVjUGk/knl9WBDLKFu4Dp9EoYI+wKWw5S1FIRreWXIHXVum2CHo gcixcY8QXbsfwftD79JNqPef2AM54R7EkgxpCry/qoTRm48/OV3j/k8F12APFYPrZIAAQP 9QgPyaLgCWAade+ZfmPYesbjgd/RAivkExvsxFCvxRXQEgWwyVoWgiG9kzZ6MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=741rr+KDO6cm7to84ew/gnFwbyiWkK3MGCdt6MFfTqo=; b=KIqR05ZMq/uBw6v7/naqXIoiiws4oZMdGCFq181CKN8L3RLeVl4m0/ck+fWGnTiIgCiyWJ DUQgRAKD+wooeFMKTlZAsXQV8IWNT/sFAzkdS3s4qmXEp2aGiSndX6zm1CSeLkcrnLqdgj C1OleqCAxGlplRLIr1GFHrCUgzTh1vrDlSKHOFodj83in1UGxQkKm6IrBeL1/17Rob/KSg 0SYpp1yN/hTWhGnDakTRdpN3UoRF6VH/cIxgSorw5UDdDwxDKG5krOL2hKl6LnT/67qc1c vDxly4r7QFReZXt5PNwc7rXJSsifWOY8dgwSSCETdNpGBndJHLut1kI6LPEF5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756479973; a=rsa-sha256; cv=none; b=e84t0d56LPmqV+1dYfslxEmSXyZcBRkaNl39a8VZuVg7BMOghjCkTJspls3TDg+c7BVPOy CVvz0tpGRPF8h9KRWrpa5CqYugLmfbtVx0XHJlkbuH4zTq3hruE9xWZ/CpOj1pmQS1N4fL yo1VVngsmAM51Oi+i17GmB/OV14xhXIHOqp1HSdEmLFkhamxJqgcfdSfXeo82DtGNL6moN mXe7YjJaq3kfA+NToDpz9PbRURbC5aT53CMLxLBt2pcHnMbjBYLG4zp5w30l/Z+/7ZHT7N /EkbxT5arUmPu3QENWyaOwvAlkeR/vPwvGf6LaHL2NsWlzHmCGAeHtqHhwTK7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD1n14vVczlmR; Fri, 29 Aug 2025 15:06:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TF6D33080979; Fri, 29 Aug 2025 15:06:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TF6DO3080976; Fri, 29 Aug 2025 15:06:13 GMT (envelope-from git) Date: Fri, 29 Aug 2025 15:06:13 GMT Message-Id: <202508291506.57TF6DO3080976@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: 330dca227fd9 - stable/14 - rpc.h: Remove reference to unimplemented DES ioctls List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 330dca227fd9bcb3d8167a3cd1af7fa5f6df3c41 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=330dca227fd9bcb3d8167a3cd1af7fa5f6df3c41 commit 330dca227fd9bcb3d8167a3cd1af7fa5f6df3c41 Author: Ed Maste AuthorDate: 2025-07-23 13:59:01 +0000 Commit: Ed Maste CommitDate: 2025-08-29 15:05:53 +0000 rpc.h: Remove reference to unimplemented DES ioctls We won't be adding support for hardware DES. Remove the #ifdef notdef block. Sponsored by: The FreeBSD Foundation (cherry picked from commit c143ffbaf787f6c1d7fcbae8f5d9299182ff0b85) --- include/rpc/des.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/include/rpc/des.h b/include/rpc/des.h index 4c3ca16e8e39..581944475a03 100644 --- a/include/rpc/des.h +++ b/include/rpc/des.h @@ -57,26 +57,6 @@ struct desparams { # define des_buf UDES.UDES_buf /* otherwise, pointer to data */ }; -#ifdef notdef - -/* - * These ioctls are only implemented in SunOS. Maybe someday - * if somebody writes a driver for DES hardware that works - * with FreeBSD, we can being that back. - */ - -/* - * Encrypt an arbitrary sized buffer - */ -#define DESIOCBLOCK _IOWR('d', 6, struct desparams) - -/* - * Encrypt of small amount of data, quickly - */ -#define DESIOCQUICK _IOWR('d', 7, struct desparams) - -#endif - /* * Software DES. */ From nobody Fri Aug 29 15:06:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD1n30G97z65hFJ; Fri, 29 Aug 2025 15:06:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD1n25xLDz3vwn; Fri, 29 Aug 2025 15:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KzHylSNJj6yo05bRjlBkrh3HeYjk+fY4+TQfa9+HGDE=; b=cbXZBdz48xhfPIOvdYjFU2+heys+g9wZsgginog58kmNcvCKy9s1CtHXu3Z+BihYuQw0gI wqXcGBfWUA46AcfhdneBVkswbTrF5apw2hV50xTpaweWzU8cfVvudvGfWr52zydJSp/gPY HfESzeoie1VoiQ5P/6GOGGbzMZ8sGwdDuzwqTCVq4+Ugi9Emy32CAPgD18WhBuC3GuM+56 07oxS9vZriV3Fe6B0f9IdHAHSqMsgBpu0cDfSnjJvBxFrTSBdL4UWBCDOQr4bu/Yl3ranC je0TwPo4OTKaaWdUJmL3AMQyA/5a6IQAgICkWnqhk4nbAniYXpeNunQZ0syshw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756479974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KzHylSNJj6yo05bRjlBkrh3HeYjk+fY4+TQfa9+HGDE=; b=ihpQTw8D0c7jMtFDsyifpjFLvG+ZFY66pn1qWYtb58hPPOFjdtipS693lVUmh0VjyrHmVb 1naeFwYSQ1/E1mwTxUZoiIP5STt4Lon0NfX6bk5J2BB1b5Fqufcpzb2kU9RhnJCsVLWNXk GQj1XPRE5xck4jwUhq7R6EiUi0Vvx5bnVu6km3htbwMmTOI3JeuCJhLjZt5BLUwPuKViNs 06IV/wm42nWQLQiWMRgceCkzhyYABlzvcTMpXxXL1heKfDuBCpaDZq+DtBQyWw+jdxD9zZ uzFCMfe5Vlo5AkMtDBN650QFnv5W8rL9A3JBKWJzrJ9VMUYT3SOQugVchbyAvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756479974; a=rsa-sha256; cv=none; b=ZfBb//E43ITux438Sedx/RYrd+Ihubj7wZqnM5TrNx4KGhkpAR0PNp9ig59Wuk60vHs4VL 0ZJIMEOjVX7/EcndtC5o8XT3128W9noD4z38U6aIg/VPdJmZStpNdAZS1cC2tZzBHfJwo9 kXnG2e6FfabX+KSJBd/TiY8xlLVoMx6Jd4ifZUy5GJo7tsBXVEkl3DIu9rw4hhAs0/BOW1 C3lhj8XLMl2emyfSjjYWH+qxMX1Dy/bXC3PvnWVfXLWYwvTFNfobpZ6EntkKLSK1QVe+8K Scq9TTPsYnsUtv8s3WQ5TsvDkC+xbQ4rL84fkTjkWDCwU9dEybkZhOev/TScmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD1n25Wrpzlc0; Fri, 29 Aug 2025 15:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TF6Emw081013; Fri, 29 Aug 2025 15:06:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TF6EL5081010; Fri, 29 Aug 2025 15:06:14 GMT (envelope-from git) Date: Fri, 29 Aug 2025 15:06:14 GMT Message-Id: <202508291506.57TF6EL5081010@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: 05459c1b860c - stable/14 - pom: Cache tzdata before entering capability mode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 05459c1b860c086ada0cacb398fa5d61a240e0ca Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=05459c1b860c086ada0cacb398fa5d61a240e0ca commit 05459c1b860c086ada0cacb398fa5d61a240e0ca Author: Ed Maste AuthorDate: 2025-07-25 12:13:39 +0000 Commit: Ed Maste CommitDate: 2025-08-29 15:05:53 +0000 pom: Cache tzdata before entering capability mode Pom uses localtime() so needs tzdata available. PR: 278574 Reported by: Tatsuki Makino Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51521 (cherry picked from commit 0fde36fe04b2b656a2215f7dad07a52884e8dcfd) --- usr.bin/pom/pom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/pom/pom.c b/usr.bin/pom/pom.c index 01370114f36e..4c648c359ef9 100644 --- a/usr.bin/pom/pom.c +++ b/usr.bin/pom/pom.c @@ -95,6 +95,7 @@ main(int argc, char **argv) err(1, "unable to limit capabitilities for stdio"); caph_cache_catpages(); + caph_cache_tzdata(); if (caph_enter() < 0) err(1, "unable to enter capability mode"); From nobody Fri Aug 29 15:07:24 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD1pP1tRXz65hNC; Fri, 29 Aug 2025 15:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD1pP1JJtz3wV4; Fri, 29 Aug 2025 15:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756480045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ff/X6A2aM9x3Kqtj1yUdHmKuFtUF0Or/cbNc4wPCqY0=; b=mRr/Ewq490aw0rF80gKD0/G6/SO04YuVs8lq6QWPQsySJ5zKw1th6hOfU3aBGHDdL2ShS2 vcO+GxDUMze3WQsvDslWfmX2TMrhtieR3KGljGQAr9ic7PcdCqsLMebJDLAOyBq20QM/9H 9FalrJNVagjcx9BzPANowS1Iy9Q0Rzpe/jv+1pxQh4KyVgh17HEc3iPn2gxvqpBAN2pGm3 uVxDQlNhi6pp0/yI2VxDOVOE9QCArYuvtZz10ZhXPSH3lmLdceCIqdciwLx2cyIOFAEtTq QwRqd3zp/zeCHaEhmMf0iXA6bTBPvST3ZqINormCC9HHrzahZdkU9Uif5TOpTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756480045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ff/X6A2aM9x3Kqtj1yUdHmKuFtUF0Or/cbNc4wPCqY0=; b=J4dijYUFqKL8hGdG+MXhbcgcvYaRMq3+QwQkuJaO5QHQDmMhMi5AeDHJxtYIEteE/69IC8 ydAbrzIVf38m90cBlbFbNPCLkI0mPsrvqlmPxTofWgjXvFPygEbplcSvA+3cl4543zRMnj lHZdLie6wpdW+SIZNgc2GeroXoe0gkSk+PQ4rekb9xw8vbN/pqw9z1mDFUKwmHuZwa8l+f 935qNj36WDfHM2T6NrGPma6XjOIwMR9ZuzbAoAunZ4l4fPhbwfgQw/YMGmVEcByidQWYm3 JDyEkmm5AL4e1i4NiUVoJdYQ/Rttiq8pP5DpYUu3O/8lccJRNK0aT44UmQ0h9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756480045; a=rsa-sha256; cv=none; b=NFE3fJXWsOobZk5d/dWFFYaxOeC+uVY7c+6uDRJhEmPI0lUCxrq6BG7T3k0WAoqbrismOM 0dux//dMIjgBeoKjEXegRsZEI+9EhRv+jNWlYSOKist/qzDKMSi+1B+tYTX45depyvpLDC KYnvKl65ZhX3+ymAAP2bVGSeRhWAQ7DXFKK1XVBm9ajKbciOhD8hb+e2/ixQ17YirjcpXW MuwQ/Bx0TODTIgSkvFflhj3+T3CHFhWluQ+4U5LzKKiMxO+Nq8I0K4l0oqTBJKfjgB64Oz 1BuKdxBUIwzFCiyHrIwgfW2eHcdmXGJSw3AdESKy72nlFcYaTvnqrx9rwWWubw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD1pP0k83zlNF; Fri, 29 Aug 2025 15:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TF7P2j081391; Fri, 29 Aug 2025 15:07:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TF7OAr081388; Fri, 29 Aug 2025 15:07:24 GMT (envelope-from git) Date: Fri, 29 Aug 2025 15:07:24 GMT Message-Id: <202508291507.57TF7OAr081388@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: 1105ee91f45a - stable/14 - ssh: Reduce sshd_config diffs against OpenSSH 10.0p2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1105ee91f45a8c7e4141a295a57a478ea0dee985 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1105ee91f45a8c7e4141a295a57a478ea0dee985 commit 1105ee91f45a8c7e4141a295a57a478ea0dee985 Author: Ed Maste AuthorDate: 2025-07-29 17:20:15 +0000 Commit: Ed Maste CommitDate: 2025-08-29 15:06:47 +0000 ssh: Reduce sshd_config diffs against OpenSSH 10.0p2 Upstream had a poor description for KbdInteractiveAuthentication prior to the 10.0p2 release. We use KbdInteractiveAuthentication for PAM authentication, and we replaced the poor description with a note about use by PAM. In 10.0p2 the upstream description has been fixed. Incorporate that text now as it is an improvement and avoids a conflict in the upcoming 10.0p2 import. Reviewed by: jhb Sponsored by: The FreeBSD Foundation (cherry picked from commit 8be24d80adb4ba998240c1b5e20e678852dc0a05) --- crypto/openssh/sshd_config | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index a17484b1da2d..88c93386db65 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -56,12 +56,15 @@ AuthorizedKeysFile .ssh/authorized_keys # Don't read the user's ~/.rhosts and ~/.shosts files #IgnoreRhosts yes -# Change to yes to enable built-in password authentication. +# Change to "yes" to enable built-in password authentication. # Note that passwords may also be accepted via KbdInteractiveAuthentication. #PasswordAuthentication no #PermitEmptyPasswords no -# Change to no to disable PAM authentication +# Change to "no" to disable keyboard-interactive authentication. Depending on +# the system's configuration, this may involve passwords, challenge-response, +# one-time passwords or some combination of these and other methods. +# Keyboard interactive authentication is also used for PAM authentication. #KbdInteractiveAuthentication yes # Kerberos options From nobody Fri Aug 29 15:11:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD1v8744Rz65hb5; Fri, 29 Aug 2025 15:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD1v853KCz3x7P; Fri, 29 Aug 2025 15:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756480292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pg6oGGShU+bC+IHBIYroihuqVQJj8I0DMUHfjb8ntFQ=; b=gOn56KWZbp5RCRCqziJJTfVf1O6UlsVgozTQiAJj4SlXU5PI9uYzKxuPi2toYOeouuuiCQ WllCE7EqX4OeplDLUxdNURi7HkUrEARgeNUWxZpWgV+FvVjEAtkOxSu+piIPbRThHK1iT6 eayqdifozj3F+xdGCVnACQckUgy+Y4Kqcyji8jl5gGGg1pOombAm+3fSHA9kMA3X47q+Lc huqeb0oAJApQFVMvUf4htg/4MJ1H5vllQE0Fdg8DV1qP1pO7/tijmPzEiiGKZoTEPtFP0W FEXNOR2xvjhC/OSNslh5ZZrFxiKG+yUAuV/P/qn051FKVDAfyFhmdEiaNJpKvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756480292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pg6oGGShU+bC+IHBIYroihuqVQJj8I0DMUHfjb8ntFQ=; b=DXiWXQz0xIElHS1RlBYFNX0xOc2XuIf1bSW6XhFHTTuClhJwQdoD9Y4nUmLq4SSo1tRP6a tg6Jo09Y89WkumQ7ph8jp2Q9dYlXKNLwf1P+zx8Gl8xLJE7c/x7PTPp7Ef+Zc0r+8KUv5c myM6Izrgik3Gl/dZv+hRFiXQbQgtGoXsvBDY/nYFvCwH84G9TiSO9baXbmS0Qyj0vaC+3h Go/KnW7NlhQAsOGGGGdnpGdpepMOSLZhAhAVV+GDK/PysjKIUBNL4fLcCLOioauBxi8cbL KhT2UvexmofTkIRhRpkUOkue5H+kVBuRk7f0AtK7ZonQGK1bPQpCL1YBzY52pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756480292; a=rsa-sha256; cv=none; b=fTu4aR5lLf+1800YMFO/E79MPGktichd3HXzzUyVjFk4m/KOD1TFbRBWIwvhgF8NyJb17z SLbED2RzGwKgjZTN8/3A7h/DhQmjVcDBuMoMPYQwl2Sge83moGok0lZx05hrExYU7XA9rE t/l8crdo6wTaZqTAAb6vdZNV4+2fU2Cu8E01MKDs18A2PUPqkElBr0YUoc+l6iV6cL+qaM OciK50Prgxh/pFXXuSEsAtmbs0/iJa0MW4wejH62yuYVF2qIsTYQtE80IOaX7+9sdFTvta pOEJ5IQJ+dCZHb6Q/RvONk/1qdL46ylTBzL+RU3aYsw8CSqXkLZz7HFzYv/vfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD1v84cfXzlcW; Fri, 29 Aug 2025 15:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TFBWbR093272; Fri, 29 Aug 2025 15:11:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TFBWgY093269; Fri, 29 Aug 2025 15:11:32 GMT (envelope-from git) Date: Fri, 29 Aug 2025 15:11:32 GMT Message-Id: <202508291511.57TFBWgY093269@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: 2e6697c8d90d - stable/13 - pom: Cache tzdata before entering capability mode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2e6697c8d90dd812a288031dca253f863602da3f Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2e6697c8d90dd812a288031dca253f863602da3f commit 2e6697c8d90dd812a288031dca253f863602da3f Author: Ed Maste AuthorDate: 2025-07-25 12:13:39 +0000 Commit: Ed Maste CommitDate: 2025-08-29 15:11:18 +0000 pom: Cache tzdata before entering capability mode Pom uses localtime() so needs tzdata available. PR: 278574 Reported by: Tatsuki Makino Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51521 (cherry picked from commit 0fde36fe04b2b656a2215f7dad07a52884e8dcfd) (cherry picked from commit 05459c1b860c086ada0cacb398fa5d61a240e0ca) --- usr.bin/pom/pom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/pom/pom.c b/usr.bin/pom/pom.c index 01370114f36e..4c648c359ef9 100644 --- a/usr.bin/pom/pom.c +++ b/usr.bin/pom/pom.c @@ -95,6 +95,7 @@ main(int argc, char **argv) err(1, "unable to limit capabitilities for stdio"); caph_cache_catpages(); + caph_cache_tzdata(); if (caph_enter() < 0) err(1, "unable to enter capability mode"); From nobody Fri Aug 29 15:15:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD1zM6rH8z65htf; Fri, 29 Aug 2025 15:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD1zM52QKz3xTp; Fri, 29 Aug 2025 15:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756480511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pAHr1Q1Hgwwql4D5ovxk4yZxxRXAzHqvj6WzfzaLtsI=; b=KtWSpRRga0WIRujJMPb3z3tzziukum3vOmy4Ka4FXUEBFYTxhWvFnY9PvjQbk2KMiUL6JZ FHtG/P5AA2ibTb3LL4q07ecmu95F04MFOaK3c5Mq0BevafDvsU1tNv2YEY6pOYGrYn0llP pbwrYCulCkXZuYKaTs5kykWAk+z0kbG//tdZA6ERxNHhrL9rSNXzyV5NQLnj4ra8cK+jlj s8qQZtbmA3shBaKoQ+qCI7UEMnuOQNLu6u6kkr6Vuf9ajK0NIVDe/I6jS9tSYrWiR9R5io L1g4UX3iXL+9uY2dyM1d5QJgGeR2IfMBuoULe2Jroh3luL7JSRFzpNSZ674mUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756480511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pAHr1Q1Hgwwql4D5ovxk4yZxxRXAzHqvj6WzfzaLtsI=; b=pWxNnsUsR4+CRv9HkUCbJtbdGaNaJixLNMdzX8HJnpkTPcSlEqA5N/5WJH3KkAK0wZGnHo hpqoG6tQE9pX0dqHI0VKzEKdtXacdOtY33rwaBVPpJ9l9V8U3PnkJU1DJd7jHc4R2XoEN/ MxXFeseKZFkLHxTBo4mBJylohHf0Wp4LFxmbhHAhiI7//xxsHGqcyzljdDwxofdI3EBJ6C mFs0pziqVLgRRiR224AVoNCwBNE8VgQFIqKz4vO1uk4GosAVf9S/pEgGkP1kKuGhmMdBNG trJRsKtGzp5QcZgqiMSip/YNpd9E/V6y7vesgWrn6Yh+4hQ2jm1Pjo5Q1wqvmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756480511; a=rsa-sha256; cv=none; b=p0ntGMmerbkk+W3BIRckoVrc5x5Z6dWpwkpIB+L7UKjACoLZPWolL4uJ+7g/1rhhN0TiXE HoNXExydzzWkcHibXywRzWqhINX+ocuEunkqhpUbMUyDou7NvAUZqFoiBGOSOt9zl1Abzl iSdiPEk3dYMcWguBVCP589r6S93QTcWP7+mMiAqbrOh39JKxIC4Nh8cAFjDoYREAeHgHcp JXwkjs3e3aCVBDN0H2abG2X83FwUYfg2Ebqc0df3O2Rdze8bMg+sGUKdpC+tqM05XOvvOc lBDw+VeM3jWHfHNe1XknUnBVNROYgwU4x8Zvt0nkV2iU9YazQYymrnk1B48vcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD1zM4Yt6zlrn; Fri, 29 Aug 2025 15:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TFFBQ0099040; Fri, 29 Aug 2025 15:15:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TFFBdv099037; Fri, 29 Aug 2025 15:15:11 GMT (envelope-from git) Date: Fri, 29 Aug 2025 15:15:11 GMT Message-Id: <202508291515.57TFFBdv099037@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: 6ecbe4478566 - stable/14 - Makefile.inc1: Fix typo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6ecbe4478566d94bdc1a76a517927129210428e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6ecbe4478566d94bdc1a76a517927129210428e2 commit 6ecbe4478566d94bdc1a76a517927129210428e2 Author: Elyes Haouas AuthorDate: 2024-04-11 17:40:04 +0000 Commit: Ed Maste CommitDate: 2025-08-29 15:06:47 +0000 Makefile.inc1: Fix typo Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/882 (cherry picked from commit f092a54fdc6d394d510451ed0429f78abe0f3a55) --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 48245b06d463..cbc2a226e83b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1064,7 +1064,7 @@ _cleanworldtmp: .PHONY # Note: for delete-old we need to set $PATH to also include the host $PATH # since otherwise a partial build with missing symlinks in ${WORLDTMP}/legacy/ # will fail to run due to missing binaries. $WMAKE sets PATH to only ${TMPPATH} -# so we remove that assingnment from $WMAKE and prepend the new $PATH +# so we remove that assignment from $WMAKE and prepend the new $PATH ${_+_}@if [ -e "${WORLDTMP}" ]; then \ echo ">>> Deleting stale files in build tree..."; \ cd ${.CURDIR}; env PATH=${TMPPATH:Q}:${PATH:Q} ${WMAKE:NPATH=*} \ From nobody Fri Aug 29 16:37:10 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD3nz1mVwz65q9S; Fri, 29 Aug 2025 16:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD3ny6zDYz48tQ; Fri, 29 Aug 2025 16:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756485431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P2ksQtLiugQWLhc9w+uAXTqjx4DJO4NOUb+yjpA6jjI=; b=WKdHKTuUldgM3ERvnbpIElB9mMxOQhemzJToP1UChOLaG3Uu9J92TYHQ49CH4cwdfM+Ttz W9nAL4hn4QoLBy0RcelOnQIYtMAfqJ4Lk28qZipEe8xUw98+QV3HdRcG7avY+3x9lYCcLh G5lJYqPSw3gu8G32JI8KYQlY9f8bZw0AiOY2yR25JjGZdpkSt9+F/FI/IbIXyq5xBB2DY8 EIBUuzVI8Ed20UMXD1D5WkSEK768Ff7XtHxFgZMrkBvggSh3Hk0z3m9gF9mYdHPg59JUId SxkliC0XLT0Ev7rFP9CokFYZr/oSnkoRnuZ5gr2Kx+AqmItwAV83QeN1hZtajA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756485431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P2ksQtLiugQWLhc9w+uAXTqjx4DJO4NOUb+yjpA6jjI=; b=U8tytYcOD2qqWKon6N9zI2Ix9tH8skwrftQZsbSWUe8weK9r6oc9pK44utze/nqrztqdbL 3TLSLSKpEl8OjWSOz9S1o/oRGQt18staP1aKV1K3fNVdmnoeBupU/dh5aJtFgTWDSiZQDL BhXxNJXLftUrSHb1qmbddHRKhj7cqckNH+kGlVh4dbhrovE+RW/mZrQCC4JhCPHo0xSHFN ic8423qWJ7AogIa8owon18v74EyQe7+Jycr6vIRhQxJ7heaxZn6w0uacjs53xfCYuMOz+k tjoMePqe0X6TyJHU8G2mu0ig8PMLlQU31YvP9YxEtO0ODPTKNe9diM687IGzZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756485431; a=rsa-sha256; cv=none; b=FjEjKXuXEFJiROTf9SPqJv+aG3wlQlDHF7qVOEctIsSQJYcs26AxT7tBLSHY7CtmiZ9NpV X0LteBs41U0IrxDIwzOTARucTGQBT/moZnzCsADTbF1xGvWBXj5MX8deZgJgeJkuhnXbml 4v+CnvGuez9HMoe1MNaZBA/TSdIV6WJ2CeXiUHKofputnuY+cJ80u+3bG9FJN+tHQOuBnx e+os4UqlzXDR8RL08aorXJY2uTwBzjkw9NOZMGN1yd0jltdI2lKqxkbI5zaimf5Ct0y/Sx S4wLVjL4avFGqB9DWUtfUW2IY81Vnwe3eD9YK771qJSlDvK8EEyNWRR1IAfCDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD3ny6LtnznyL; Fri, 29 Aug 2025 16:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TGbASo049722; Fri, 29 Aug 2025 16:37:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TGbAWe049717; Fri, 29 Aug 2025 16:37:10 GMT (envelope-from git) Date: Fri, 29 Aug 2025 16:37:10 GMT Message-Id: <202508291637.57TGbAWe049717@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: 9d80d2f34838 - stable/14 - vt: Remove FONT specification from INDEX files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9d80d2f348381dc7b81f099585a90ccbc46790b5 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9d80d2f348381dc7b81f099585a90ccbc46790b5 commit 9d80d2f348381dc7b81f099585a90ccbc46790b5 Author: Ed Maste AuthorDate: 2025-07-30 20:10:44 +0000 Commit: Ed Maste CommitDate: 2025-08-29 15:06:47 +0000 vt: Remove FONT specification from INDEX files There is no reason to change the font in order to select a keymap or a font. This was done in the syscons(4) era to ensure that a font with the appropriate character set was used for kbdmap or vidfont's localized menu, but vt is always UTF-8 and this is no longer necessary. PR: 235565 Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51640 (cherry picked from commit bf426b859bda58a1d6598bb9516ffc6692b2502f) --- share/vt/fonts/INDEX.fonts | 8 -------- share/vt/keymaps/INDEX.keymaps | 8 -------- 2 files changed, 16 deletions(-) diff --git a/share/vt/fonts/INDEX.fonts b/share/vt/fonts/INDEX.fonts index 8a36ccfbf211..dee9e855c42e 100644 --- a/share/vt/fonts/INDEX.fonts +++ b/share/vt/fonts/INDEX.fonts @@ -25,14 +25,6 @@ MENU:da:Vælg skrifttypen til din terminal MENU:de:Wählen Sie Ihre Schrift MENU:fr:Choisissez votre fonte écran -# -# The font definition for "en" is the fall-back font for -# all languages. -# Add language specific font definitions only where required! -# -FONT:en:vgarom-8x14.fnt -# - gallant.fnt:en:Gallant Character set, 12x22 gallant.fnt:da:Gallant-tegnsæt, 12x22 gallant.fnt:de:Gallant Zeichensatz, 12x22 diff --git a/share/vt/keymaps/INDEX.keymaps b/share/vt/keymaps/INDEX.keymaps index b650765d68df..debd8b9790dd 100644 --- a/share/vt/keymaps/INDEX.keymaps +++ b/share/vt/keymaps/INDEX.keymaps @@ -33,14 +33,6 @@ MENU:el:Επιλέξτε το πληκτρολόγιο της κονσόλας MENU:hy:Ընտրեք ստեղնաշարի դասավորությունը MENU:tr:Klavye düzeninizi seçiniz -# -# The font definition for "en" is the fall-back font for -# all languages. -# Add language specific font definitions only where required! -# -FONT:en:vgarom-8x16.hex - -# am.kbd:en:Armenian phonetic layout am.kbd:da:Armensk fonetisk layout am.kbd:de:Armenische phonetische Tastenbelegung From nobody Fri Aug 29 17:03:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cD4Nn0SLjz65rYr; Fri, 29 Aug 2025 17:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cD4Nm6Ypnz3F7J; Fri, 29 Aug 2025 17:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756487032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SG7yyU2hTFnuvGpgWO9SNKNsuR+DITsGoeM2wg49zdU=; b=lPUZCrYC8Yp0PaVonFCDnDW85H3xsMhkbMVvWDvZJHSGna4jlGAZ0E+C14m8kcTJky9Ue9 3OV7EPpGMP+nMnaC1nxQmOi8Uz9hzA70FvoJ9+HTbwYulZ7/5mhKASJCw3BIvRJHnoaw29 sZ5q46bRz0ofwLwrEzNKPHq+h10JReXf3LBdzPYCe7EDDoXQhXvGyXZ6jbYpz6O2ADg1Gy NjgyibWzk8FloarkXoddZJwa+EuWW8IMUpv0a3a7HVf/67Apac+1NSr22MpiBS4AeFJRIk 5/if8Eft2Eq6j5G8M7tlQ1b/D1JDGo1vhgRx608QClAlMtDiC6ITyEI4jkQcQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756487032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SG7yyU2hTFnuvGpgWO9SNKNsuR+DITsGoeM2wg49zdU=; b=MDyqbK3ren482GL3dski8z0Rad6JbcpqSiKCrPV34DXnli8JJBPPjkFWMy/cDYB8KUFc2K Ch4qJfcPPlegDq1V+28PzA62zIWLICxldKfsbvtJhMiE1iBtpktRaw96VX7sKdDZXf0CnK SE3dDlmdQ9unxy3RswmU8CNfYJnN/leigtSmHvH6vi94oi+B0VzlxMzt/QM/c9ZzCfCxff qiQpSbZjrGPN9IsItqkuyeoK+r2rf6EXYHK+NVbFvmkvVB2zLZI5d/to2doP0Lyo0WrZ0o l29NVuAjo5eMDiBXY5ipBVafTtMZG9s4O+fVHWzT3j1x6NevXp7SZV3N7Xt8uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756487032; a=rsa-sha256; cv=none; b=Zml0bTbWu7Vv+b7NrySdpC9pdR53UBJYbTljqBhqHoMB/+jOaWOYkKbJ4QKTUfWIuyGqlF 14Qwq4/+CX4cetsSB+HXDGOuWScP01eXYel+8RtqC6eXotzYogq8ogNr3hBKkC6WYJO+8E QHm+dLjMOtzJ+WS2ge3wNr2k23QP5egnmlCKOD5R+TeMiYzLM4Gwy6d+kmmI+yUpU4ZWsB NEEhtnWKQzbRt3ktolsTX+DdE1bahenmFdaFO4sLgeB26xUlmO/pOVK3NkrGq592NaKOhx NgWZdj1Y06cdU8IYN1oHj9zEVm/BjtXMehNTsBTA+G3DWon2GUtbTUU7JuRA9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cD4Nm63jxznxk; Fri, 29 Aug 2025 17:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57TH3qKV006050; Fri, 29 Aug 2025 17:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TH3qei006047; Fri, 29 Aug 2025 17:03:52 GMT (envelope-from git) Date: Fri, 29 Aug 2025 17:03:52 GMT Message-Id: <202508291703.57TH3qei006047@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: b0e655bc5c64 - stable/14 - flua: clean up lposix argument checking List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0e655bc5c646dd588aef5f92345213316259946 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b0e655bc5c646dd588aef5f92345213316259946 commit b0e655bc5c646dd588aef5f92345213316259946 Author: Isaac Freund AuthorDate: 2025-05-09 14:29:37 +0000 Commit: Ed Maste CommitDate: 2025-08-29 15:06:47 +0000 flua: clean up lposix argument checking The key insight here is that the luaL_check*() and luaL_opt*() functions will happily take indexes that are larger than the stack top and print a useful error message. This means that there is no need to check if too few arguments have been received prior to checking the types of individual arguments. This patch also replaces a couple reimplementations of luaL_opt*() functions with the luaL helpers. References: https://www.lua.org/manual/5.4/manual.html#4.1.2 Reviewed by: emaste, kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50273 (cherry picked from commit 5437b0ff6d557daf6c35e1307a5737139bc12f9a) --- libexec/flua/modules/lposix.c | 111 ++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 68 deletions(-) diff --git a/libexec/flua/modules/lposix.c b/libexec/flua/modules/lposix.c index 2e8e9bfc389e..47a1354aede9 100644 --- a/libexec/flua/modules/lposix.c +++ b/libexec/flua/modules/lposix.c @@ -21,18 +21,26 @@ #include "lauxlib.h" #include "lposix.h" +static void +enforce_max_args(lua_State *L, int max) +{ + int narg; + + narg = lua_gettop(L); + luaL_argcheck(L, narg <= max, max + 1, "too many arguments"); +} + /* * Minimal implementation of luaposix needed for internal FreeBSD bits. */ static int lua__exit(lua_State *L) { - int code, narg; - - narg = lua_gettop(L); - luaL_argcheck(L, narg == 1, 1, "_exit takes exactly one argument"); + int code; + enforce_max_args(L, 1); code = luaL_checkinteger(L, 1); + _exit(code); } @@ -40,10 +48,8 @@ static int lua_basename(lua_State *L) { char *inpath, *outpath; - int narg; - narg = lua_gettop(L); - luaL_argcheck(L, narg > 0, 1, "at least one argument required"); + enforce_max_args(L, 1); inpath = strdup(luaL_checkstring(L, 1)); if (inpath == NULL) { lua_pushnil(L); @@ -61,15 +67,13 @@ lua_basename(lua_State *L) static int lua_chmod(lua_State *L) { - int n; const char *path; mode_t mode; - n = lua_gettop(L); - luaL_argcheck(L, n == 2, n > 2 ? 3 : n, - "chmod takes exactly two arguments"); + enforce_max_args(L, 2); path = luaL_checkstring(L, 1); mode = (mode_t)luaL_checkinteger(L, 2); + if (chmod(path, mode) == -1) { lua_pushnil(L); lua_pushstring(L, strerror(errno)); @@ -83,15 +87,13 @@ lua_chmod(lua_State *L) static int lua_chown(lua_State *L) { - int n; const char *path; uid_t owner = (uid_t)-1; gid_t group = (gid_t)-1; int error; - n = lua_gettop(L); - luaL_argcheck(L, n > 1, n, - "chown takes at least two arguments"); + enforce_max_args(L, 3); + path = luaL_checkstring(L, 1); if (lua_isinteger(L, 2)) owner = (uid_t)lua_tointeger(L, 2); @@ -148,11 +150,9 @@ lua_chown(lua_State *L) static int lua_pclose(lua_State *L) { - int error, fd, n; + int error, fd; - n = lua_gettop(L); - luaL_argcheck(L, n == 1, 1, - "close takes exactly one argument (fd)"); + enforce_max_args(L, 1); fd = luaL_checkinteger(L, 1); if (fd < 0) { @@ -178,14 +178,13 @@ static int lua_fnmatch(lua_State *L) { const char *pattern, *string; - int flags, n; - - n = lua_gettop(L); - luaL_argcheck(L, n == 2 || n == 3, 4, "need 2 or 3 arguments"); + int flags; + enforce_max_args(L, 3); pattern = luaL_checkstring(L, 1); string = luaL_checkstring(L, 2); flags = luaL_optinteger(L, 3, 0); + lua_pushinteger(L, fnmatch(pattern, string, flags)); return (1); @@ -195,10 +194,9 @@ static int lua_uname(lua_State *L) { struct utsname name; - int error, n; + int error; - n = lua_gettop(L); - luaL_argcheck(L, n == 0, 1, "too many arguments"); + enforce_max_args(L, 0); error = uname(&name); if (error != 0) { @@ -228,11 +226,9 @@ static int lua_dirname(lua_State *L) { char *inpath, *outpath; - int narg; - narg = lua_gettop(L); - luaL_argcheck(L, narg > 0, 1, - "dirname takes at least one argument (path)"); + enforce_max_args(L, 1); + inpath = strdup(luaL_checkstring(L, 1)); if (inpath == NULL) { lua_pushnil(L); @@ -251,10 +247,8 @@ static int lua_fork(lua_State *L) { pid_t pid; - int narg; - narg = lua_gettop(L); - luaL_argcheck(L, narg == 0, 1, "too many arguments"); + enforce_max_args(L, 0); pid = fork(); if (pid < 0) { @@ -271,10 +265,8 @@ lua_fork(lua_State *L) static int lua_getpid(lua_State *L) { - int narg; + enforce_max_args(L, 0); - narg = lua_gettop(L); - luaL_argcheck(L, narg == 0, 1, "too many arguments"); lua_pushinteger(L, getpid()); return (1); } @@ -282,10 +274,9 @@ lua_getpid(lua_State *L) static int lua_pipe(lua_State *L) { - int error, fd[2], narg; + int error, fd[2]; - narg = lua_gettop(L); - luaL_argcheck(L, narg == 0, 1, "too many arguments"); + enforce_max_args(L, 0); error = pipe(fd); if (error != 0) { @@ -306,12 +297,9 @@ lua_read(lua_State *L) char *buf; ssize_t ret; size_t sz; - int error, fd, narg; - - narg = lua_gettop(L); - luaL_argcheck(L, narg == 2, 1, - "read takes exactly two arguments (fd, size)"); + int error, fd; + enforce_max_args(L, 2); fd = luaL_checkinteger(L, 1); sz = luaL_checkinteger(L, 2); @@ -352,10 +340,8 @@ lua_realpath(lua_State *L) { const char *inpath; char *outpath; - int narg; - narg = lua_gettop(L); - luaL_argcheck(L, narg > 0, 1, "at least one argument required"); + enforce_max_args(L, 1); inpath = luaL_checkstring(L, 1); outpath = realpath(inpath, NULL); @@ -376,17 +362,12 @@ lua_wait(lua_State *L) { pid_t pid; int options, status; - int narg; - narg = lua_gettop(L); - - pid = -1; - status = options = 0; - if (narg >= 1 && !lua_isnil(L, 1)) - pid = luaL_checkinteger(L, 1); - if (narg >= 2 && !lua_isnil(L, 2)) - options = luaL_checkinteger(L, 2); + enforce_max_args(L, 2); + pid = luaL_optinteger(L, 1, -1); + options = luaL_optinteger(L, 2, 0); + status = 0; pid = waitpid(pid, &status, options); if (pid < 0) { lua_pushnil(L); @@ -428,13 +409,9 @@ lua_write(lua_State *L) size_t bufsz, sz; ssize_t ret; off_t offset; - int error, fd, narg; + int error, fd; - narg = lua_gettop(L); - luaL_argcheck(L, narg >= 2, 1, - "write takes at least two arguments (fd, buf, sz, off)"); - luaL_argcheck(L, narg <= 4, 5, - "write takes no more than four arguments (fd, buf, sz, off)"); + enforce_max_args(L, 4); fd = luaL_checkinteger(L, 1); if (fd < 0) { @@ -444,13 +421,11 @@ lua_write(lua_State *L) buf = luaL_checkstring(L, 2); - bufsz = sz = lua_rawlen(L, 2); - if (narg >= 3 && !lua_isnil(L, 3)) - sz = luaL_checkinteger(L, 3); + bufsz = lua_rawlen(L, 2); + sz = luaL_optinteger(L, 3, bufsz); + + offset = luaL_optinteger(L, 4, 0); - offset = 0; - if (narg >= 4 && !lua_isnil(L, 4)) - offset = luaL_checkinteger(L, 4); if ((size_t)offset > bufsz || offset + sz > bufsz) { lua_pushnil(L); From nobody Sat Aug 30 09:58:34 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cDVvb16CXz66Kq6; Sat, 30 Aug 2025 09:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cDVvb0Yy5z44Zj; Sat, 30 Aug 2025 09:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756547915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uUaAcoO+1hvFohKoGSaa7P6bw5b1gKQKP3nMGmUJRp0=; b=NIeCheKZTAVxc8gqBw4hcgNdfHpwzjMSw5IUuXs4Q3nLDDlX4hHKmkUj2ofEmlDhDfykNV R7yzQOK3hlOXj/d6CvyhAzwLjR1jfNMU57Xu8Fp0FyFSEHqVNtYJeJojdcms8YcI0czqeQ B310oSr6JkETvaFCchhkwk/b6lQRTMYg1UMgnpOa08ZnkrMldCKNXXIc/dXRnoGoul5Xrx DPeHdSWRGOqja2h0oWQT9Q5nW/9eG2Lsaj5fxUSwwhJYfYmloh2AmQVfs5CnHtdtg3YUnR S+WPq9e+esqdVTJElXyUrYRhurHLM/PPZ3WRVw7m7cz2N22ET5K8KUbGnlVngQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756547915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uUaAcoO+1hvFohKoGSaa7P6bw5b1gKQKP3nMGmUJRp0=; b=aB7Ay/M0jWmfuLXHbn0NPpIq7ayjzSfLcYnZUUK9Kg/2UT8L0CYys74HOBoYvyy2KDHO0f EXglumH1mlW1qpaXl/hifiulkeUrleSdS8N/3XQFuGTlmc26djEOWpg8RiwAG7Llrg15U+ k5fOlshulR8vkEu0sAYmU/Q1E5WFdrZUggtbOk8+gC+7mNcw/Mhx67SNrKZsrz67kOuwRm 2PaRM9RgjvsUWz2cvpdSuRnM5Qii9r7BlCUKGnV+JS8CukEEy4ExJKNBVy9HSrxJaWRCmV s/EJ4o0J+4LeSSciV+TZ0Nl5S6bvH9BZW0fSBxYT9qlnKThAvaMksMzexSe2Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756547915; a=rsa-sha256; cv=none; b=g1qWYR3kGSh+tUOsgaUklYik1jRHRPzDV61zuJLEy6sTHMu+bPBBxAZGBjaEtJucDgFR+M iu4BpUHCo55ja/ktBp3r/QpYbdxH3xJ+Jd7GPxQuBbMUR8b8v4Qod2aoTJTBsur/AOupVY KLw63Y+2J3sUq1iJNqK9m7wDFme9OGgQblQceOOkuWml6d6fCKHVdxXBolJj6O4b46kjHJ Gql0KV1dQqgt8Vr3s5PLrIGAfWzeRGIj/VDpZ4D4AFHVK+sKm9APDm3U+g3uaLLxM2MvYB k5epYhGxmTmYV7+3eE01TRSU39YHqr1LhncKyMHCuk+pV2+lmAzUs1yGct4FSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cDVvZ6tvJz5dC; Sat, 30 Aug 2025 09:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57U9wYXR011185; Sat, 30 Aug 2025 09:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57U9wYeG011182; Sat, 30 Aug 2025 09:58:34 GMT (envelope-from git) Date: Sat, 30 Aug 2025 09:58:34 GMT Message-Id: <202508300958.57U9wYeG011182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 99ea229c697a - stable/14 - Merge commit cf721e29c6a3 from llvm git (by Amy Kwan): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99ea229c697a6b96c689ed6d9031527c4d229b06 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=99ea229c697a6b96c689ed6d9031527c4d229b06 commit 99ea229c697a6b96c689ed6d9031527c4d229b06 Author: Dimitry Andric AuthorDate: 2025-08-27 18:51:58 +0000 Commit: Dimitry Andric CommitDate: 2025-08-30 09:58:07 +0000 Merge commit cf721e29c6a3 from llvm git (by Amy Kwan): [PowerPC] Do not merge TLS constants within PPCMergeStringPool.cpp (#94059) This patch prevents thread-local constants to be merged within PPCMergeStringPool.cpp. The PPCMergeStringPool pass primarily merges non-thread-local constants together, and thread-local constants should not be mixed together with other (non-thread-local) constants. In the event that thread-local and other non-thread-local constants are pooled together, the llvm.threadlocal.address intrinsic can fail as it expects its argument to be a thread-local global value, but the merged string structure created by the PPCMergeStringPool pass is not thread-local as a whole. This fixes an error "llvm.threadlocal.address first argument must be a GlobalValue" when building the math/nauty port on PowerPC architectures. PR: 289122 Reported by: pkubaj MFC after: 3 days (cherry picked from commit cb2887746f8b9dd4ad6b1e757cdc053a08b25a2e) --- contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index 309938accdf4..daf6a0e65d54 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -170,8 +170,9 @@ void PPCMergeStringPool::collectCandidateConstants(Module &M) { LLVM_DEBUG(dbgs() << "hasInitializer() " << Global.hasInitializer() << "\n"); - // We can only pool constants. - if (!Global.isConstant() || !Global.hasInitializer()) + // We can only pool non-thread-local constants. + if (!Global.isConstant() || !Global.hasInitializer() || + Global.isThreadLocal()) continue; // If a global constant has a section we do not try to pool it because From nobody Sat Aug 30 10:00:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cDVxY50snz66KhY; Sat, 30 Aug 2025 10:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cDVxY4Bybz45C6; Sat, 30 Aug 2025 10:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756548017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d0DEj7PsafM9IJXpjII12Ekk8uQZw9DZZxnrRRgkCkE=; b=tstFEO+LNfN/fzmRb/X8OXoIrGJPOKsmlujPN/Bxd0T4bZmrLzyzKqp1B+w3sYMo2lpCKV KHXen3CIpauSvtLq9pARmriGQCQxzT+m5S/hHW7Cp2qYp9r0an+ilV4yZiCVYeJ/tJWEsf ScEBG9waSZ1/vpPLZdgmzYeFrpPjdTUktII7svhxV8xogWUCMmu9N96IOV1xSf073l0UI/ KIy7A1R+oX4slKTCkpIJeN1UyKfs9z8SVxpYs/WODAneS7bD9g+qPuFjctZvLaZFoep24Q wwaIw+v8Ncz06aT12OYG/trlvTc0OGhqiW0iJ8b4JuUEJK2IYhP+lQnKSsbtKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756548017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d0DEj7PsafM9IJXpjII12Ekk8uQZw9DZZxnrRRgkCkE=; b=vWU4cp6A3Ixhr0yXnotZ8CBfVWxyO+YdTpm26Wx8eI1Ajq3CizsRAktfBUhOoo1Ht9k84K xMoMpldAYekEUb9Wr6G14BfjcQjtoLofkiAHIyWuf48FD1lEFG6OAU1H2mEqVC8IIAd2nO g+NtD8PrBLET0b04DQA038H086Bn7eiWe/ApBgG3t2q7od9v+BLfnmOeHdnsbj47IAS6RB 9irkhdgttJFYgb/01EMCUBe6vY8Pzxwqbj8JDsMnIzjirgNmmmTqNbrCZwazRkcWw0W8Ul lTjhIQkhi5JvGs0YlBCsv2m6V+K3RA4xi3fvS2sA6YXQ6xn0pxEkvMTBT+T8hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756548017; a=rsa-sha256; cv=none; b=QEkSSyTNR5NsRlfVg1YkW/RjOCO//SGpfZk/jRt1q25kkQPGk+I5VVZjgWGjBdrOBVQpXw UTr9ninmHWIpddUcwNKYCvMeUhz5sGggGluD4MSVdn6N9fewCXCK+NK5muqJtZuzrTspOk Sh3WzVhiWGlKGY2akkpQZDFOtFsqhzuQm4gIeQv+Arz0TtMU1XbHxq7hvEv/wCeludUQoJ FjuahmPLfp4eOJHLUw5D6D4NfJ3ECk140ReQuEBpF+6eQhD1YLE2mZ+k0cQjBsF3+I73FR siaKlN10dbBZoK+Jndqg4vULKbK2N/AjqNrkuG0i8lLcfhIg1I/C4fXfjcpgAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cDVxY3pT3z5dD; Sat, 30 Aug 2025 10:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57UA0HBl021039; Sat, 30 Aug 2025 10:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57UA0HnZ021034; Sat, 30 Aug 2025 10:00:17 GMT (envelope-from git) Date: Sat, 30 Aug 2025 10:00:17 GMT Message-Id: <202508301000.57UA0HnZ021034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 17c0ecb14df1 - stable/13 - Merge commit cf721e29c6a3 from llvm git (by Amy Kwan): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 17c0ecb14df1672ddedfab6ce0c8d95b8bdfaf31 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=17c0ecb14df1672ddedfab6ce0c8d95b8bdfaf31 commit 17c0ecb14df1672ddedfab6ce0c8d95b8bdfaf31 Author: Dimitry Andric AuthorDate: 2025-08-27 18:51:58 +0000 Commit: Dimitry Andric CommitDate: 2025-08-30 09:58:12 +0000 Merge commit cf721e29c6a3 from llvm git (by Amy Kwan): [PowerPC] Do not merge TLS constants within PPCMergeStringPool.cpp (#94059) This patch prevents thread-local constants to be merged within PPCMergeStringPool.cpp. The PPCMergeStringPool pass primarily merges non-thread-local constants together, and thread-local constants should not be mixed together with other (non-thread-local) constants. In the event that thread-local and other non-thread-local constants are pooled together, the llvm.threadlocal.address intrinsic can fail as it expects its argument to be a thread-local global value, but the merged string structure created by the PPCMergeStringPool pass is not thread-local as a whole. This fixes an error "llvm.threadlocal.address first argument must be a GlobalValue" when building the math/nauty port on PowerPC architectures. PR: 289122 Reported by: pkubaj MFC after: 3 days (cherry picked from commit cb2887746f8b9dd4ad6b1e757cdc053a08b25a2e) --- contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp index 309938accdf4..daf6a0e65d54 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp @@ -170,8 +170,9 @@ void PPCMergeStringPool::collectCandidateConstants(Module &M) { LLVM_DEBUG(dbgs() << "hasInitializer() " << Global.hasInitializer() << "\n"); - // We can only pool constants. - if (!Global.isConstant() || !Global.hasInitializer()) + // We can only pool non-thread-local constants. + if (!Global.isConstant() || !Global.hasInitializer() || + Global.isThreadLocal()) continue; // If a global constant has a section we do not try to pool it because From nobody Sat Aug 30 22:58:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cDrCC0vnhz66Mkr; Sat, 30 Aug 2025 22:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cDrCC04kpz3PVq; Sat, 30 Aug 2025 22:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756594695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DxxSs7DvCVOlD1lfLFwb2r08qTQRf14JmU1SnYfueB4=; b=xIh9SIerPoAf387crCwKUSi0PF5SydXLNAOQoCX0y+UzhrEFeIm6IsZRPOLejPnqXNfAPw MH5zHzsayQZxmJfk1gmaCm/zNU+sjfNa0ZsIbV2GVgbBg/mbuRfmzF5o4hlTPjz1u6hJ2g l5ayNiJo/Q53PXXObg0AHmLYOGUWTgz668nd0LdL5QEwQzhvpdwQo7oZ7oipml57OhjPYg zh2Vxd7+9F7uN4tSRgJgQQsQrvDh5ZYwc+Kv73zJwaPgmTMq/dgU6QC5kJQ9sHVTisGcgI GZw7qEAPYj3XkKREsRtA/3LTdLvPSrmUygqVuSw1Qin7pwCb80sIoA2llJjitw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756594695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DxxSs7DvCVOlD1lfLFwb2r08qTQRf14JmU1SnYfueB4=; b=BqM9jHMnDkez5keiPwniCVRPXrU+nRSMlVije6wPYCL3LAmJP5lR/RUHNdPtl9i8nnEMGH N/Eo4HpMG+em6DtdL87FwpFUTFMUbTPaiG9OohKjBkOFygeRsMFE9QCsq3u26fwH+OUCPJ D3PGyUGiUIJ60sOvsEV+1GqiqXRKdNSfpmr2x3teuTONvfraYQw2WXxS3oilpz9r10LxgP IH3T5EXX43tBD9VwxjVKALFaT+CnjXdMMck38+3qplInjA+oukQ1bGVs6/suBLeV1JmBd0 byZ4mYtSC5Sa6Cqa9Mawm1Ja3XSJPiyrKklGktmIEX9aoOOaPU1Yr4v1NsObDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756594695; a=rsa-sha256; cv=none; b=EsnXlRymqsQ2ax0xopGQqrDNl8x64vfZYKjrFopw6Kt9KbLuYdEpAZ86z2dYzBxOVrUqI2 Ng5Dmd3RaJHHqtXFjPqP7KjbiErMbwr3aXU7g3TTWg3O/fzFHUhzYMFipvnPc8utvGYtWV 2iUdJ49chLUIbqPEWXggOk7yc/pmDRieRBjNyR/VzjB08uAGaCi2tYLHvnXq2hfvZMJEnw +29r0yblynSz/mg3sXl8iyj7Obabf10Fm57HaBEIss0SlgOcSt+HCo8Lfj66ovtg9CGHV3 r42tAOiIH6KX/UlkP9sPeoI6x25NiQz/9Jfh+q8PCudIiEGl2+SxM8Ixs87rsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cDrCB6nBYzmt7; Sat, 30 Aug 2025 22:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57UMwEKJ080565; Sat, 30 Aug 2025 22:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57UMwEJ9080562; Sat, 30 Aug 2025 22:58:14 GMT (envelope-from git) Date: Sat, 30 Aug 2025 22:58:14 GMT Message-Id: <202508302258.57UMwEJ9080562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 727bc500264b - stable/14 - Bail out of corrupt directory entries during boot List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 727bc500264bffc48b699a88e00a0baa14cbe73d Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=727bc500264bffc48b699a88e00a0baa14cbe73d commit 727bc500264bffc48b699a88e00a0baa14cbe73d Author: Kirk McKusick AuthorDate: 2025-08-22 05:33:48 +0000 Commit: Kirk McKusick CommitDate: 2025-08-30 22:56:26 +0000 Bail out of corrupt directory entries during boot Reported-by: Daniel O'Connor darius-dons.net.au MFC-after: 1 week Sponsored-by: Netflix Differential-Revision: https://reviews.freebsd.org/D2844 (cherry picked from commit 690ae8a2025ca1ce58d08a90a1df1645c81392ea) --- stand/libsa/ufs.c | 6 ++++++ stand/libsa/ufsread.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index e1d540ed2321..7782ba370272 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -890,6 +890,12 @@ ufs_readdir(struct open_file *f, struct dirent *d) if (error) return (error); dp = (struct direct *)buf; + /* + * Check for corrupt directory entry and bail out rather + * than spin forever hoping that the user has other options. + */ + if (dp->d_reclen == 0) + return (0); fp->f_seekp += dp->d_reclen; } while (dp->d_ino == (ino_t)0); diff --git a/stand/libsa/ufsread.c b/stand/libsa/ufsread.c index 0f9b9bb4e2fb..86ac8fbbbab7 100644 --- a/stand/libsa/ufsread.c +++ b/stand/libsa/ufsread.c @@ -108,6 +108,13 @@ fsfind(const char *name, ufs_ino_t * ino) *ino = d.d_ino; return d.d_type; } + /* + * Check for corrupt directory entry and bail out + * rather than spin forever hoping that the user + * has other options. + */ + if (d.d_reclen == 0) + return 0; s += d.d_reclen; } if (n != -1 && ls) From nobody Sun Aug 31 00:39:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cDtSW21xNz65JC5; Sun, 31 Aug 2025 00:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cDtSW183xz3dJ9; Sun, 31 Aug 2025 00:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756600795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q99hJ0AJaTycRa5gEllpKR7cZRAL++ICGFYbMTlfPCo=; b=UEcc6oj5X1t1OxlqshFww77mimkGwPYmAW5Pk0q33sKsPyiT6zkI1lRATfEhbondHAa12g PAZO7gEoi2eWbwTUWssff6ZEU4KAtkv05p8F8ZO+H2O+aIMnuU+xAXKKilxvGAs0fZRyiH 42eFacbajXjHCckRk3xjTC82o0Hlrdo3OOdktVB63slucDwjkELIkUhrYRkAGEHX8ur1Gb oTYLsvDMkiPxkjywzL9YlvkphvVdaOdC/qDDtwC+Y2SEXaJTCaLVAOSaOnAEiJu3rYmsyd S+zc7ESDD7YZAvnXdyF95sH2cOOX4RNlyucUbhJqyDGY8BJWWR3S7THs8alMzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756600795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q99hJ0AJaTycRa5gEllpKR7cZRAL++ICGFYbMTlfPCo=; b=JZ8TSJ4RuNIB0ghQLJS/l5/wnjoFnMyfRtKcXygotbC3Bopl7Bv5OaOtxo+I6JVIReWzzc cKDJVkRKrWz92JJm37ErxuiHIfYnaJ2M/O6Dtl87BmLVcwSWoN93dSC/n/4d9E73b3+UAC hvJS6BprbsFKHh/MjIy0wzPYn9AtSvDw3EnTWew6ayOH6YY3i1lf9FX1dav1VBQ+opdEaY 7JOfVegjPjVFovt5nPJuNiCgxaCbFtqsRuvfRyWZ4tO/ZSb6RJxNTZcEM8z7bryxqAthth NIruRIuqXx1LDspsnuJr2QdY5UuOsFPsuCxq3aHQ/j45N2vDYHka96AoQK/k7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756600795; a=rsa-sha256; cv=none; b=C00uNLu6YqmHjIKUXnkq9eqKGKpP7Oc4fAIpTqGnzNSH/O0sKLXUOV5xdjUrSLkooKIa0G 7ANkTlOrw9uLZOAI6vkp88QvWokYfncLxSvA4kHw7T1wRKyPWf6h9ROLO9Qbcl8Q5YiUQx 9SAPH1dGzzTIDuXHw06zZpCj5cFX+R3oXcNW1qeGvv23nYfmVrFMeOi+JM9r8lcn4BTBaB WnGoOguRm+PLw+uGKCWqCJe/Aw8RqG81GfgmuZGIOWhJaFKjgBVStNMAXxWOq+eF588jkn BzbjdP2HAJaKB/22jM7nGM7b4JxEBvTjVCE6PBtgnFWu4QuFSC/ox8WwvWEA6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cDtSW0SVqzqSM; Sun, 31 Aug 2025 00:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57V0dsqN070307; Sun, 31 Aug 2025 00:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57V0ds1G070304; Sun, 31 Aug 2025 00:39:54 GMT (envelope-from git) Date: Sun, 31 Aug 2025 00:39:54 GMT Message-Id: <202508310039.57V0ds1G070304@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: f086954950c6 - stable/14 - amd64 vmx: micro-optimize vmlaunch failure path List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f086954950c6ee18a72dc28de31ad348150e418f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f086954950c6ee18a72dc28de31ad348150e418f commit f086954950c6ee18a72dc28de31ad348150e418f Author: Konstantin Belousov AuthorDate: 2025-08-23 12:52:08 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-31 00:38:23 +0000 amd64 vmx: micro-optimize vmlaunch failure path (cherry picked from commit 2b35b717188adb843de100c4221ec1ded13024f0) --- sys/amd64/vmm/intel/vmx_support.S | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx_support.S b/sys/amd64/vmm/intel/vmx_support.S index f393f160b101..2f3871ac7d89 100644 --- a/sys/amd64/vmm/intel/vmx_support.S +++ b/sys/amd64/vmm/intel/vmx_support.S @@ -177,13 +177,11 @@ do_launch: */ movq %rsp, %rdi /* point %rdi back to 'vmxctx' */ movl $VMX_VMLAUNCH_ERROR, %eax - jmp decode_inst_error - + /* FALLTHROUGH */ decode_inst_error: movl $VM_FAIL_VALID, %r11d - jz inst_error - movl $VM_FAIL_INVALID, %r11d -inst_error: + movl $VM_FAIL_INVALID, %esi + cmovnzl %esi, %r11d movl %r11d, VMXCTX_INST_FAIL_STATUS(%rdi) /*