From nobody Sat Apr 19 17:36:20 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 4ZfzM86j8Gz5tDGP; Sat, 19 Apr 2025 17:36:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfzM8619Nz3Gy8; Sat, 19 Apr 2025 17:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745084180; 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=O9/MH9OXRXNzG94rpRNW11b4WsEIgUMrtuD5xEm15Oc=; b=YyB9yPB9YIx7FmFZqpwx/2mh1R5LWkYy7Zgd09/w9DLuhqdkBB2E20PZKU8TNKmcpwx+Dq OlJf52y4Hu9M8RwB4SykVqbiZPZCcwcUikKSn0x6eUDOWk9gqXX9LHy9qlb04XH1MQGTzG b9YJIAJvUekjUCFygcGiewkCtCQcntNMxGaN8F/0zE7dIrg43y1OaW28Ov7ZWHhCwJh5Ux 5tqpFgosalGtbJL2ABEWVUS8+xRQSEsaAtN9oAgB2F71KF9llsBoFDzu6rBhuCsrDBFNRJ /vLlLTbJcFd4k+XCAG5qO2kvDK4o1HRQ4adW7YgBdK9aoTJfZ6yh0OJLy30z/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745084180; a=rsa-sha256; cv=none; b=uiaSSyBs2tZ0k34Lx1/YzXUXCuZeEfQEgFyAQRdkmW4t7GYZZot8AkoaL9GzNGVGKMVwrl Bi9AYG3HjkMoT1k0WbSaH0atQJ7ZfJUUCCUtiZGfa6jL0vzonMX+k7ah4U/AdMGz3FcWlJ wqJ7wOJT0qdc7I5A8//z0OthkKCovIHqHKx2/Y5WTITGSvngi5YSFrqkjgRKZuGjK4Shcl keHQ8xVT3PhZOyvO85BmEhWzHWg53bLkDhIiHQiuv5dDz7/5NLnxfxz5cDgpzqIZoSrHZ2 4t0BMdxukGAK3ff/05wFHsKy4vqtwUc5P3yvdXTUvQkmUD3wpnuquUBqpi60Ng== 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=1745084180; 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=O9/MH9OXRXNzG94rpRNW11b4WsEIgUMrtuD5xEm15Oc=; b=wW1MDLI2TypIfYI05TyFGKC60CWUsha1jVSExa5/z3rRnm6Th2ooXjHC8qIfYAOWzR2shR vmagw9CGv4dPV1Hx+O6F96PftR9MnXf14RlqreuxyTt4uEwlDkh2Biq5IOr3JiFgBSr5L2 jBb4oZJ1KMGhZUoky4fefpFQEMZu/FCxNiww9gPIek5+EdxOresbd4aKhwreDsvdCMiN3a TQS54WcYdwSBCIzHpzQOWFVC691vfTPThb0s+0doTr2GfzCMmSe3pwVHpsMG+ojLhiCUTP CR6ocdHhJIXsJkzvhaTVCT2uEEyHwEB+QwlwndFYGsEpdrgvy3aAYy1zdDBNpw== 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 4ZfzM85bsdzD1y; Sat, 19 Apr 2025 17:36:20 +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 53JHaK1c022894; Sat, 19 Apr 2025 17:36:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53JHaKwr022891; Sat, 19 Apr 2025 17:36:20 GMT (envelope-from git) Date: Sat, 19 Apr 2025 17:36:20 GMT Message-Id: <202504191736.53JHaKwr022891@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: aae4bd0ea4b6 - main - vm_fault: use iterator in populate_cleanup 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: aae4bd0ea4b62e4a1361c2b08f11a517f6af7ac3 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=aae4bd0ea4b62e4a1361c2b08f11a517f6af7ac3 commit aae4bd0ea4b62e4a1361c2b08f11a517f6af7ac3 Author: Doug Moore AuthorDate: 2025-04-19 17:34:40 +0000 Commit: Doug Moore CommitDate: 2025-04-19 17:36:10 +0000 vm_fault: use iterator in populate_cleanup Change vm_fault_populate_cleanup() to use a page iterator, rather than tailq pointers. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49900 --- sys/vm/vm_fault.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index e1db7ac8b524..1950ac4b41b3 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -108,6 +108,7 @@ #include #include #include +#include #define PFBAK 4 #define PFFOR 4 @@ -480,19 +481,18 @@ static void vm_fault_populate_cleanup(vm_object_t object, vm_pindex_t first, vm_pindex_t last) { + struct pctrie_iter pages; vm_page_t m; - vm_pindex_t pidx; VM_OBJECT_ASSERT_WLOCKED(object); MPASS(first <= last); - for (pidx = first, m = vm_page_lookup(object, pidx); - pidx <= last; pidx++, m = TAILQ_NEXT(m, listq)) { - KASSERT(m != NULL && m->pindex == pidx, - ("%s: pindex mismatch", __func__)); + vm_page_iter_limit_init(&pages, object, last + 1); + VM_RADIX_FORALL_FROM(m, &pages, first) { vm_fault_populate_check_page(m); vm_page_deactivate(m); vm_page_xunbusy(m); } + KASSERT(pages.index == last, ("%s: pindex mismatch", __func__)); } static enum fault_status