From nobody Mon Dec 8 22:33:21 2025 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 4dQGwL02Hvz6KV5Y for ; Mon, 08 Dec 2025 22:33:22 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dQGwK6Qxjz3Ktg for ; Mon, 08 Dec 2025 22:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765233201; 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=yd0jaUnHAqunefY+2aRd0sEuAqTqk6msRGoUWg9EK4s=; b=spjLrFVDojGECeEQYW49CBZApxrkpToIoRHAt/tO2VHkUfzgP1LaMgW3QZakPmJnR4giZp Eodvo35bKWJdWiLgw+RS3ztiBJOJy5DgxtC3BnU31c6IICaKaNo+1RjrIQs5XjG5+oTSYt 5Wc/imzFH3U60mYlDm10kIAIzYPnR85zB5jYFnAhPZ+9sGM1f4wSktgdLn6YQvpoSTk2F5 N2W8yIh26TW1xe9cd7CijBA+6EdR1TrsK5I3GpNCT3FMI0ESHH9ptNknG0RB5xkL/1NNmL JtsVc9VNUFRhNJY4+OSL+qRTLvKXchtONJZamezsi8dG6n2IE/74O8joyHv+fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765233201; 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=yd0jaUnHAqunefY+2aRd0sEuAqTqk6msRGoUWg9EK4s=; b=noxRWu5AxstkndYcqSDS59wE9m7b1bd8j0l5fKKfEsw5LBp8QoJWPhPPHjnPNGUaYXJPI4 iMw4SHzbeaMI+sJEVvNb9qnoSu22ykTjQMP2GLbB9fIvIhngAP3klyeerVrsviqZd6QwsG qteYWtJCDKyRqvIqABpujlT7cNKp5WH7TWIXc7AU7ggYXImhVOZApkQfMPMNmjtWtyjE22 EbHvijzbPR0vq9cKYNUoUP5tAKGmTNck6srTOLl0QQ7c4R9XkxWH2dB/3VzUbdowkircrL QH+gBD2fs/xdTNEG/PC6vwly/Dd2TPum/4EFWnj8yA0qhHbTywRNxI3wO0rCqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765233201; a=rsa-sha256; cv=none; b=PDo99oEWZO9xatm6u9oeyM1pApLpKuXvHsx7Kz82T+mg76YZslRlThqHiS6VyLI3o6NoSG ajAhhPoJsAFfQ23KXO74b7sSuohM5UhunqhuFDhCBB4GFjBy90gEhISeNbBNkbQ8s2BBOg ev2uGj8pLyLMCxCrpK7WdPk6y/arTN7XlHKO3yrflyj5MEHxI8bvuSn2hOndYdKXvxb1dX EKu7QaPIemh+DVeeSAmZ1fEY2Q2fRh6bX+7DmIwTPJFUez1oaiVC/JL/roQ+o3TuKZ01fb QhJoWu02AmQh9uwEXzH+Dsl8hdqIV8MZtfL6yhSqhgeCHiWMR7F901335v2TIg== 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 4dQGwK5zz0zXX5 for ; Mon, 08 Dec 2025 22:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39dcb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 22:33:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cff67bc43df1 - main - vm_fault: only rely on PG_ZERO when the page was newly allocated 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cff67bc43df14d492ccc08ec92fddceadd069953 Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 22:33:21 +0000 Message-Id: <69375231.39dcb.1c4fcec@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cff67bc43df14d492ccc08ec92fddceadd069953 commit cff67bc43df14d492ccc08ec92fddceadd069953 Author: Konstantin Belousov AuthorDate: 2025-11-28 15:57:22 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-08 22:30:15 +0000 vm_fault: only rely on PG_ZERO when the page was newly allocated If the fs->m page was found invalid on the object queue, PG_ZERO flag is stale. Track the source of the page in the new fault state variable m_needs_zero, and ignore PG_ZERO if the page did not came from the allocator. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53963 --- 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 3bf16778d987..f7318f96f709 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; @@ -273,6 +274,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); @@ -1219,7 +1221,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 { #ifdef INVARIANTS @@ -1352,6 +1354,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); @@ -1686,6 +1689,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;