commits-src-main@mlmmj.nyi.freebsd.org>; Tue, 23 Dec 2025 18:35: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbNxM2b02z3kDD for ; Tue, 23 Dec 2025 18:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766514951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2PjgtP2mRJ65sTB/OCPf1C561z+Tb5Llddyo3N7E+Mg=; b=KVPdOF/JeqLOhlasmOx8zx0hiDuhCriBreGkrek7pujebG/nFMJSf5+t+bLaDE4VTN4cbP lKdX6mgX3LBc2JziWKJRqQlLk8GIu7DcoDr99KVai0eGFMYwCbMatCY4wnVOBC1uEQLphA qE8ZNIdb2tQV63FgYt65B/VSvTsByo0LFXCgSknhfAxf3w83SF1rNlKoOVDEnPHjCtKQGv N3TYOQcntoDeDUFHV32RcF/Ig2BTCkkW+Bs5ycsqDmA9wKS1A64ouBPsFbdnxLzUSQllpm Tg4njQNWFNa0BvMoEPrVuV7ARXZV8yu/7iVX5QVwoQnfwrZ6ukTqjNM4yTKDIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766514951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2PjgtP2mRJ65sTB/OCPf1C561z+Tb5Llddyo3N7E+Mg=; b=NvK7wtlBvEqNsExqeHJe/VodGPHj31qGljPX8lJ6/bcDY1OMA3DPOKsBz/NSD7SEEY6Lof u/rZX+G3sXwtR+Ogf/uYrr1RMFZ5jLyg/XqfHYBcXD0XLgWHFM96gKV71vdYxlpK89S5Uh 0pknJn1TT1OaZSmUxRqgshW60vB7vOSvimdqCjTnqzP2mQ0gOJgVhpU4M3hkXuDPoy2oZH l0a8MUATKGu+SQUo+eNUGWzic2KaCC8y1CMQ9OzEoqJoL0lpZCxJInszEUx4POndk4qtHC 0X+o4u6r0Ew1kGu6T/TWCK7cR9ZyOsUT7n/FhP4uKDG+K0fQ/zs6tRCPl5gDSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766514951; a=rsa-sha256; cv=none; b=r+GFRIEBjo8mOMRKKSiBaO0L+ETx0gpQGcuOG1EhUiN5B0QcI3WvkNMBhNsNjXEfhS2fli vppVl2VcmMZWhcOYukLAvp5WVYw8X8zctQU9/LtHt1GUBQGpT3X5e3NmktNKrpzX7u+RE1 3dhdL6Dq9UDSxH464bjUXZ3Yfyto+6FZeTNgLX7NWOPCkMLsZQPhwSWp1GEIfn+nVxFLCo Zr5HiW+LDjf9RIakNI6EtumcLQ0mkfnlHSIQQ92Fzv4TN1oYhnK/A+W3ZBaHC/gEe21Sa3 SI9Kx3XCZ9pEJrXQdx7bIbAY2inWg7sjZTP4qxeIl5px9Tryec8VXhTJV8uyoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbNxM1zWsz1Mp7 for ; Tue, 23 Dec 2025 18:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 320f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Dec 2025 18:35:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 1e8c2cb328bb - main - vnode_pager: use ptoa(), atop() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e8c2cb328bbb2d685acbcd269db32ad3ec45f26 Auto-Submitted: auto-generated Date: Tue, 23 Dec 2025 18:35:51 +0000 Message-Id: <694ae107.320f6.34c15e01@gitrepo.freebsd.org> The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=1e8c2cb328bbb2d685acbcd269db32ad3ec45f26 commit 1e8c2cb328bbb2d685acbcd269db32ad3ec45f26 Author: Doug Moore AuthorDate: 2025-12-23 18:34:20 +0000 Commit: Doug Moore CommitDate: 2025-12-23 18:34:20 +0000 vnode_pager: use ptoa(), atop() In vnode_pager.c, use ptoa() or atop() instead of arithmetic with PAGE_SIZE or PAGE_SHIFT. Reviewed by: alc, kib Differential Revision: https://reviews.freebsd.org/D49330 --- sys/vm/vnode_pager.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 9693cb15f80d..040b4037df15 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -388,7 +388,7 @@ vnode_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, return FALSE; bsize = vp->v_mount->mnt_stat.f_iosize; - pagesperblock = bsize / PAGE_SIZE; + pagesperblock = atop(bsize); blocksperpage = 0; if (pagesperblock > 0) { reqblock = pindex / pagesperblock; @@ -645,8 +645,8 @@ vnode_pager_addr(struct vnode *vp, vm_ooffset_t address, daddr_t *rtaddress, *rtaddress += voffset / DEV_BSIZE; if (run) { *run += 1; - *run *= bsize / PAGE_SIZE; - *run -= voffset / PAGE_SIZE; + *run *= atop(bsize); + *run -= atop(voffset); } } @@ -909,7 +909,7 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int count, object = vp->v_object; foff = IDX_TO_OFF(m[0]->pindex); bsize = vp->v_mount->mnt_stat.f_iosize; - pagesperblock = bsize / PAGE_SIZE; + pagesperblock = atop(bsize); KASSERT(foff < object->un_pager.vnp.vnp_size, ("%s: page %p offset beyond vp %p size", __func__, m[0], vp)); @@ -991,7 +991,7 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int count, bp->b_blkno += (foff % bsize) / DEV_BSIZE; /* Recalculate blocks available after/before to pages. */ - poff = (foff % bsize) / PAGE_SIZE; + poff = atop(foff % bsize); before *= pagesperblock; before += poff; after *= pagesperblock; @@ -1172,14 +1172,14 @@ vnode_pager_generic_getpages_done(struct buf *bp) runningbufwakeup(bp); - if (error == 0 && bp->b_bcount != bp->b_npages * PAGE_SIZE) { + if (error == 0 && bp->b_bcount != ptoa(bp->b_npages)) { if (!buf_mapped(bp)) { bp->b_data = bp->b_kvabase; pmap_qenter((vm_offset_t)bp->b_data, bp->b_pages, bp->b_npages); } bzero(bp->b_data + bp->b_bcount, - PAGE_SIZE * bp->b_npages - bp->b_bcount); + ptoa(bp->b_npages) - bp->b_bcount); } if (buf_mapped(bp)) { pmap_qremove((vm_offset_t)bp->b_data, bp->b_npages); @@ -1258,7 +1258,7 @@ vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count, { int rtval __diagused; struct vnode *vp; - int bytes = count * PAGE_SIZE; + int bytes = ptoa(count); /* * Force synchronous operation if we are extremely low on memory @@ -1329,7 +1329,7 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *ma, int bytecount, static int curfail; object = vp->v_object; - count = bytecount / PAGE_SIZE; + count = atop(bytecount); for (i = 0; i < count; i++) rtvals[i] = VM_PAGER_ERROR; @@ -1342,7 +1342,7 @@ vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *ma, int bytecount, return (VM_PAGER_BAD); } - maxsize = count * PAGE_SIZE; + maxsize = ptoa(count); ncount = count; poffset = IDX_TO_OFF(ma[0]->pindex);