From nobody Tue Apr 21 15:47:06 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 4g0RYk3mmVz6WvXS for ; Tue, 21 Apr 2026 15:47:06 +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 4g0RYk2rrpz3VHv for ; Tue, 21 Apr 2026 15:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776786426; 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=LDF5Np6Bw9CUNU2kOx4gZxinmT3HES/cPQ5Y1IhgCu0=; b=UCWskPnTdOCqVeLZL7Gi6ak95790z4UYNXEgJvXhfr4g72TXgi6lp+/63GqXj8b+bgGwiD NoHtjFAKQoCfhAD6LQFcHluwPpIKYp8A8+Zc96rFTSZIQZKQOJzIMAJOvtRa9yMOmhNrkU v4E+EfmFMnQ/AgK/lRF/7E9SzApUkgLVhNA0zg+2JFOBPef3PPkHC+AgCo9O4kDBqghudi 8s+Ke6jr8EI3TzbwTY1f2ZjcLp7skqMD0WhHDiqdVIF5xSNoMGpAkzmhVzsuMDwcpIKDWX iE8PI7NXSBGLPOqwrcU22p+pvbnZOXhTQKztQSKpFSiD2StbXUQKLceOY9Qllw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776786426; a=rsa-sha256; cv=none; b=wT5IkyqJmJXws4O31FnU7UlxL/tFWl1Fdl/EeZx8ESvpcJbry+7vIal1UgBze87FCfm61d 2h8hKhtYRJeXTd0M/f2x+Be2UaUn7K5c6ini+nlWXGRMHCNtwX1aMkMT/SyuO93dcXcwwV dnsjavyCzXHBolBsCaO7SCGLOJgXV1pOmK3o9eqVJaVhtZR6nVBVSJI49dpBRVGqTOUgqo ie7VTs4kiPwqqG2a/biuimI6DvgwYD03eA+YeqHzpXizyBnZyoFQSxLl4BsYHd/YqY5s3c oaNuSkh7LrFIGW4DstijyuqET4HanIJLcIg6KHNHzQg+QcvWo7i8RGfQU33rOQ== 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=1776786426; 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=LDF5Np6Bw9CUNU2kOx4gZxinmT3HES/cPQ5Y1IhgCu0=; b=I7jbYf7oZBuInAMtU2fGqIIZXSg3iMFdlreOG+ZGjiCTD0ByrX5oA63CFv33uaglL2fvP1 tcSX+OL2rgSzHZmjjAzsW2z0xADj5icRpk9DCfr3A1dsTNNwO9/IVL8yqnJepsumBb4cdy HCFvnrL7HdLaBhNEdzNx5Oz0ui5gV3pa1drJxVWsBnWxP1pLDIWlPEKCo7ORaTk7bHMA7W 5h8BWP13AnKwUitZAoZ55Qdb6YvzOAtPhTaI1rf+MZD/0y684qeO/nIOJmvxCtKlzKmVEs SFvqYCbbq5oq0CIsjPWxLczuezo0sBa4WEQcL7rW79C0cWrRNSp5ExL9sTQxnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g0RYk2MJbzqnw for ; Tue, 21 Apr 2026 15:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 345bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Apr 2026 15:47:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6c9dd7528350 - releng/13.5 - 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/13.5 X-Git-Reftype: branch X-Git-Commit: 6c9dd75283503091c202cda1606a539f65bda85f Auto-Submitted: auto-generated Date: Tue, 21 Apr 2026 15:47:06 +0000 Message-Id: <69e79bfa.345bb.10fb0c33@gitrepo.freebsd.org> The branch releng/13.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6c9dd75283503091c202cda1606a539f65bda85f commit 6c9dd75283503091c202cda1606a539f65bda85f Author: Mark Johnston AuthorDate: 2026-04-08 04:21:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-21 15:46:57 +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 50f7b62f0862f764215cee98547d5b8c0979ec26) --- 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