From nobody Tue Jan 27 19:15:48 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 4f0w9K1WV6z6QHrH for ; Tue, 27 Jan 2026 19:15:49 +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 4f0w9J4jymz3D1B for ; Tue, 27 Jan 2026 19:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769541348; 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=6uqs2vJ8rSs3PNmRZsXv2JKNsB4DK3P3BhgBnSxqaG8=; b=q1fiOqdAKrz5nWZpBEbcNtu8bT+1XW/6K3Rib4ym/JXmJVP9q2eOfKB64qAKOy7cS8wJzj 4/v5QtbX8EOjuzqPzm1JR9W+bapRMUfV+C9e/kvcbJmX1a1tRv3o7jQ83CknMfjUFHkIrY XYovqjSCH/CA32MI0B4frMQzKME7HI4HoigZAFz2L8lzd0lAwA9GfbSxTBtkagjMjcab6R 23lmHvcUrN6pDHbJBwcgJP0ffGyC8N1El9dEO7z4iThPKQOh385gqOpjtjAi8pT2KTfIQz V2ey/6x4NVuSV0HKgoc/zEI28PqDSs93yYhUF/smliS3DciBEn4lfyQITFjUJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769541348; 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=6uqs2vJ8rSs3PNmRZsXv2JKNsB4DK3P3BhgBnSxqaG8=; b=qNq9A6WC+pxFLpiN/NV2fkqSGGjJQZMGl/3vXRD5zDhal4JSFLbRvLYFLQhzhwTPufKsQj mtjpEvlubXgE8EkPYNWjw2povw6v1n9mBeDzQ+ZMdYSqz6BSOpliIqupR/4bjkjzhz0hxu SameKlgYG/jVZCSpOgjdctJ+hcAG46TC3IEl8vYbGROpUkfl9tyM+W2OuV3F8viwCniFiM sUKlH4+h2yVg2r31sxMeYnERcqrzMSY0W16Z1vkaB7Ibwngr2K63GMcYKEahb8OneNHIFs Dg+8vaoxpH7EeTL+kWageNE6vh0LLnhJVUhLALdTgGQLZ9/cZqywUZCgdwQeJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769541348; a=rsa-sha256; cv=none; b=ZYH13XF1jxveDngCVKj5WcP3fYTE2sQVp0bMraJbGUbp5YsXsqRZ3V9lGzFkrGQprpnKmC XepSBjVlIa2gqiMmft24bj+DdPugtqGplRAyD4kGiNNXsGssafIWjMwrD57bKUg6O6txBK 29iqVjfQU0AmKfdgN3bXPyqaKK1d3mmkswJLXEn7PNEBzjI1rK4pcUzi4Bmy6xWjcDzvtW 4S/sr0Sd7fkNXM2iHFJsk7mABXO8M3qmyzaT3rmBZb6dcMUBHABAK3MYNWF7ITRAvULCzb PamEbco/EzKCXiWxPRUNTV/cmdSD8V9hwTCof473v1fg5KctPkbDnNdwWXgTJg== 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 4f0w9J3bfjz4Z8 for ; Tue, 27 Jan 2026 19:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24584 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 19:15:48 +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: bb150039c0ce - releng/15.0 - vm_fault: only rely on PG_ZERO when the page was newly allocated 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/15.0 X-Git-Reftype: branch X-Git-Commit: bb150039c0ce2de8704d67b104beb306482c3cb2 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 19:15:48 +0000 Message-Id: <69790ee4.24584.65068039@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bb150039c0ce2de8704d67b104beb306482c3cb2 commit bb150039c0ce2de8704d67b104beb306482c3cb2 Author: Konstantin Belousov AuthorDate: 2025-11-28 15:57:22 +0000 Commit: Mark Johnston CommitDate: 2026-01-26 16:48:40 +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 3c0942f99209cb95be64c95322b5f99b575db6b3) --- 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 22558a12b44b..f9711548e23e 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -138,6 +138,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; @@ -264,6 +265,7 @@ 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); @@ -1181,7 +1183,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); @@ -1296,6 +1298,7 @@ vm_fault_allocate(struct faultstate *fs, struct pctrie_iter *pages) 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); @@ -1586,6 +1589,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; fs.can_read_lock = true;