From nobody Thu Apr 10 07:09:50 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 4ZY9tR2M9gz5sZ8S; Thu, 10 Apr 2025 07:09:51 +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 4ZY9tR1Z19z3JCf; Thu, 10 Apr 2025 07:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744268991; 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=hGxOe565a2nNuOjfbOaUGchVhxihzExj6viN1rRURSo=; b=sbZyJ8oT1CHlmFz1AKz4jtpb5xkXX7wovsIOj/ankiFMQMJzHr/lp9YkxrXREG/hRgh61i kwy+fsbwWLlp0pOE++kNsLfT8vp3qYSkQ2PifHb/ajmUZEv5r3C+gv7TjwBldXPBOmnhij jEma3WnTKeJGBEvuQZM0k+5UX2FgPfL6Dbq1rzH3uVH4mGCHoI/elyVsCHDF5uxalwfgRC bz2kZ2SpOyBa43RnbFTtUewdy/flXDxfhxbprVpk1rqjIUMp+9E8i0Kxu4ySnbwaARvNvB AY2zhQDdi5PQKbQTlrquxpllov+taqCEzoZoNeKBDgkzkXjB7sxNk13TjbHkgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744268991; a=rsa-sha256; cv=none; b=V8Nbxd/66CtXm8D9UlPHLKhneYY/VUY2JSSO2ibTBjm4L7nsumOHPz/odJHMlQw7FdUm7Z Nhlb0etAa1j42/HPyltQsldFv706UQBlAM6jxXEETVCGoFSI1mtiCoKkKFQKoUrXHGhc0e aLy87RANAMGyJhbSoKedRBfSi1JmgT6e4ze6L1e2P8s1O9qlvPJHC/n9uULYr0+PBLra0J SX2TCqLimXQby7f0C9daceHXPvfsww/dhjL7UixjsxeZpcaOkxIAfghxY7vBqjKXxJiI7B TLKdmcKITArRBcdDPV63KSgzbFH+PoM2LAVqtGgSqw9h6Jwy7g0BOXkHnQC4gQ== 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=1744268991; 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=hGxOe565a2nNuOjfbOaUGchVhxihzExj6viN1rRURSo=; b=ccAPR1S/lRI7ysL2UZB1VEpZBe0lO02qvTirdtwhbuMIKFhb2n2/KwY4r3AMsStrJFHtrH AFSaukbr69BlL9b4EL4bkRobKK3SupYZ52bvia6qkoA1F/u11GD+toqNpl7Dj47G3py1JK pBHFbQMBl6wkEonZnWDjKUWH5EAZVW21hfnROlxONCUV/q8YamwSDQ4IhY1AGbT2+1h8mI CmP2tSHHJLLfRF6hpOoHFLTqj2SHrXAc6uaUu832Nr7saDrxRLc/jIJ4h+I7PiSjndnBfc I88GLuhRBZxvMg6/WHgAjnpgUF8ADkZPNCPQvUTi0rY6+QEu72U1pSBzsXsFPQ== 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 4ZY9tR0dYFzsdZ; Thu, 10 Apr 2025 07:09:51 +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 53A79oOw081804; Thu, 10 Apr 2025 07:09:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53A79okT081801; Thu, 10 Apr 2025 07:09:50 GMT (envelope-from git) Date: Thu, 10 Apr 2025 07:09:50 GMT Message-Id: <202504100709.53A79okT081801@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: 14efeab6adba - main - vm_grab: reset iter after alloc failure 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: 14efeab6adbabe95f3b18f00d02dae550dbfc7f3 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=14efeab6adbabe95f3b18f00d02dae550dbfc7f3 commit 14efeab6adbabe95f3b18f00d02dae550dbfc7f3 Author: Doug Moore AuthorDate: 2025-04-10 07:06:38 +0000 Commit: Doug Moore CommitDate: 2025-04-10 07:06:38 +0000 vm_grab: reset iter after alloc failure After vm_page_grab_lookup fails to find a page, and vm_page_alloc_after fails to allocate one, reset the pages iterator which is invalidated by a release/acquire of the object write lock within the allocation code. Reported by: pho Reviewed by: kib Fixes: 7becd87c988c ("vm_grab: use iterator for grab lookup") Differential Revision: https://reviews.freebsd.org/D49755 --- sys/vm/vm_page.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index f9653f1d1ec9..741c45490d96 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4882,6 +4882,7 @@ vm_page_grab(vm_object_t object, vm_pindex_t pindex, int allocflags) if ((allocflags & (VM_ALLOC_NOWAIT | VM_ALLOC_WAITFAIL)) != 0) return (NULL); + pctrie_iter_reset(&pages); } vm_page_grab_release(m, allocflags); @@ -5124,6 +5125,7 @@ vm_page_grab_zero_partial(vm_object_t object, vm_pindex_t pindex, int base, vm_page_launder(m); break; } + pctrie_iter_reset(&pages); } pmap_zero_page_area(m, base, end - base);