From nobody Tue Apr 21 15:45:59 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 4g0RXS2Rchz6WvHG for ; Tue, 21 Apr 2026 15:46:00 +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 4g0RXR6dzFz3Sh1 for ; Tue, 21 Apr 2026 15:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776786360; 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=B+FtRFA+WXCCsl4VYAdBQuaC6GxFxgjH6LTyamBXKZk=; b=IYGL8qsPHq/yQ7aVf4bmxQzrD9MumKC9+3e21bYr/z1H5xWp5BJmp5LKx26ZRDKzA9BAtf nElCAD9J4h96TqU2ys1BY2wwC7niadopgATBSoUv/XZD4M3r+JwfsowQD36WDaiXRIklKl h2c2J7YRGMFBnHHInUALu/3U5NamAmkUSOS4/QfUpL15uyBisfvWKghhjNUAmU0SQAWFMK N8ixxrT70Jmez/Dt3yeHwHt/iPcqtR4bfFV2K7y9RU8SNn5K2/1X9IjbNiYIFtdsGCFd54 lWSdRu4n3EKH1AfRfczjlB7AlhK3c2NpceWHeEV7Ndoyq1KgIRgyjuuayac6Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776786360; a=rsa-sha256; cv=none; b=qG/OK8wEV1lT0ELo4mRMTZXXipqJlEXQ82PoGN0D4Jyol69GAqL2cZZrKbKkeeAcq1w1hi SMZlOAu4xrJEauQxGeOdAWKSuFFfmWKJVERiDdk9DAJ561zJwVbDdmaVoInsq3r4sAxcOc 0zF/Tn2+fYNDjjRxoUH2UrOg82AnU0q7lRALKfWW5weMDpu8rnoOfwyJe+nMD/izbGpT9O qgzzFMyvk1xukGpnKLjfn/+9N6sUMpa1bF6ucN6D1gpYvfM08jy6thhsiSUuqIpGp0wAvH lXz3K4eZq1w9rXKeIWx7VCQghsPzGCq2c4N4TNW2WrgK52fW5qb2K9PoBQuR+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=1776786360; 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=B+FtRFA+WXCCsl4VYAdBQuaC6GxFxgjH6LTyamBXKZk=; b=NMtDYa0j+yTuurknXFWXGb5nA0HgTRuFkpxghebtEGm6SDTyCz1UkKEO6bH/Q1tEZaQ7dh WOLJ9/4SffrlLsc9zDRBZvY/lUcZD67cqWQtl0NhzjguKpZXu/pK4ArhfCTQj7Uu8mVNh8 Q3AgKnnXadaBo75yVagUe7djo2+0baE+zjEAmeQTjfGOuRuYL19UZWMA5Ajp/erapTiOcQ 9Cakczlc+aSDxvAIlzw6YRiK0hbiooL14vY2KIKUFxzgx6Z638rbSjuO2R6PdFEJNY/ALN aYs7zyYAvRBcACkDTQ85AOCWe6L4r+uxtf20vilyO7i602Sfx7Djpm/8QHVETQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g0RXR5wKtzqhm for ; Tue, 21 Apr 2026 15:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36cb2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Apr 2026 15:45:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4d22b3925df8 - releng/14.3 - vm_fault: Reset m_needs_zeroing properly 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/14.3 X-Git-Reftype: branch X-Git-Commit: 4d22b3925df828c3d37d7b63820283ed97a78035 Auto-Submitted: auto-generated Date: Tue, 21 Apr 2026 15:45:59 +0000 Message-Id: <69e79bb7.36cb2.227e58cd@gitrepo.freebsd.org> The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4d22b3925df828c3d37d7b63820283ed97a78035 commit 4d22b3925df828c3d37d7b63820283ed97a78035 Author: Mark Johnston AuthorDate: 2026-04-08 04:21:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-21 15:45:46 +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 64580c34c0a0..d7f4a478870b 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -265,8 +265,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); @@ -1288,7 +1286,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); @@ -1556,7 +1555,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; @@ -1565,6 +1563,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