From nobody Mon Apr 13 10:57:44 2026 X-Original-To: dev-commits-src-branches@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 4fvPWY0SZcz6Z0NL for ; Mon, 13 Apr 2026 10:57: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvPWX6vPqz3R2R for ; Mon, 13 Apr 2026 10:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776077865; 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=FWQdH7Ewgr9iPlDOHfqGronLLIBepDy+HoPImr6TIrs=; b=kzQAHP0GEKqhXrQ3gOy/qp6V1/98CNR+vo1k7BST77VAonJbV4wu3HCinKt+w2FHCZj3KD KiWKy8Zz1MrrMljAO5c7W003nnzHTaefQLkmedGMhXM9idbmW6T1aOZVY8iWePcFIvQTzB dDiV5cdLCgDlMnsigDfn0bCm8WAitmFPZ1AAHl65GJqM3D3eIoZTXeADzhsrKAa68xTMAQ XMFdlQ7IDJVpowBFsvPhWcPhqVX949IHbM6gg1486Q6rck71NUq39cTSTYDfTyU4jil1af b3KMyhM8pgs3gXsx5Y9MvnQXV6G9raGG9+iI5uknbcmiWtzy0SYObh6ZhCcWmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776077865; a=rsa-sha256; cv=none; b=pqe1tt97XcuSfarc0LtHuzcF4GnpJw+zOOG/IpzPM5Bt+ThyZwvHAIFih7VCmG7zibHNRq HSr9yaBKXmT3t44QEV+k2TgMeCQ1iIO5hffzvMC9BIIxylDCYx4xNGPJxcHwrKCXbQ+5jx jjMChMeWzpbcUFuzQ5BgDbGxdt4FMwIL+YjQXutnWqLiRXxaajLJOl765quhd7YjTS+we7 X1D5X2xMC3U5bF8ycbrk8MXY1WKzV2aHoY9DwG+ybYggjqW1y5k4c8lu1MFMQy8AAPllNK cKTH+VQC8lC9wtzZ3vd5/CLL+V5PhBt+sE4DxSYb3gm2xDw7nxG4XmsUfSuQMg== 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=1776077865; 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=FWQdH7Ewgr9iPlDOHfqGronLLIBepDy+HoPImr6TIrs=; b=ARmiNsIwgzs8M1CgyeOHjs9mV/QMaVXaHFeBtakpKQzchmTmQHtUEfBuaKmGTyG4yd5xGb OwGKapDjPSus8aBYySEXijNCel/jxLhw4qcrH1J7xBxb2KDtS4lrAVzyUeO0QAxnYZQm4f yKs2XVBcdhX+DfOq0NAGlMsq26+Ke3WhVLuBLgsgXWO6wCHPCSgUQhtYMHiXMjNhoWGMLq s7yI5y1BCArdsT3pcrXU7a7gzZDSwWrcyRh9bkRMXYm1hBKVBLg2CEvmUHU0rBkxPd5NXA /do8ZihsCQNbXr+P5/S+vx6a/TynoLEr1SCmonNrF1ixJ4IYzJPqVHrUBXbRAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvPWX5Y20z119J for ; Mon, 13 Apr 2026 10:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32237 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 10:57:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 58718cf36593 - stable/15 - vm_fault: Reset m_needs_zeroing properly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 58718cf365933dc2c75d43f7154371344bf47286 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 10:57:44 +0000 Message-Id: <69dccc28.32237.8638128@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=58718cf365933dc2c75d43f7154371344bf47286 commit 58718cf365933dc2c75d43f7154371344bf47286 Author: Mark Johnston AuthorDate: 2026-04-08 04:21:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-13 10:57:26 +0000 vm_fault: Reset m_needs_zeroing properly - When allocating a page, we should only consider the PG_ZERO flag when handling the top-level page. - Unconditionally reset the flag when restarting the fault handler. Previously, vm_fault_busy_sleep() would fail to reset it. PR: 294039 Reviewed by: kib Tested by: Peter Much MFC after: 3 days Fixes: cff67bc43df1 ("vm_fault: only rely on PG_ZERO when the page was newly allocated") Differential Revision: https://reviews.freebsd.org/D56234 (cherry picked from commit 04132e01004316ddd0e0cde6ef15b100b7b1844d) --- sys/vm/vm_fault.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 2eed9851135a..907b02f5833a 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -273,8 +273,6 @@ vm_fault_might_be_cow(struct faultstate *fs) static void vm_fault_deallocate(struct faultstate *fs) { - - fs->m_needs_zeroing = true; vm_fault_page_release(&fs->m_cow); vm_fault_page_release(&fs->m); vm_object_pip_wakeup(fs->object); @@ -1370,7 +1368,8 @@ vm_fault_allocate(struct faultstate *fs, struct pctrie_iter *pages) vm_waitpfault(dset, vm_pfault_oom_wait * hz); return (FAULT_RESTART); } - fs->m_needs_zeroing = (fs->m->flags & PG_ZERO) == 0; + if (fs->object == fs->first_object) + fs->m_needs_zeroing = (fs->m->flags & PG_ZERO) == 0; fs->oom_started = false; return (FAULT_CONTINUE); @@ -1705,7 +1704,6 @@ vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, fs.fault_flags = fault_flags; fs.map = map; fs.lookup_still_valid = false; - fs.m_needs_zeroing = true; fs.oom_started = false; fs.nera = -1; fs.can_read_lock = true; @@ -1714,6 +1712,7 @@ vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, RetryFault: fs.fault_type = fault_type; + fs.m_needs_zeroing = true; /* * Find the backing store object and offset into it to begin the