From nobody Wed Apr 8 14:04:40 2026 X-Original-To: dev-commits-src-main@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 4frPvX6QVnz6YB7x for ; Wed, 08 Apr 2026 14:04:40 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPvX5Tdlz3mMB for ; Wed, 08 Apr 2026 14:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775657080; 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=igpqVq/7MrcAF1xFDkQTFZU2YXlx4nvFek6+n2zP4J8=; b=lfG5lnBz1z+rboyCHvt+A9VffetCsN7fHcxtnNS8AxE3EnwRbwsLMrVZGOQowbEY1MiwZa f3yH7TZZnOMyYUMunXuZBu6pebfE7AQTLcRnI3Of6sC/SGIhSd3KlDr701nxS/ImuN9e3k x1dLalLAFb/2BxC3mFFNHCbmhPoq+/pD96SgmsWV7cv4ZSCpXCFokF2Us3H7CbAKF6QJGL /btfpom28W8MFCPX8zAvRdMh9KL1Sj9/jztPkCPz9uhfrmE7nMLaTAFPYwy9VRyUS11WWj 16CUyKQLVDl+dWMe96/QpRS+SZkmLY/BzALTYOdEIwnjwoDZGri+Gu/DTFVZ1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775657080; a=rsa-sha256; cv=none; b=BLfVpQoWUfCljVfRJNYwtPFAf+3mlgyS2tT4FV0rO1L/f7Da1sqmNRkCRnkrsA+xWhw0xc qJJI8pJOQF3KxrW/ac8Eq7s0vzcVeX7OXdAeGyKFksnmzNv3NdlR7P/S8qvLGDdgPBwxMu sF421BA5+z9BVYWr4wBe83H0pVSo9rwBSI5zgXIzFRaaSXegMN6CxrJfgRAqYV4TNk/xS2 FmO/rZpgMV1fsgzWXqqc2od//zUPUQLP287ZurbrXPBC+ULTh/FThSem2V1cEavLv6+uif nBdjeiBRuPeZ0K0LnF3o50WZFk8zh5LHn7dR5XwZOyX8BrmKP4T8E+vi9epUng== 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=1775657080; 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=igpqVq/7MrcAF1xFDkQTFZU2YXlx4nvFek6+n2zP4J8=; b=TXVJOwaLnoyuaXa87X6LVq033kqZrEoNdlrhjB8PgWniVi2+zwblnT4VsAko9sIZmk4JO+ o/j1a/UYlo5hJf6H62AFoYI+rjsoD9OHEj3g76X0HOsGX5LzYxZjleSPd2SjP2gAcmvaE7 kdbUeWbx9W3G+jraobfKHvtD2E0YX8l7yAukZMC+/B6x0hrOWUyZbGNnRlu7hfRzOUlcvV j3N3RD4yFvz/lP/6hqNDKMqk+7SJNfXQwatMchop32R6Y5qnMwpyGPHLfzZ6BAfMUawxku 1Tzr/aUpp4vkxn2ZYMe8NBlUFWsTKrPIZkUr8FuddSLO34It3WxPBlIoOnH/4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPvX4p64zTgN for ; Wed, 08 Apr 2026 14:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b59b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:04:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 04132e010043 - main - vm_fault: Reset m_needs_zeroing properly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 04132e01004316ddd0e0cde6ef15b100b7b1844d Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:04:40 +0000 Message-Id: <69d66078.3b59b.2100caf3@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=04132e01004316ddd0e0cde6ef15b100b7b1844d commit 04132e01004316ddd0e0cde6ef15b100b7b1844d Author: Mark Johnston AuthorDate: 2026-04-08 04:21:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-08 14:04:29 +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. 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 --- 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 125311912c20..9f00e3b51a37 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -273,8 +273,6 @@ vm_fault_might_be_cow(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); @@ -1373,7 +1371,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); @@ -1708,7 +1707,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; @@ -1717,6 +1715,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