From nobody Fri Apr 25 06:14:44 2025 X-Original-To: dev-commits-src-main@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 4ZkMxx1nmKz5vJK3; Fri, 25 Apr 2025 06:14:45 +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 4ZkMxx0tq9z3R4t; Fri, 25 Apr 2025 06:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745561685; 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=neF6+820zqi+QMPuIj5YFi9ScS94JyUkj4IwWLMUVjM=; b=SgCci8ofHx7kFISb4Rh0zJdiNIElahHy+GjVXyaqiwMaX1ewqWBuuVaTQn1yR1NlttpobP Y5gzO1s1lR/mNPPXkxArVua6KMRDcS2u6GLSnR5boi3jlrfzdAv8H2jmeykFScZnYttLQz y+h1KVTNZDeOm82r8Mu1Ott08H6j7kOVwhUwKp/EDFeB/n2Tp2sXI+6I3TBhdCT18vGEVv eYO+vLuafG+CJq2jcmx9Ko2xK/Rp4/po5d9nTZYrKCjp1RtSS13dvge/A0OSQ7O7kkzGMA X+SjLR6P9ziuw+WxsjiIChHRQI4zT2KRY5TrkUTC3Hql8Lwun/ua96kXTrvkOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745561685; a=rsa-sha256; cv=none; b=fp6Jgx7kcNulTtrzOPXektC3jeRmS2bR5e/+HYqruHMGOWmMaOFhaq63Dz/2d55LcvAGxR ficQLLkr8JDDe6/88SodBM/DbA+9Br1HC7ZhV1GHX0cSpxmK0jkfk2C7VBMyNk5SUDs4jF 5BRpFsPPUOsLuuszg2eDxIC/Jqce8rFblL5E+r3qgEjwYci73UYrLylegcCMSoriQUq8ir v9K5N7qYgFRuWdqwuQyRXr6ogasLvvmb67AY+Ega5lOhjz3JL3yu55lxZE1ZvMZ9dHoDRf KN8s+9sjunvadmLBPp0FVsOBlqWd9RyNXI6oQdtScv/wQpUpaqEPwFNweOodcw== 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=1745561685; 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=neF6+820zqi+QMPuIj5YFi9ScS94JyUkj4IwWLMUVjM=; b=uU2pQMnfx8uH8WU6SJIrbe9iqUZv3eEmu7hgsJkp35iaoLethGbJ6LI6r6LeodsJP4qDce tZoMiVUQS2Su6fFRGAS4PVUyGQ+TZ6mIkU1/zmGRbyRqe3MNdYt/DCaMkCzlEqRgJcTi6o O4m90d0a0Me65TfJNnXIU3j1o0EKbCvD8G/n8OlavBxSKEBjyGfqjXF2xd3syxbcGAv6Ov F7m8bvoU5SyG/gQH7fFGHkXHuJgqtq3wO6jIlc9kVJCGK+flOhFPaK5MKIh7rkK/yeslXo 4pNmkdtAqaee5heaXLNji+q7kVGZPWliKQ0L+dcGOoS8iHNBRubb0jFl71bjjw== 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 4ZkMxx0RdJz7WM; Fri, 25 Apr 2025 06:14:45 +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 53P6EjiE034880; Fri, 25 Apr 2025 06:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53P6EiFs034877; Fri, 25 Apr 2025 06:14:44 GMT (envelope-from git) Date: Fri, 25 Apr 2025 06:14:44 GMT Message-Id: <202504250614.53P6EiFs034877@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: cf681286d295 - main - Revert "vm_fault: use iterator in populate()" 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: cf681286d29540a0aa1adf2cbc119e6f877de3dc Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=cf681286d29540a0aa1adf2cbc119e6f877de3dc commit cf681286d29540a0aa1adf2cbc119e6f877de3dc Author: Doug Moore AuthorDate: 2025-04-25 06:12:36 +0000 Commit: Doug Moore CommitDate: 2025-04-25 06:12:36 +0000 Revert "vm_fault: use iterator in populate()" This reverts commit 925906a61cafb44df8643e33aa781ba546e92082. The effects of releasing and acquiring the object write lock a few lines into the loop were not carefully considered. Reported by: alc --- sys/vm/vm_fault.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 24fc457adcad..c096bfaffe73 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -497,7 +497,6 @@ vm_fault_populate_cleanup(vm_object_t object, vm_pindex_t first, static enum fault_status vm_fault_populate(struct faultstate *fs) { - struct pctrie_iter pages; vm_offset_t vaddr; vm_page_t m; vm_pindex_t map_first, map_last, pager_first, pager_last, pidx; @@ -624,10 +623,9 @@ vm_fault_populate(struct faultstate *fs) pager_last); pager_last = map_last; } - vm_page_iter_init(&pages, fs->first_object); - for (pidx = pager_first, m = vm_radix_iter_lookup(&pages, pidx); + for (pidx = pager_first, m = vm_page_lookup(fs->first_object, pidx); pidx <= pager_last; - pidx += npages, m = vm_radix_iter_stride(&pages, npages)) { + pidx += npages, m = TAILQ_NEXT(&m[npages - 1], listq)) { vaddr = fs->entry->start + IDX_TO_OFF(pidx) - fs->entry->offset; KASSERT(m != NULL && m->pindex == pidx, ("%s: pindex mismatch", __func__));