From nobody Sun Jul 6 19:28:20 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 4bZy8N6PbGz61bQJ; Sun, 06 Jul 2025 19:28: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bZy8N5hSPz3KH3; Sun, 06 Jul 2025 19:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751830100; 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=YzW4UFupVxyR9020zP4DCgmb7Qd9UX/yaQSxLjGB2k0=; b=P+G3+k3IgJmCMek7PMnlXbXKgJTQRsxqUHNAkh8wIzKQCYGL/MZfQhh31vfqwsiVyMEOSW V9r+NIT4FX+YXl/lWfK3JfxT2vnY0oRZwYu4yDjE/WfA2S/djqsaobzlBzihOvB9TZDep8 Ha+xwflflB+3RugDCM1Ia/BHazugAbPmTkzKiCiYoiusEYIPd/IYktmL2VABeMP36soUrw /NOPhXaNgUwqiTpYR7fkHSQ+Oyn03BBukhDQGpEd3EAfFwYVZRovZyvjW82yAWiwqfHzyx YoFxLDkDKQPAZstpfx8DxcRoDRHoVebjcRpxCAM0hZePysc2G/sRg8LehlLLLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751830100; 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=YzW4UFupVxyR9020zP4DCgmb7Qd9UX/yaQSxLjGB2k0=; b=HmInr0yvau9Ca2M8MBgPAKRi/Lz8RKU2iVX0MEH+gKICaLZFnZj0Jjq3/zj11uBZsFw81X qWrAV0zCkkot2M4W4YlBQEyW1jap2NxXNz4KCa4TLUpdxpRpzDOy6tTDgtLLW0okgkZNk7 T8k/znyb85eJ5a4Xp4r6UWLMe0pBLcLUswIaYQ9ffZoJRE2GeXSqonsj9V0StrBmlvMpXI 12pJ+p2ghe3GgTN1mUqdAS8P6Vz2lx61Npg0unBJD5KK7D2W6UNMWOUdpdkjgGg/xSTezx oYilMIGgKZ5MWSX5o/IOKhj5D98GZ4QvGdwJGMAQoSQBBOgPgPSjSB5Zit+e2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751830100; a=rsa-sha256; cv=none; b=xCvtPljECLMhQuzq4LsSW1lL40eeXyHJ2Qo0hWRiLTbqyYuVK1PN4xn58hZiUbWBmwWAs6 wEqW+/xyCoc8eorQ/0150YGSJjP4M9N6SyPQl1o8jLcFe1iBqLwkP//oV4n9U2kVRaXAb5 hoXnhtNYJ/BPb5ktRLWhOlABJnIv9dM1i+IusQpndsEh/zlCGpWG9Kis9eAY1IfwVFVN+o RklGhD/NiIkCE1Dk5l2v2vgQCacUj92IXDGfvj99N+4Ejq4bavzsSSm6lNtz9wW16JySUV MhK7q2MstRAhTs1P1Hnq0Iwa9k3Tu1xJEXgiMiaERb4+olfw/uiC3xfKibLQ+Q== 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 4bZy8N5HhYz3XC; Sun, 06 Jul 2025 19:28: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 566JSKJb096932; Sun, 6 Jul 2025 19:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 566JSKDt096929; Sun, 6 Jul 2025 19:28:20 GMT (envelope-from git) Date: Sun, 6 Jul 2025 19:28:20 GMT Message-Id: <202507061928.566JSKDt096929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: efe5907279e1 - main - amd64: fix physmap entry addition logic 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efe5907279e1aa1781fc4d5260204888cd235cc2 Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=efe5907279e1aa1781fc4d5260204888cd235cc2 commit efe5907279e1aa1781fc4d5260204888cd235cc2 Author: Ahmad Khalifa AuthorDate: 2025-07-06 19:09:15 +0000 Commit: Ahmad Khalifa CommitDate: 2025-07-06 19:26:07 +0000 amd64: fix physmap entry addition logic Since physmap_idx points to the next slot, we should make sure both 'i' and 'insert_idx' are less than physmap_idx, but never equal to it. Also allow physmap_idx to reach PHYS_AVAIL_ENTRIES so the last slot can be populated. Reviewed by: kib, markj Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D51173 --- sys/amd64/amd64/machdep.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 032a134bbd4b..9724a6acb130 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -645,7 +645,7 @@ add_physmap_entry(uint64_t base, uint64_t length, vm_paddr_t *physmap, * NB: physmap_idx points to the next free slot. */ insert_idx = physmap_idx; - for (i = 0; i <= physmap_idx; i += 2) { + for (i = 0; i < physmap_idx; i += 2) { if (base < physmap[i + 1]) { if (base + length <= physmap[i]) { insert_idx = i; @@ -659,7 +659,7 @@ add_physmap_entry(uint64_t base, uint64_t length, vm_paddr_t *physmap, } /* See if we can prepend to the next entry. */ - if (insert_idx <= physmap_idx && base + length == physmap[insert_idx]) { + if (insert_idx < physmap_idx && base + length == physmap[insert_idx]) { physmap[insert_idx] = base; return (1); } @@ -670,8 +670,6 @@ add_physmap_entry(uint64_t base, uint64_t length, vm_paddr_t *physmap, return (1); } - physmap_idx += 2; - *physmap_idxp = physmap_idx; if (physmap_idx == PHYS_AVAIL_ENTRIES) { printf( "Too many segments in the physical address map, giving up\n"); @@ -682,11 +680,14 @@ add_physmap_entry(uint64_t base, uint64_t length, vm_paddr_t *physmap, * Move the last 'N' entries down to make room for the new * entry if needed. */ - for (i = (physmap_idx - 2); i > insert_idx; i -= 2) { + for (i = physmap_idx; i > insert_idx; i -= 2) { physmap[i] = physmap[i - 2]; physmap[i + 1] = physmap[i - 1]; } + physmap_idx += 2; + *physmap_idxp = physmap_idx; + /* Insert the new entry. */ physmap[insert_idx] = base; physmap[insert_idx + 1] = base + length;