From nobody Tue Jan 27 19:16:35 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 4f0wBD0N2fz6QJ6K for ; Tue, 27 Jan 2026 19:16:36 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0wBC3Jkkz3FBn for ; Tue, 27 Jan 2026 19:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769541395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=URSdji23XG6frlVhDYbh/UzsyIeUQX0xw4Uh4HmjpzU=; b=U+cau9s4YzAJzduqVsaCfpvZR/QUjgeb5m92FgddHxWgkYTDjzSeHF2l6c3PiJw8Z8XhT1 65afqlWuf/ooe6tqwDfKcr+M4r3X5qCfsQx3e7YjDp8i8B6mjUIX7Hu+GUw/uruTlC/vtv xUB8vvHDpsHGQBP2ry85Zo7bsJbmnYCuj3bfjYHaye2RLqz7OJEFI/tMkyOhqH3irTU1ED fblPSQZKlmXfvECfVW/3lL2Tx02A58Wv5KLhNtEzbxmx+brC7Lyzm+6CfAwZG28YY7snN4 rm9iJeIMqGweVBwdsG0uvtljWtePy8BUq0m0Vs/4gDs+ZED397+8+dfviEw1UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769541395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=URSdji23XG6frlVhDYbh/UzsyIeUQX0xw4Uh4HmjpzU=; b=UsLXilyQI6jKUCEqhN35JAJGs3J38hM83LvrCsFPczGr0ld+d50x6qJO3RubWoSnGoZOHY 3vOFxEG0MUBKUrSc208rxa+S0nsuI7ajYVL9gqlO7+c/rp81tg0P/oEHQMjfnVuAygJSQh uDsHpOG/L+mRkWx/Zmtg5YLl2iMlA3AGbiSVyr9IvmGDJb5HPF+84v1UMK3ZFYOAevUrMu JtUWOXcJF39hPpj9CV7ng/+RTwBQ8IELc8S38MTTi4ZqNaw725sUCASVtW1z+w5aJnu53L gTh6xohsH0jHeNkl6RdL9fqaoK0fQd6izKgbKxDIszs1yt9UYPlFeHIzlAFzHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769541395; a=rsa-sha256; cv=none; b=E45EpS5u1GFwsxDEOxWMOFPn3YR0RVYD6O++ktbxOXtfDzKHD7/ujoBt8kK6gN3Gr14lyf dDzoMmAhOMwgRqTHnTOzwk3ydrG3yUGbKDYY3+6E0TYXPE4st8wI7bLOMgR07G/NXO/hfv 8OvQvIuvVXwtOpY3bb1r5Smy2E7VU+A4rV4lfOMuiMJx1lRk/kqYLdMDwtqBJp41lhgPxH u5RnqnI+1H+ffW0EZIOz0Q0byuOeZJ/g0eOFSId0OoRyU4XNDx+gaQZBRW7SUKCUIBXYxL T00LzyKT5hN2Dtx9H/KSp/YNitjBdgG1u3FiXgL1DiRxAUg5FtTOsZcCu/lHvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0wBC2YfZz4Tm for ; Tue, 27 Jan 2026 19:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23e7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 19:16:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Mark Johnston Subject: git: fd02eb559266 - releng/13.5 - vm_fault: only rely on PG_ZERO when the page was newly allocated 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: fd02eb5592665cbf4ae4c743e1fa52d000ff522a Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 19:16:35 +0000 Message-Id: <69790f13.23e7b.38e652a4@gitrepo.freebsd.org> The branch releng/13.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fd02eb5592665cbf4ae4c743e1fa52d000ff522a commit fd02eb5592665cbf4ae4c743e1fa52d000ff522a Author: Konstantin Belousov AuthorDate: 2025-11-28 15:57:22 +0000 Commit: Mark Johnston CommitDate: 2026-01-26 15:38:02 +0000 vm_fault: only rely on PG_ZERO when the page was newly allocated Approved by: so Security: FreeBSD-EN-26:03.vm (cherry picked from commit cff67bc43df14d492ccc08ec92fddceadd069953) (cherry picked from commit babac9d7bc05fe8ceece1710b9becc5970492f81) --- sys/vm/vm_fault.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index bdde2bcc359a..605f677aecd5 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -137,6 +137,7 @@ struct faultstate { vm_object_t object; vm_pindex_t pindex; vm_page_t m; + bool m_needs_zeroing; /* Top-level map object. */ vm_object_t first_object; @@ -242,6 +243,7 @@ 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); @@ -1086,7 +1088,7 @@ vm_fault_zerofill(struct faultstate *fs) /* * Zero the page if necessary and mark it valid. */ - if ((fs->m->flags & PG_ZERO) == 0) { + if (fs->m_needs_zeroing) { pmap_zero_page(fs->m); } else { VM_CNT_INC(v_ozfod); @@ -1200,6 +1202,7 @@ 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; fs->oom_started = false; return (FAULT_CONTINUE); @@ -1459,6 +1462,7 @@ 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;