From nobody Mon Apr 13 02:56:40 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 4fvBrT416hz6ZMWR for ; Mon, 13 Apr 2026 02:56:41 +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 4fvBrT1S5gz3pFd for ; Mon, 13 Apr 2026 02:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776049001; 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=C6fXXSswFSxjTyJ66xjFa5iTviYR5opijSJ0nyzIWCo=; b=UmXPzy5w+DG/ZLDuEeno86cfTIyfQ7Pm+RvkEoV36Xk+H1CXFZgC658FVmKr5EfpnzKHEp dONno+hHGIA1OkOrqd4LxJr40XS+BgFxwxgpFA24ctoZtzbEryfomiMYGzCx2oG+Dd6op4 UY6eAvQq77ztcIpEcGU4ews1i6rzZDSbj82mkvCUNQcr+eUpjk5a8afHU1e0CzlX43F5fb SoLAW2zSrMymrvB3vsTOEzMxNGqdNYpem6u3CPu7uj7QTl6YugctOcMPl88fXQ+jSXgVDL fvke8stDPrv1ToTPew6PsYtZz4n8D3cDmI/qSp51K1JQDoXYH+wekrgIiC4tpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776049001; a=rsa-sha256; cv=none; b=BfqXcTil8bmOMyZuUtIwCOqk1QC2rkUJy9dLdTB1ZF+lfpd0S8KshQqdmx7qf8W2qptGEd P4LNxwCetQPC45yBBz1xGT4mWck1KlFOKQdrC+YAb0IJF/mrrn3mTm96vE/l9pAnkgOWtf F9ARWi24n+punPRdY3Lof96YBxs8lvRPniE7JUk9XADxUpqfWQJTxXT9UIBLOypb+KuNUZ mJ113mp0r8cpwGI1FwYkPNBdpoMeuiqeNJNS54CrnFY88vVbubqVNek3ql8/8I+lIdUh8t +tbQONNc6GgiLjLrxsUtIrEBARfQAW2pglu7eSu1b0PLeOJ9UPQ2nDx3PQiAoA== 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=1776049001; 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=C6fXXSswFSxjTyJ66xjFa5iTviYR5opijSJ0nyzIWCo=; b=JTAiRuyOT3BemsvbRwGTVWSpUqX+IoVxqUeOZdaXQgHM/Idq//QO5hR/WTUmJfSsiAV9CX r6pgJBPgG0M9QcwhWYp+yhuTCJZD70Jz2qimcz+uUosyY3/wIHH4k8i1OEF5qdXgjHtWCa Yw8D7AS2d96hYhBxENBjSqS1aHPzQEEt2Al2rWAN6PjP0zrFDJAJ9DxnMoljOkz4sXAJrQ ompmePHn4EBIWgUog27iM0Edlydk9YefzX0SQhY+/IH0XKZtB0jC50cZj8OTLBwzqQMH3d ZjYF+sU62hFhL6OvbrNMzOaCWPq2CHMDLEn1cCVNLVypKuwB4HQK99MrddVjvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvBrT13LdzlqG for ; Mon, 13 Apr 2026 02:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44ea6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 02:56:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9b7c0f4f81f0 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 9b7c0f4f81f06424899094d4381dede79669b623 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 02:56:40 +0000 Message-Id: <69dc5b68.44ea6.274d1173@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9b7c0f4f81f06424899094d4381dede79669b623 commit 9b7c0f4f81f06424899094d4381dede79669b623 Author: Mark Johnston AuthorDate: 2026-04-08 04:21:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-13 02:53:32 +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 418f39ac2a2b..87deb993402c 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -272,8 +272,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); @@ -1321,7 +1319,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); @@ -1653,7 +1652,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; @@ -1662,6 +1660,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