From nobody Wed Feb 19 14:14:20 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 4YydgJ4G2Nz5pQgm; Wed, 19 Feb 2025 14:14:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YydgJ2STTz3mxw; Wed, 19 Feb 2025 14:14:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739974460; 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=mpXun/BP/piNOXEuGa+1Fdm6U/b6Ixh8jCkg4gdoaAQ=; b=iBAYpY6NJAup4zLJbMKIKYglTk5AehW4KZ/fFo1irTnhIL2v9jb2oAfhev8w8xJza8ArYj Nfwndpn5NBHKoXFw90wy+c4QeDqorLZS72FTlBPKVauNE86Y1Qn9i3IiDdMfTo1X6IUPY4 HWei9MVqiZDYIyNI082fQIBGuj/c7SzcoUq61g4lFbV4KEMwKuegZhWpLR8KCUlI4a/3ad 4Op9ncVQwhbiMMURj4NV+SBTmAx21vi/3WJ9Z/O3GCzBXNojEfd8Os6XSwWaco0Xh9K1pQ Yef0OBM+ojr1Wm4SgsgXb5ooi22/fW/EfUkdXnVpLXRYIDkA7WXTYf83LD6F+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739974460; a=rsa-sha256; cv=none; b=fFUKXgUxC0p6M5rAEQBC5tlTM3cEfcWlmRzgHpjbEn36boYBK3bHh47WDnJ3PuwqYMJxuz IdkbxoEfEtkw4/r/m5vl2pK6lZ2jzk54BOxA+6La8dbZfC0uPOsIrHUVZp6Jg9Exz4Qcx/ lGFz2A9ryj62zDA+FK/LuQowhJK80hoHm5ADJOb6XHauIAuBmXAv+u6M4H7Jr+jMLuABag muPi81AD9DewoA6p4uWymf1KlGiohurzA81Wq29logTD4YC5la/lohpa1XA20AnGB7ZJZt lqA1W8+sBoy/S8GVxdxG+tvSpv6HvetIkSB080TsOpbwa9TG4C3Fn/qrsSAjZQ== 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=1739974460; 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=mpXun/BP/piNOXEuGa+1Fdm6U/b6Ixh8jCkg4gdoaAQ=; b=YJ1enh3K5hBkYFXZuZg5sz3NT3Pb17LjtHbfH1N0pkAsuS2XvnsvCA4ZB2w7Z/kEbC/ap3 10YjXQXfu5ytfD4sQI8v+fRDRPlkhO9sOOOlTRD77ERHfGvekppCeI9iXeUCGJva49UHdq SnwXcEDLOtLV/JL5FNVLvS/caMoFQTxZlq1nUxmYL6n2mpjQpWlUICePQjxkigJQ+nyuyX tYbI7FgdbMPZTtNhzxgocFvJ6cP1U6QNHY1EIsimMRZ4f9dgZlJCMyS6VEy4vQwd9SG/6C CqVyEmK9uwTmQ1qVGqlQspOf/A/Um/YqYNWZAQvwOBraOIhOyDc/kX/h6Sa6yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YydgJ2420z18HT; Wed, 19 Feb 2025 14:14:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51JEEKK2038060; Wed, 19 Feb 2025 14:14:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JEEKYr038057; Wed, 19 Feb 2025 14:14:20 GMT (envelope-from git) Date: Wed, 19 Feb 2025 14:14:20 GMT Message-Id: <202502191414.51JEEKYr038057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 125ef4e041fe - main - vm_phys_avail_check(): Check index parity, fix panic messages 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 125ef4e041fed40fed2d00b0ddd90fa0eb7b6ac3 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=125ef4e041fed40fed2d00b0ddd90fa0eb7b6ac3 commit 125ef4e041fed40fed2d00b0ddd90fa0eb7b6ac3 Author: Olivier Certner AuthorDate: 2024-11-05 08:58:26 +0000 Commit: Olivier Certner CommitDate: 2025-02-19 14:13:21 +0000 vm_phys_avail_check(): Check index parity, fix panic messages The passed index must be the start of a chunk in phys_avail[], so must be even. Test for that and print a separate panic message. While here, fix panic messages: In one, the wrong chunk boundary was printed, and in another, the desired but not the actual condition was printed, possibly leading to confusion. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48626 --- sys/vm/vm_phys.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 0b7de1d34255..01d3d5e22eb0 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -1780,15 +1780,17 @@ vm_phys_avail_count(void) static void vm_phys_avail_check(int i) { + if (i % 2 != 0) + panic("Chunk start index %d is not even.", i); if (phys_avail[i] & PAGE_MASK) panic("Unaligned phys_avail[%d]: %#jx", i, (intmax_t)phys_avail[i]); - if (phys_avail[i+1] & PAGE_MASK) + if (phys_avail[i + 1] & PAGE_MASK) panic("Unaligned phys_avail[%d + 1]: %#jx", i, - (intmax_t)phys_avail[i]); + (intmax_t)phys_avail[i + 1]); if (phys_avail[i + 1] < phys_avail[i]) - panic("phys_avail[%d] start %#jx < end %#jx", i, - (intmax_t)phys_avail[i], (intmax_t)phys_avail[i+1]); + panic("phys_avail[%d]: start %#jx > end %#jx", i, + (intmax_t)phys_avail[i], (intmax_t)phys_avail[i + 1]); } /*