git: 939ac0c8fde2 - main - vnode_pager: clean up undirty_pages()

The branch main has been updated by dougm:

URL: https://cgit.FreeBSD.org/src/commit/?id=939ac0c8fde22a4ad9cb9bfb5d94f29cad6ea040

commit 939ac0c8fde22a4ad9cb9bfb5d94f29cad6ea040
Author:     Doug Moore <dougm@FreeBSD.org>
AuthorDate: 2025-12-26 22:07:34 +0000
Commit:     Doug Moore <dougm@FreeBSD.org>
CommitDate: 2025-12-26 22:07:34 +0000

    vnode_pager: clean up undirty_pages()
    
    The first (second) loop of vnode_pager_undirty_pages() includes an
    if-test to test whether an iteration is the last (first). Move those
    if-tests out of their loops.  That allows the compiler to unroll the
    loops.
    
    Reviewed by:    alc, kib
    Differential Revision:  https://reviews.freebsd.org/D54353
---
 sys/vm/vnode_pager.c | 76 +++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 040b4037df15..3504c90821e5 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -1523,49 +1523,47 @@ void
 vnode_pager_undirty_pages(vm_page_t *ma, int *rtvals, int written, off_t eof,
     int lpos)
 {
-	int i, pos, pos_devb;
+	int i, npages, pos;
 
-	if (written == 0 && eof >= lpos)
-		return;
-	for (i = 0, pos = 0; pos < written; i++, pos += PAGE_SIZE) {
-		if (pos < trunc_page(written)) {
-			rtvals[i] = VM_PAGER_OK;
-			vm_page_undirty(ma[i]);
-		} else {
-			/* Partially written page. */
-			rtvals[i] = VM_PAGER_AGAIN;
-			vm_page_clear_dirty(ma[i], 0, written & PAGE_MASK);
-		}
+	/* Process pages up to round_page(written) */
+	pos = written & PAGE_MASK;
+	npages = atop(written);
+	for (i = 0; i < npages; i++) {
+		rtvals[i] = VM_PAGER_OK;
+		vm_page_undirty(ma[i]);
+	}
+	if (pos != 0) {
+		/* Partially written page. */
+		rtvals[i] = VM_PAGER_AGAIN;
+		vm_page_clear_dirty(ma[i], 0, pos);
 	}
-	if (eof >= lpos) /* avoid truncation */
-		return;
-	for (pos = eof, i = OFF_TO_IDX(trunc_page(pos)); pos < lpos; i++) {
-		if (pos != trunc_page(pos)) {
-			/*
-			 * The page contains the last valid byte in
-			 * the vnode, mark the rest of the page as
-			 * clean, potentially making the whole page
-			 * clean.
-			 */
-			pos_devb = roundup2(pos & PAGE_MASK, DEV_BSIZE);
-			vm_page_clear_dirty(ma[i], pos_devb, PAGE_SIZE -
-			    pos_devb);
 
-			/*
-			 * If the page was cleaned, report the pageout
-			 * on it as successful.  msync() no longer
-			 * needs to write out the page, endlessly
-			 * creating write requests and dirty buffers.
-			 */
-			if (ma[i]->dirty == 0)
-				rtvals[i] = VM_PAGER_OK;
+	/* Process pages from trunc_page(eof) to round_page(lpos) */
+	pos = eof & PAGE_MASK;
+	i = atop(eof);
+	npages = atop(lpos);
+	if (i < npages && pos != 0) {
+		/*
+		 * The page contains the last valid byte in the
+		 * vnode, mark the rest of the page as clean,
+		 * potentially making the whole page clean.
+		 */
+		pos = roundup2(pos, DEV_BSIZE);
+		vm_page_clear_dirty(ma[i], pos, PAGE_SIZE - pos);
 
-			pos = round_page(pos);
-		} else {
-			/* vm_pageout_flush() clears dirty */
-			rtvals[i] = VM_PAGER_BAD;
-			pos += PAGE_SIZE;
-		}
+		/*
+		 * If the page was cleaned, report the pageout on it
+		 * as successful.  msync() no longer needs to write
+		 * out the page, endlessly creating write requests
+		 * and dirty buffers.
+		 */
+		if (ma[i]->dirty == 0)
+			rtvals[i] = VM_PAGER_OK;
+		i++;
+	}
+	for (; i < npages; i++) {
+		/* vm_pageout_flush() clears dirty */
+		rtvals[i] = VM_PAGER_BAD;
 	}
 }