From nobody Tue May 20 08:09:57 2025 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 4b1nKK3qZ3z5w1jy; Tue, 20 May 2025 08:09: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b1nKK37wNz3yfh; Tue, 20 May 2025 08:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747728597; 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=BjmZtH4JpxpXMJkLQBAnhtR/C3vmqtCB2MM01c8uzB0=; b=e9OXm6PO/p0rfJKp+ymzJ7CnLPUx8/hGrW+qsd6GKD8f4Y6Ppvgr4u66W3/XlIvL19oJZh qNjJo0BqQz4LMuctbJgRCb5c9Bl3y92m/SEu20IuR6XYHr9qhrJTbsSC9R5XMerYkxTZ0o Xydrjsaa7/FC0k8P3n1189TbQX3dWwjWm3oefYb6XjFpUHrZO4CFQejbaZRYR9bMrwFSR2 b82DKJ/hmcyLAsIpVjKkzrWfQIYFSpFSZjZfYf3HNpcjY5e96QS5OE4Vu183PaqFvA7eaU C8m287pe9Q3elU+xwHDHr/76JToYx1mn4Q3vE0uIBqgfJ8XuIpRI9wwf7lDjqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747728597; 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=BjmZtH4JpxpXMJkLQBAnhtR/C3vmqtCB2MM01c8uzB0=; b=WXLVspG1jTwNP9UijSXFo0+Bi59U5Yo5qc9hLXQRWYmesvpsGYxsIXMX/IAGr97TzpLPGO Z8HJ8PNAzTWsKj0EGguhVJGzisODDvmXgsERICdl9C8rDY9tct4E4Tzq4UO31wUV8ZjuJL edUpgrnFd4vjZT7sdbdx+gw+xxWlm5eODMEnPAsEcqMq9na/kIeDX0OabfWCFs+5fbsXWs SWToed6tFHLkyisXIJo1yYl7syAGduFHY5Pd8xulk2es6q2oNGkQUo+Dp4CDI7MTqsBziF G5oCymp0Ta2Z68cQHsQkeN/fjrpg17MrLoy0iDACIWpLT1zFtt37gQlymMTq7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747728597; a=rsa-sha256; cv=none; b=YBqtEmUvv0GIf9ZyKd2j0VZnJLilbRMaU8RQAR0M00B8Z9m8+Dto76F7AEonc829sA5lWD BzgWBDeUaURuCfkcXM8vBWoVdi3BCxw4auQc8Bsv0wdDjEr36NpivXfHMh8F1cJMbLrfsi N7JUUarSttORmO6+EeNBzHLTUjavBoKfmOkuSh9G+mruKaXAaqqQE0P+tA8nJXQnwd9Rhw mJ0TQYA8LE2afILLGv5zPH4lRaENS3k+iSx0Tpid/4a1AuJ0B79El/PPrQPyhtl9zZcXWl x/N09FKZrJ2prmxhARKGijxPTc88jU79ACdfT9sAYnijUiSkgiJY6qpculhmhg== 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 4b1nKK2XLszj1R; Tue, 20 May 2025 08:09: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 54K89vOt088561; Tue, 20 May 2025 08:09:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54K89vuZ088558; Tue, 20 May 2025 08:09:57 GMT (envelope-from git) Date: Tue, 20 May 2025 08:09:57 GMT Message-Id: <202505200809.54K89vuZ088558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: c8ffb90b1dd3 - main - Revert "vm_page: drop mpred from grab_valid_iter()" 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 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: c8ffb90b1dd391b88b67f66028833876497d5d78 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=c8ffb90b1dd391b88b67f66028833876497d5d78 commit c8ffb90b1dd391b88b67f66028833876497d5d78 Author: Doug Moore AuthorDate: 2025-05-20 08:08:43 +0000 Commit: Doug Moore CommitDate: 2025-05-20 08:08:43 +0000 Revert "vm_page: drop mpred from grab_valid_iter()" This reverts commit 0f941203ac513f5ed3cf30038ac9e7a062acf1b7. Removing the unread variable also removed a side-effect of computing a value to assign to that variable, and that side-effect was critical. --- sys/vm/vm_page.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 85a39aa8c22e..ea6fbdbc6386 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4880,7 +4880,7 @@ int vm_page_grab_valid_iter(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex, int allocflags, struct pctrie_iter *pages) { - vm_page_t m; + vm_page_t m, mpred; vm_page_t ma[VM_INITIAL_PAGEIN]; int after, i, pflags, rv; @@ -4924,6 +4924,7 @@ retrylookup: *mp = NULL; return (VM_PAGER_FAIL); } else { + mpred = vm_radix_iter_lookup_lt(pages, pindex); m = vm_page_alloc_iter(object, pindex, pflags, pages); if (m == NULL) { if (!vm_pager_can_alloc_page(object, pindex)) { @@ -4940,7 +4941,7 @@ retrylookup: after = MIN(after, VM_INITIAL_PAGEIN); after = MIN(after, allocflags >> VM_ALLOC_COUNT_SHIFT); after = MAX(after, 1); - ma[0] = m; + ma[0] = mpred = m; pctrie_iter_reset(pages); for (i = 1; i < after; i++) { m = vm_radix_iter_lookup(pages, pindex + i); @@ -4951,6 +4952,7 @@ retrylookup: break; } else if (vm_page_any_valid(m) || !vm_page_tryxbusy(m)) break; + mpred = ma[i] = m; } after = i; vm_object_pip_add(object, after);