From nobody Tue Apr 21 15:45:29 2026 X-Original-To: dev-commits-src-all@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 4g0RWs3k9Dz6WtTk for ; Tue, 21 Apr 2026 15:45:29 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g0RWs1ZFGz3RNc for ; Tue, 21 Apr 2026 15:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776786329; 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=oidRvEbF0aG81ePjmIfZiIcj5BRUovCx2PXzrDy/MHM=; b=ZDBKVjR2vlpf2gaW4qHq7YY4zMldNmD5MNUhXkg+1XyZ0+AQRWx8JhpMO+YlsBuMpW6GPX nZIoaGz4JBPwToVfYTZvcV4bIC1dKymp/7qRXJgEn2dMh2uB5uMK6zLqs1z7xA4xU3fkV8 DxNVVf4c9XQTfPs9e+qxi3QGJix8wLL+JOTYN5G2HLOYHp3TurHh90qwgM1Pszz95YVrk3 gWRyMTmP+1Cc1gHprTocNMK5wvRzq9BYGcgp6lwVh3AL7zHNhCi3jsT03pF3iahkyFQjJZ Oygw8U/WiVQVVnJ1tL+dqzIf57kKL0y8pk749aoAOGqixFAUGgMyUrC7TCXPYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776786329; a=rsa-sha256; cv=none; b=eTDhAk+phdS/YIFrT+/H25nS37I1uf3ASl+BoPRlcRUq8UiVlIXMcIYF0P9GOnGDWvU3lh 81TwIXRmLTd/ieiF5etoc8HY8nFVOOlR4DfpG2v5/Z48F05uDYReNOdGTSUd+MLYAHPQA4 aSPE4ENpr7BaAMUYwTnH4P61Rb5DX+uveoMeFOd7e9/LyzrETkpeIm7mBr7xoWNUTirJBX s3I6AX9r7ibwws/XW8/0SiumpYBmdGxWoC1Wr9tcq6eV2/M2tGzd3TKz+SyZmBiWrygzLf KVPFjf8Iv/tqPHQYoPtIUwrOjzOCVPX6QaBPL1tVaFdatZsJE2S14s5QQtum+g== 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=1776786329; 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=oidRvEbF0aG81ePjmIfZiIcj5BRUovCx2PXzrDy/MHM=; b=PKhnLooq4tU/6fwoPVnOiqE+KwpE4SgqyuYJjw3labTjlwq21vQT/KEiIAMMIFunNm+1ql XuRK9Sdaa2bTRnRKhVWzBLLZzM9xBJazL5I5Afh6NP15oPBEzciP/ipbIE9hjfxjCwb83B ZzJu4pf7FPNsVgTHJd8rcX3LoqGroNfAFN/wJpgxoIOTNA/cdOikxFIfSGFxzyVVU/E7Me Y0ah8F+Ul8i+uy12kNccKpkt5YlrHSnfJANYyjgsh6g29LuDCOh5os5DJA1eLdzqOgIMH+ g4yC1BCMwlQ+FElxLpLyqnejf7xRg05/+uhlZxdygUXt0MQ40PzF3H+Jm5g1ZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g0RWs19LSzqnq for ; Tue, 21 Apr 2026 15:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f19 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Apr 2026 15:45:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1abe7ead45c3 - releng/14.4 - vm_fault: Reset m_needs_zeroing properly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 1abe7ead45c3236e5325f43535e2513697a5705e Auto-Submitted: auto-generated Date: Tue, 21 Apr 2026 15:45:29 +0000 Message-Id: <69e79b99.35f19.7b1a6f0a@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1abe7ead45c3236e5325f43535e2513697a5705e commit 1abe7ead45c3236e5325f43535e2513697a5705e Author: Mark Johnston AuthorDate: 2026-04-08 04:21:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-21 15:45:02 +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. Approved by: so Security: FreeBSD-EN-26:05.vm 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) (cherry picked from commit 9b7c0f4f81f06424899094d4381dede79669b623) --- 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