From nobody Sun May 25 21:15:39 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 4b5BWb4JgGz5wnSL; Sun, 25 May 2025 21:15:39 +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 4b5BWb1GpDz3HWr; Sun, 25 May 2025 21:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748207739; 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=4bHmGfnkhE2Z+znKQHN0BnFQRgO4uJ6H/TXHWAGmlow=; b=CK7TKFZcxRZ9zAOcaPcblNqxPnZIY+BHCD2pRqfs/pgc+WqE7R14xiH6rmEE8pAmNEpeeK XT4+Ux4f1hvnLBP23DKY8ulO8cbOYsxx78A8YC+XeEQ3qgVozTnUjXF+NWm0Srssu8u+Vx dxYqE7gPU6lzNHVv68fGwMrkxsfWI4T0H4X5JtMPkZ1Qcol8cTo+mxj1YJ0ssGe1Rd9L2O 0wuCdvFjWckHHLGzb9knjotKaHzLXVBfW4c1TmSaQ8U+TLC15o31oReBntReOglElV6z/u Tn2sHMHWWZWmE8lM06Rl7FEZF7CPcYMvAY2SiAL8HMFp0PV+bjzrHcHiZrkiWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748207739; 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=4bHmGfnkhE2Z+znKQHN0BnFQRgO4uJ6H/TXHWAGmlow=; b=ll/fg4tMeOjJWm8popRUHDTlNjpO6NKBqAeyg9kYiWBNOeEyPzXwtqBHF311W0Oil0flMG mWWTzMjOl7kAppksOUPQPIeJ0KKWiIB3Of0OdN6JqOGWFxXxXyEaFZWMxIPwQqJmGJkfFC gn/ezKDE2eVYtqXA8RM/YXRdTVvFrSp3kOOYutOTHeEHbV+MboDwQMD9uF5p8o6SsyrPI/ GyFphw1J4ywUFxbU6DGUKbLfcXSRZ+9hn6iLSF8Z279y8NgFW8/NXVFqM9Mft016uuJeAE Ik668J6PzXFQZuvjoFsjreXR/6TN7KhRcNgr3awxKKXsxca+EuIb00HoDAvN3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748207739; a=rsa-sha256; cv=none; b=MXTYp3fEcaE6YZLtOJkIoni3mV8IQh5jBJcR0eRyAHww2xeZSzA0Z3nBY1uZLAWhWEk429 b7DZ+jFDiYkctTK3qHNeeAOALO8DTPjAl5ipFucH9DXSFVZ0/URJMe4Cb9gTDRYP4wNUwL Tl0eip+gAsLwAICdPlxKJF1x8fXBGLvwHVeqxXzx0UGZK0tWdC6Bw0X6A4XFtfFqcD1DCA 34o9xURwFWw5R6ZunBRZ0ygb7LEBTdUcJk2pLg/I9Aqudr7uEvMJkUowKC+T61qsrFO3Dz 5sUQtfiv3oPKOBHsppxcyNErVDsQEn91mvHr3c1pDYZ/VmNcmxWVZ8LR1dX9Vg== 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 4b5BWb0cVxzfGk; Sun, 25 May 2025 21:15:39 +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 54PLFdId088249; Sun, 25 May 2025 21:15:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PLFdQI088246; Sun, 25 May 2025 21:15:39 GMT (envelope-from git) Date: Sun, 25 May 2025 21:15:39 GMT Message-Id: <202505252115.54PLFdQI088246@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: 142bcdad1f67 - main - 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: 142bcdad1f67f8f6de04ebc27d8dbba56c39c788 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=142bcdad1f67f8f6de04ebc27d8dbba56c39c788 commit 142bcdad1f67f8f6de04ebc27d8dbba56c39c788 Author: Doug Moore AuthorDate: 2025-05-25 21:13:28 +0000 Commit: Doug Moore CommitDate: 2025-05-25 21:13:28 +0000 vm_page: drop mpred from grab_valid_iter() Variable mpred in vm_page_grab_valid_iter() has become a write-only variable. Drop it. In grab_valid_iter(), drop a pctrie_iter_reset() call already handled in vm_page_alloc_iter(). Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D50424 --- sys/vm/vm_page.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index ea6fbdbc6386..a3ebc92175f8 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, mpred; + vm_page_t m; vm_page_t ma[VM_INITIAL_PAGEIN]; int after, i, pflags, rv; @@ -4924,14 +4924,12 @@ 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)) { *mp = NULL; return (VM_PAGER_AGAIN); } - pctrie_iter_reset(pages); goto retrylookup; } } @@ -4941,7 +4939,7 @@ retrylookup: after = MIN(after, VM_INITIAL_PAGEIN); after = MIN(after, allocflags >> VM_ALLOC_COUNT_SHIFT); after = MAX(after, 1); - ma[0] = mpred = m; + ma[0] = m; pctrie_iter_reset(pages); for (i = 1; i < after; i++) { m = vm_radix_iter_lookup(pages, pindex + i); @@ -4952,7 +4950,7 @@ retrylookup: break; } else if (vm_page_any_valid(m) || !vm_page_tryxbusy(m)) break; - mpred = ma[i] = m; + ma[i] = m; } after = i; vm_object_pip_add(object, after);