From nobody Mon Apr 13 02:58:42 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 4fvBtq2cfWz6ZMlS for ; Mon, 13 Apr 2026 02:58:43 +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 4fvBtq06Xqz3qVH for ; Mon, 13 Apr 2026 02:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776049123; 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=0RFY9YZukwAMTtRJYkRVmadkYcYkyfCoTmL3CEt9YEs=; b=FvF6wRnvW5gcWbAgItaFaSNpfS8uvEKw8yTOaSD5N3XW5qYHNzlh6JyvVmNsRqi13DETu4 srYJpjsm+E3727+custkBq4cLFHHO4mRNybXTcOV0+C9YleIYZy689zzlIMVVebL/BrJKi vQQjyOFnQo5zeXvgUQs7/IUWoMIwDfbjKS0bMv58NUx+LzttWc+PC8cXZIdzFc7L6RCxgp CZUOvZCPn5ugpg7Un4LxJqm7OM7xcAdSh7fdQwVaIE1l7zXKt169JlLS1lH1+bYHlQrkPQ nscxKeJORRJrjLj+MpJ8EkC/d6/OuF8YCyuDHO+gHibmLqq747AE7C3IIdlAcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776049123; a=rsa-sha256; cv=none; b=FPew/Avk0P30S4Dcs80V4iHB2GWv3yDsJx1dwJHjeugRzgSPJcCn8I7X0sfBxKWTbCK+F1 AVDwuLI79TGWugDOCx0ZnxYtAktqp0kUPXyJEPqhHlU/mn1CqYi/uGzHwsybePSsdGKPHG OznYw4/9c3I1NsyZpB1D5Id/LI7+OLPIXmNJh/OPxNaKSxYciMmgj0fymgmjBzCC7N7yDU KPvu2y1S5g3XHyG7hMuCAD31+fC8B5nV45/0TrIx5waKh3tZ+W+oIox4aJ+amKe/mMgpA4 vF7zPTZyf/Vxj1dCApGkxAe04FWWeOp//ZSYlbWPM9KOret5lQULg/H1Vh3jtw== 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=1776049123; 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=0RFY9YZukwAMTtRJYkRVmadkYcYkyfCoTmL3CEt9YEs=; b=r0QaJ5doanTgIuLIbgA3ZuiTi51xsJFj7KSAlZ3cz0jdUKrimB802xSzb/ZyeVqLNp1BCW xeHdU6bfJM5w5vg4YvQriBU9ZdO4SKiDc4A+Pe5XKcyzKBZLM1DoPoezvVrkDBYA6cUtwi yZeY47APwHsVsjZ0VUKBTW9aruNLCI8fMnUsg/h4oIIEfqfmjSI+F0w14nZ3lf3sM9OKSf teLwlG2rNYqaCc+Z0BkB5rb2sk7F8VGpyfO4G5LLnKGFdi/F5E1Cea13Yx/WHbSfy0GP3w 6jbh2L6BMqcojddaYdNzKxOOPqMrZsU92Bi/+awxWBcDejP9aFKQAvYb+TYElw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvBtp6qKnzlsB for ; Mon, 13 Apr 2026 02:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46509 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 02:58:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 50f7b62f0862 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 50f7b62f0862f764215cee98547d5b8c0979ec26 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 02:58:42 +0000 Message-Id: <69dc5be2.46509.31529829@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=50f7b62f0862f764215cee98547d5b8c0979ec26 commit 50f7b62f0862f764215cee98547d5b8c0979ec26 Author: Mark Johnston AuthorDate: 2026-04-08 04:21:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-13 02:58:16 +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 605f677aecd5..614cba69002e 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -242,8 +242,6 @@ unlock_vp(struct faultstate *fs) static void fault_deallocate(struct faultstate *fs) { - - fs->m_needs_zeroing = true; fault_page_release(&fs->m_cow); fault_page_release(&fs->m); vm_object_pip_wakeup(fs->object); @@ -1202,7 +1200,8 @@ vm_fault_allocate(struct faultstate *fs) 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); @@ -1462,7 +1461,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; faultcount = 0; @@ -1470,6 +1468,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