From nobody Tue Apr 21 15:44:24 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 4g0RVc3Kd4z6WtvD for ; Tue, 21 Apr 2026 15:44:24 +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 4g0RVc2Z1kz3Pht for ; Tue, 21 Apr 2026 15:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776786264; 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=xr7mFLLRZfGQGLad6lt9KhesEtekZKfpKYMfJwpXNj8=; b=i4241wlPBS3v7XUPVa1WyIrzlq47yLF34R405QMICEfSA1y/kzeQGhi1/9mAmJXqeLZ9HH skankJ/7Lb/y/SNVpRMFPZXFh+jr9vsZHAgtB3YOrVD8o1Dugo3+uq6FZ0qgY5mImm6LUe BVfllp0zzPp4Mu0VGnEFWYtyeyvt7rzJbbHhE71REZZU2lq997SuWLS8Yig1pEZJ0VMi1V B32C+iMbqbODlaUNKCngEkJjJYM5ikKK5QUSCl80wNIrFnHsosMOMNnx95zf+dbwaDN7yN YPEg8Sqi+J+wK1chmEGotba6uG2jBflqtv+x4EYJ+QTXqpHsw3DxVAfJ5ZWlew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776786264; a=rsa-sha256; cv=none; b=GxgAFin5zWqCfO20zqGh/KGhVwuN4RUxyCYDTGjTdT8NESSzbFFvI9dGOXK2pC0lGcO1Ae zdMZiKl67R7l/Yo7iq0vSxhA6TrpV0D6jpXkcWN/5SMiySzkDsOw1Ekvl/c0ZCaphxx0lS Wy2yqge7Jk8xPW4TxiiVM7YFIREx78QhUT6eAWObIdkF5KYoDuT4/9yUZKWmEy1QglNsCM UQRl8O6THFYubKJop9/kojYWdz6X0U2mPvw/3K2Q6dvnzeydvkwdDfXxOYGlyR77xzujtr erMfOiY4OtwSdVlF1RAfyTHPjyoWB4CqAiHRwZ4SN2Gj5jcvlO+7LFHhPgqzgg== 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=1776786264; 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=xr7mFLLRZfGQGLad6lt9KhesEtekZKfpKYMfJwpXNj8=; b=TqJPFrmHmYQBxOd6grgCYCPD/sT+LbI8qTct3972dfKFR+0P/6RvdJCmNNFru1kDnFaEt/ VHX4ubopn+S1rbW4xus/vO+86mMhzh42rE72hRvhK/aT+yMeaSBNBW8wD/xjdUEOTrFQta KvFw+TcCg6lpQfc0rMiczjMsfJZUV4nkqbecQhyUnw+LR9qJYcxbkPj74UC+a5d2Bv+DJA U5W/pXkYEQnKZ9kZxmOn8+5T1FJR0YTTwhM9iJ5qfqtAo8v9vCAGUASGdQoMSJWaeoqdQ4 BkryP/+DAa5JuJxbA8sewxydSDHaSDIz49rrOZPcod3vnA78PZStmiHHB4lwEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g0RVc23dqzqc8 for ; Tue, 21 Apr 2026 15:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3648c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Apr 2026 15:44:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ffb21713d9fd - releng/15.0 - 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/15.0 X-Git-Reftype: branch X-Git-Commit: ffb21713d9fdaef1e416a4443c7bc234cfb5457d Auto-Submitted: auto-generated Date: Tue, 21 Apr 2026 15:44:24 +0000 Message-Id: <69e79b58.3648c.3bc454a8@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ffb21713d9fdaef1e416a4443c7bc234cfb5457d commit ffb21713d9fdaef1e416a4443c7bc234cfb5457d Author: Mark Johnston AuthorDate: 2026-04-08 04:21:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-15 19:02: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. 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 58718cf365933dc2c75d43f7154371344bf47286) --- 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 f9711548e23e..fb9cf250ad5f 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -264,8 +264,6 @@ vm_fault_unlock_vp(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); @@ -1298,7 +1296,8 @@ 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; + if (fs->object == fs->first_object) + fs->m_needs_zeroing = (fs->m->flags & PG_ZERO) == 0; fs->oom_started = false; return (FAULT_CONTINUE); @@ -1589,7 +1588,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; @@ -1598,6 +1596,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