From nobody Wed Dec 24 00:42:10 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 4dbY421mMNz6LB5h for ; Wed, 24 Dec 2025 00:42:10 +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 4dbY4214vMz3ZCy for ; Wed, 24 Dec 2025 00:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536930; 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=bV1uJSvIU48Cu33x7SRvrPYtfn8mMG2zGb2640g03m8=; b=UkbPyDFoOUEl/OJtPtVVxUS7dv5QfGxHkRhfenyaKhfSI4OO4aHrvSU/S6ftUcqRV//mP8 SyMcElsyXzyR+SoV7nPmLwWn0/+llHn65uNbdMfBOwR7OgBYonBpAVyaRLs5m1+BtAztkn e5qxz0cVXPZH29jNwfzl1W3I7o1LjlrZUokDJrLKbXfGFRp7yfk8tQSCOqTwPQDoBiGBjE /FqBVBbMbj/XxhpcTdQRY+o1OGgyJCRGbJY080ld0qRMvitK41LdRBNand1Z2rzCqKH/gt +dQrJczOUB+ZsCQrxx7rwBO21/xPm3K6azmTEIBDwHo0s5LaK3DWXF1YaTOYMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766536930; 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=bV1uJSvIU48Cu33x7SRvrPYtfn8mMG2zGb2640g03m8=; b=YY1DjC2Rv13IQgowYQD8l486dnFJL0N472hl0ssWNff7eaKaFzflMCopvb3fLXz6g/Aa7z IAAPWL9BeBHNNi+SUAZjvV2jUvxxPiRihpto1wvhtHliu+FhpzYnFPOfU0Vsf7C6aw/uF3 lPYO431TNujCfSdP2YVivPYW/GzuC27PN9Wc7yRx7ZCIRa5R8q0NU2vwQIIyiN47tDZ+9n 9y8wD8VuzPYsYhZfunQPgupBw4KZnKS9eCLMgfPf42WmTknTHnCPkGGWuX6JIJy2uANfd2 Em1xII69afk9LXyKEG82wLWvn8Sjxd6Gw6ZxQzoM0NLQHrtEv8qwtxnzyzMdmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766536930; a=rsa-sha256; cv=none; b=vOoN3xbwCpnaDwGDRdz8nXoDthqKEpkT+q8c1vV/csr/rsxrPt0dxXcM+c41xDiFCSnxWA TGEjEMPgQFXHgRBMT5C+XYGa/LJ5SY6CuXl6omiFP1TOzAYLnn0qhErpH7X1BR0duHa/Jq p4kohxzvkB1/mLzwXEmEXNFC/eIH0JPJx3ofusdu3Z6Mw0ltSH/kxei63+wy12PoG3DmHX vUYBFoPQ6aZd6+rSlkSWxx/E83TyC1/Tjhh6449+0kzYix2rg33DSSmIyNDMwst9pkV3Ml 0kScj77aw3qywTfql/TdPf2Zuu0VwHp4OjEifGgGVxWWPdNCLm6xYMzwpcPqBg== 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 4dbY420bz0z3Gx for ; Wed, 24 Dec 2025 00:42:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3151f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 00:42:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6397c1478ac2 - stable/15 - swap_pager_seek_data(): improve assertions 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: 6397c1478ac2f8a4ee566ecec3196ab28b3b33d4 Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 00:42:10 +0000 Message-Id: <694b36e2.3151f.25f73709@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6397c1478ac2f8a4ee566ecec3196ab28b3b33d4 commit 6397c1478ac2f8a4ee566ecec3196ab28b3b33d4 Author: Konstantin Belousov AuthorDate: 2025-12-14 09:30:21 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-24 00:33:00 +0000 swap_pager_seek_data(): improve assertions (cherry picked from commit bdfd695037a95b076aeffd04ed9fdf042b6ce218) --- sys/vm/swap_pager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 676e585a6b53..5e9a0ad94cb3 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2460,7 +2460,8 @@ swap_pager_seek_data(vm_object_t object, vm_pindex_t pindex) vm_page_t m; vm_pindex_t swap_index; - VM_OBJECT_ASSERT_RLOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); + KASSERT((object->flags & OBJ_SWAP) != 0, ("non-swap obj %p", object)); vm_page_iter_init(&pages, object); m = vm_radix_iter_lookup_ge(&pages, pindex); if (m != NULL && pages.index == pindex && vm_page_any_valid(m))