From nobody Wed Aug 26 00:48:12 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 4hV5c21mLFz6qKHb for ; Wed, 26 Aug 2026 00:48: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hV5c16TR3z3sRH for ; Wed, 26 Aug 2026 00:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787705297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOCg2d0bBqrwU6sWqx0fZ6l2D9nJ5dxPxtut1yMQL8s=; b=I6HTJqRgNLqDxKz/TDGGHrNwmG57Fv6CP0+5Tc3bBxbsUnaacKblvu5MXvqp+R0nfAPXCC gm8cLpw7VmVbsTZno7r25CzcwApebCxPZ5WYvTmgiwD5vR1zaERSUE+kYxTNcGfm86Oxxg TcX5oX+SqfFc63EP6iZmYy6+RLmu5NgXTFiU1Uz3FDPBbA7detfnb6tWNwcZRf3kszjCQB AjR9ZstCVycusVh10aXlWeYlNfzXTYYjrh8m1kpvI95K7Vo8AwYeveUWATUf93OnJRY/Jk QZ64ID2Q73EHBVS8JJuGI+QLROmuEA777AybixziF3Yeko+5HBhCUEO1ABBdAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787705297; a=rsa-sha256; cv=none; b=TMK+jyux0mb4Iwv553i/vX5eFEgKiT22mKi7p7uio9iL21z9x6HJiDL2j2rVDdu8vObrZw sj34odosMoWSVavqDQTJASJS/WbzOMHsVVeGT06v8LCNoel9LU9uFam0/OQWUdjHodrSDT KAVxQf+axpnoX8Fd3f18uahk397catU5YOk5pVTXCTWyOJPMdY/BDya+u3Zq3u19lOhtdZ KczDLILprxmSIbmVSE74nVPhUSqU3puS6AUvf8B2evHJE6r6O7Bm0p5qt1340JU1CAM9SO DkPBXQE3ord4Y2KmvLaDmuzXFRLBzNbt7Y+AEMjhPxB2I8pSdydNt7/Y7n/zqw== 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=1787705297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HOCg2d0bBqrwU6sWqx0fZ6l2D9nJ5dxPxtut1yMQL8s=; b=Jt8bzJFoARq2S7OxbkKIKnUJnmFfVWkMYGNTdsqXJW3W/2mOP1iC9JpoNqSMD199m4t91e whfjIvrxy6jLQ8+sZ+ETjR0hWUlFaPllJcYcNUVlpuVflpe47LRl0X39dAoimq4Yq3PVcF WzRDrFpJIbdjTH1AWnaWo3V9P9O2Q1Q9q73M/4Ogzyzcfbb8gi9FdnYefW2gjxHQrJ6s3F qdDDFyqZ/4E7KKAFukaG5I8kVHUprL8AOEK67fsNHofFNw6gbeW0gpHLz2TO//0gBM22MQ jyJX0oXtTh0N44dh9RF7uARR6lh2/3/EEPT3b0KUc2Fgz8TTo6K0sKhqQejyYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hV5c15XXlz9y for ; Wed, 26 Aug 2026 00:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42142 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Aug 2026 00:48:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1d9c9fe83449 - stable/15 - shmfd: consistently return size in 512 byte blocks for fstat(2) st_blocks 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 1d9c9fe8344969ea09b90105a0825e8105f4d9a9 Auto-Submitted: auto-generated Date: Wed, 26 Aug 2026 00:48:12 +0000 Message-Id: <6a8e37cc.42142.587a6129@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1d9c9fe8344969ea09b90105a0825e8105f4d9a9 commit 1d9c9fe8344969ea09b90105a0825e8105f4d9a9 Author: Konstantin Belousov AuthorDate: 2026-08-19 02:27:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-26 00:44:10 +0000 shmfd: consistently return size in 512 byte blocks for fstat(2) st_blocks (cherry picked from commit 3a1bf59d195ced99c0f69774969d7090d21f6097) --- lib/libsys/stat.2 | 8 ++++++-- sys/kern/uipc_shm.c | 8 ++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libsys/stat.2 b/lib/libsys/stat.2 index 7119fa797f0a..799f9bdbe1fc 100644 --- a/lib/libsys/stat.2 +++ b/lib/libsys/stat.2 @@ -271,10 +271,14 @@ be zero. .Pp For file descriptors referencing specific non-file objects, the field is type-specific. +.Pp For POSIX shared memory segments .Pq see Xr shm_open 2 , -the block size is equal to -the platform page size +the block size is 512 bytes. +For older versions of +.Fx +.Pq before 15.2 and 16.0 +the block size was equal to the platform page size .Pq Xr getpagesize 2 . .El .Pp diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index fa80eabc39a3..067a628fdab0 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -663,12 +663,8 @@ shm_stat(struct file *fp, struct stat *sb, struct ucred *active_cred) sb->st_dev = shm_dev_ino; sb->st_ino = shmfd->shm_ino; sb->st_nlink = shmfd->shm_object->ref_count; - if (shm_largepage(shmfd)) { - sb->st_blocks = shmfd->shm_object->size / - (pagesizes[shmfd->shm_lp_psind] >> PAGE_SHIFT); - } else { - sb->st_blocks = shmfd->shm_pages; - } + sb->st_blocks = ptoa(shm_largepage(shmfd) ? shmfd->shm_object->size : + shmfd->shm_pages) / DEV_BSIZE; return (0); }