From nobody Fri Aug 21 01:32:25 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hR2qL3kHMz6pSw9 for ; Fri, 21 Aug 2026 01:32: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hR2qL35s3z4Jq2 for ; Fri, 21 Aug 2026 01:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787275950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1bvhqQp3ZZIjW2X9/hORaRmCiU/9Vr1lH96NLB1apw=; b=vDRYWcDPqxFdsrmdJSJEsjpERAmso6slfCOSdls/lSfb04W6K8OPf5nKUT8vf9NqqCaaYr nPwS9OWobO5ILNcs3p6V14N5G8h8jd+2oFciA0OtOrFuWC9e8QyfpijVzbTXneccBspPrO QcxYaGEjqxfsUQz4mCqUEoIitWkS9uJDhxsAaeQtMd5bhFeZZWr6hD7FwR/yAV5OVt5SVn /ljjm2iNQBg58gHJQaUql/dke6MOhMuf+JRKRC+TdEOvrhvlBJr+g3P6AOXq0XrkyAkRUM 91B1HSURXn0JpQdiPyVqOnunyf130CPVVttKbQgCTG7xv6VJgP5hzkHKlilPmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787275950; a=rsa-sha256; cv=none; b=Yh3qRqvGSY7VvB7TEdZRAxy+wykZUbsY3Zi2LRvwK1ZOP+4JKaQ5OX0rnWq7ATol9dwm6H l5KhFx8in5E3o9Q69p7AmMzkfiSBkKxosK3tOvFe6L16WlEAd1jT2OB2qaAqjpfMtkbC7+ rADZ+mBrM7lI5UTqai6iLJYVQS4YSivYOe8FOX3pEbBIx/Sh4c9PBR7LkIk1HY15N5T8x8 c0YQShak0g6KpWDpNEubuISie5UNwrDvXD43NnlE4dDlZg089bQrVLE9aiS4YYnRcitVtv yyCp/CoPdtzVQT+lfYHjiSDBTcEqfBt6Uy8iak8hLu3ivTjWcKLryA+gyQliLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787275950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1bvhqQp3ZZIjW2X9/hORaRmCiU/9Vr1lH96NLB1apw=; b=y0GwVzwhPdJGLYR784xOxsGRMEoHeagGscVLOS/LJlxF2aApRpAe7PZBH7Bs3TwoK/2k4C p8/gSeLrYG+WdkFcmpxfn5b+rUBM6POG5iHN/qKF3bWkyFNF8an4bULhP+VpyWp3g/uLgT 7tCtOT9qfGM0kWkhWW0XwXmG2+XLfjh+85Na6QULEFO41f6FKjwoTeKkY/nO+oDb2YFPFX nAnDB5l2xZhX29jq+q9iLqDHNbcWqVhkrjEIHcBiArGK7wAMYgvD1u4d2A5Se5CS0pvD5B e+F7jtvAokIfPpwIcE8D9SNIwShkrr4e2dDyP+Z0gTVaGmaIMyysFBAgJIG/3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hR2qL1b1Xzj9F for ; Fri, 21 Aug 2026 01:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30b7e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Aug 2026 01:32:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a1aa26b7db2c - main - tests/sys/posixshm/posixshm_test.c::accounting fix after st_size changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1aa26b7db2c774b1da5eecb5505efd412ea7a23 Auto-Submitted: auto-generated Date: Fri, 21 Aug 2026 01:32:25 +0000 Message-Id: <6a87aaa9.30b7e.4b54efd8@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a1aa26b7db2c774b1da5eecb5505efd412ea7a23 commit a1aa26b7db2c774b1da5eecb5505efd412ea7a23 Author: Konstantin Belousov AuthorDate: 2026-08-19 21:53:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-21 01:31:50 +0000 tests/sys/posixshm/posixshm_test.c::accounting fix after st_size changes st_blksize is defined by POSIX as the 'preferred I/O block size for this object.' It is wrong to use st_blksize as the unit for st_blocks and expect it to be equal to the object size regardless of the change of st_blksize. Fixes: 3a1bf59d195c ("shmfd: consistently return size in 512 byte blocks for fstat(2) st_blocks") Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D59014 --- tests/sys/posixshm/posixshm_test.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index e4b57dec6311..08af63ac4a34 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1189,7 +1189,9 @@ ATF_TC_BODY(accounting, tc) ATF_REQUIRE(shm_fill(fd, 0, shm_sz) == 0); ATF_REQUIRE(fstat(fd, &st) == 0); - ATF_REQUIRE(st.st_blksize * st.st_blocks == (blkcnt_t)shm_sz); + printf("blocks %jd shm_sz %jd\n", (uintmax_t)st.st_blocks, + (uintmax_t)shm_sz); + ATF_CHECK_EQ(DEV_BSIZE * st.st_blocks, (blkcnt_t)shm_sz); range.r_offset = page_size; range.r_len = len = (shm_max_pages - 1) * page_size - @@ -1197,7 +1199,9 @@ ATF_TC_BODY(accounting, tc) ATF_CHECK_MSG(fspacectl(fd, SPACECTL_DEALLOC, &range, 0, &range) == 0, "SPACECTL_DEALLOC failed; errno=%d", errno); ATF_REQUIRE(fstat(fd, &st) == 0); - ATF_REQUIRE(st.st_blksize * st.st_blocks == (blkcnt_t)(shm_sz - len)); + printf("blocks %jd shm_sz %jd len %jd\n", (uintmax_t)st.st_blocks, + (uintmax_t)shm_sz, (uintmax_t)len); + ATF_CHECK_EQ(DEV_BSIZE * st.st_blocks, (blkcnt_t)(shm_sz - len)); ATF_REQUIRE(close(fd) == 0); }