From nobody Wed Dec 17 03:53:16 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 4dWKdm6bLtz6Lnx1 for ; Wed, 17 Dec 2025 03:53:16 +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 4dWKdm2kmwz3DN8 for ; Wed, 17 Dec 2025 03:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765943596; 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=WJQSebcFMvVuLdmfHAv4MfIvHD5dXqFlrqM9/xKP3Ac=; b=JHj8RwwCEDRG8K3n4vtqnhZIZyXESgMtxUQmv47opmloqLSCDgiiUsijoCkx1piwWLwq0u 4V9NcuoySppS7DYRcgpGwNUy2rVKuR6Z2zHhMo1LxlGeD4pDRN/NbIM3+z8UXnD66Bb3DI Ghr6AGOug4N3szudg7IzMTGyCWujoBx5MWhPQzow/mmvdFKuv+ZZ8Xz4dfGKxqCZwe4jz+ paMFKLF0Ga3HJI3exeew3F5hRmiqrRi7l6WemSn2W2sIdVkhKUU/9Mde2LNfz8gd6PeShQ M1JfYm5l5LJZW6scKvQQJI3yxvDbRLAiGvI8tKXIP26MzQEbt3ky5htPhMT31w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765943596; 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=WJQSebcFMvVuLdmfHAv4MfIvHD5dXqFlrqM9/xKP3Ac=; b=Ey+pR1Zn6LF00YmMkaBB0AsUyghol5nP/bTAw1r2kKb2vGHQzbwp24KMPTFKtGAFKUu6hg vg2qJ8YusEyFR/uWXdTAeFw6OgN0Ysc5nftsLs6G5UbdaPEIuUtHj+gmgyXepFX1Nb6pa/ WK3h6tT8dm2/NZcztZNAevIFUIURLmKRDkkiVcpEGneh+B5xOTysfCyOubmin0a0iKg0bs /0Xsj91p6KnWzjJM5CIJrTYjF/8zNiBrudPYIx3OInZup0t8b3qWq4lpsTSIwrUMkQfgys WKjSCLmVHlnBtguQklDl2HYoEk2vsjOph2LyxCxGIV34Ba7yABONDnTKDxH8IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765943596; a=rsa-sha256; cv=none; b=tNZgaw0NgfyF3g197m+qHfuNr9OxXUcob2o6beq7t4P+Yl9sKzpioJGPypiK++K7LJTkE4 pF05X2ioBvnNsqAzKo6XRo+QxlYjpHic4EF1YNOM0c2EV4k0Ks9q8/i2S3zwdzOtZpTusz ypDs3p9mpuxOQt/VkyXqBbZKTliv5dalFA4UeoufUqIGXvBJttN/KUUmyFBX/+fCIK97hq 3KXhdoYsNLjAbOBr6n7I8NI1hV7x1/bK2aI0hzC7bK4wAuSAJm9PkAoBykb0qqKk9FMPHe qbeL/DJgJMoLe3VJ843lAXGfw/T8pNMlbHf/hMH3H38Z6xZvd2OnEgDmdYlkGg== 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 4dWKdm25NYzcFZ for ; Wed, 17 Dec 2025 03:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43561 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 17 Dec 2025 03:53:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f94bfc469df9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: f94bfc469df9a2bc78ed15cc42525d09e3413e0b Auto-Submitted: auto-generated Date: Wed, 17 Dec 2025 03:53:16 +0000 Message-Id: <6942292c.43561.1cc242ea@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f94bfc469df9a2bc78ed15cc42525d09e3413e0b commit f94bfc469df9a2bc78ed15cc42525d09e3413e0b Author: Konstantin Belousov AuthorDate: 2025-11-22 18:43:57 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-17 03:40:31 +0000 vm_object_coalesce(): check that coalescing does not revive stale pages Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54219 --- 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); }