From nobody Wed Dec 24 00:42:12 2025 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 4dbY450TRZz6LBBY for ; Wed, 24 Dec 2025 00:42:13 +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 4dbY442Ww2z3ZKg for ; Wed, 24 Dec 2025 00:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536932; 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=BJhNbGkNfzeBslFwwAufFL3OBdnlHqPsIoNf3feNQYM=; b=KineANeVPb8QIkGlnZdYQ+EB843354taPiFQHE2dSc/Ax4Lq+pz35vE8CvkGf9rTFpukW/ a8/4FIHHFQm+ptl4GH2hoKLy/Io0CYeOdw3VngMY9isVA0ZJODiYL3Ad9Va/ORwXL/l6bL 7/ljlI3kM89Gnbfs85XiQPmn1qaY3O+4gt3L7sY7VGZNEhTZpek81QefSu0Dq7r6uKzVcm tEMpLmMmdZc0LMJRpRMMYzOzE2DBx2Rf+WYXag8jck+AMYkQyqGehc3M8g0nFSxmv2sjx7 TdEZZbZYqr+T55hkwdwGzEsy3nBhZg77FK3orFFUcn7QG8h41xriyPYviuG06g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536932; 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=BJhNbGkNfzeBslFwwAufFL3OBdnlHqPsIoNf3feNQYM=; b=q/p5Kg480moBS1irY9niPheEG9h6gjHSzn0WfF5zmbavZPglxCIM0EJoPA9OemXfO40+Xw CiTM4vittxy/yOkBEWtt7XFqIeaj5FeSlWsGkcyd1KAusKQ7Ute5KBlGDT0pkxjLdSnPjb +xDn0qTy6MmzxJaYEWa0/mtS9dKSvr0s/Y3a/wAIXxJf37OkIkEBab77/DA67FYIO9ElpP r09gRJzoZmrOXecnBsk7HjKKRKULl/TaxSuYLXxwRp4ghSFdfg/G/LMItgz/TPtZt8GF5w xBGXpODNJ23KV7MbG7TCgj7ZttfK+Z8bADNLqIKA5HNLoRc3MGB2Pv81IVrUWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766536932; a=rsa-sha256; cv=none; b=S7F6sNibbndL9gZNFHLPlA8xM0tyrNetlZaTNwMVdcdOLyrsmfR23Mh0a8S4hREMOl/NUU IMWmY5TKOE1rXCiEt3uGg1noDqcmbO/jBiRB3/p5hrZ3L1Vb+hrKhyy+nRYjod62dG84ws e9RnTjpNN5bNj/DkpK8C0X/p+JT85TuXc4oLxdWFnZSW/CWqkeRzq9FMuaKlRCKo5bAyVf +1MqYdCWPKJjeHGT8k9VURVamjPnoa0KLo3lRaGV5ItRVgcLbm3VQCMtHTt7K3RJG9fvXW 6g+4e9PdMuNE3V4EzdFrMPQIGENED4iiedSzXRdtI2qxUGtVJazeBX4fvtZUrA== 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 4dbY441rVBz3Sl for ; Wed, 24 Dec 2025 00:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3059d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 00:42:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d7bc2ee3dedd - stable/15 - vm_object_coalesce(): check that coalescing does not revive stale pages 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d7bc2ee3dedde2a9188234a563c4259c480d2664 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 00:42:12 +0000 Message-Id: <694b36e4.3059d.1b685b7c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d7bc2ee3dedde2a9188234a563c4259c480d2664 commit d7bc2ee3dedde2a9188234a563c4259c480d2664 Author: Konstantin Belousov AuthorDate: 2025-11-22 18:43:57 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-24 00:33:00 +0000 vm_object_coalesce(): check that coalescing does not revive stale pages (cherry picked from commit f94bfc469df9a2bc78ed15cc42525d09e3413e0b) --- sys/vm/vm_object.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 413ba5459e3d..117900135ac3 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2244,6 +2244,23 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, if (next_pindex + next_size > prev_object->size) prev_object->size = next_pindex + next_size; +#ifdef INVARIANTS + /* + * Re-check: there must be no pages in the next range backed + * by prev_entry's object. Otherwise, the resulting + * corruption is same as faulting in a non-zeroed page. + */ + if (vm_check_pg_zero) { + vm_pindex_t pidx; + + pidx = swap_pager_seek_data(prev_object, next_pindex); + KASSERT(pidx >= next_pindex + next_size, + ("found obj %p pindex %#jx e %#jx %#jx %#jx", + prev_object, pidx, (uintmax_t)prev_offset, + (uintmax_t)prev_size, (uintmax_t)next_size)); + } +#endif + VM_OBJECT_WUNLOCK(prev_object); return (TRUE); }