From nobody Sun Jul 20 00:25:59 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 4bl47r0yJhz62XRd; Sun, 20 Jul 2025 00:26:00 +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 4bl47r0JdNz3XWK; Sun, 20 Jul 2025 00:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752971160; 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=+oLXZ4i+ZVu5vrifx1Pb35IcOCp5V4KNxbPb2szNG74=; b=MW45+CpRSy25AsofroveBE4YOAU+pFWJ+Yhr4KCMvhHl4TIn3MCuT9c2l9i5ffCaEA1jBR SIa04jCaQYJ76hPuEsuxfpWBIhyB1fqP6FChf6vTULdbLIX9PfATQdR8jom+KHF7VW9hkf 3KsEgrcjDMYloNwOGvSdKa56fvty1vcnKjpv2JYC5QIgFf3YXWseflgfiNRnlw1su6YKGT q2XDKDbK9UiKk4Xa0ucbzDTrndz7Ss67va1lnSFkN04aMwsllc8m5hWuvf+FC9gj6To8vI gPqihZU22c24+BO86xhPgMd8gFBsjSASW01QsyQ4MnDMkuV+JlEK/YCSlg1FxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752971160; 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=+oLXZ4i+ZVu5vrifx1Pb35IcOCp5V4KNxbPb2szNG74=; b=P5ibW82WYUG3Bdj3Vh6HielrwsDYszN4DIIFNivq9wbdaCeyAa+CHp/xmat3+/+7H1gHBu isSm2reqWQiXq44WZJpWFtjwybZrbDV6AdrSPZwvU7dOVrhb9TfNlkvDiutnAcsLXlk6bT 9JNAqgXe/QUau9iD4zMgGvVyOdWXORi5ysDAMsyDKtxNq+5Pzz85v793ZpEoM7VOfGW2kK v2OC1OyQqoxNxXvzSyVKzTz1iWAlL3/mrug4U3gXXk4NVzg/sofMv7K87hTVaiOo87zwKP KTwTXeVjkmINUGwsKN3hS/CeH2fL+i5iYMwA0krNDkLAB0E/KmYZVrpxqqSUGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752971160; a=rsa-sha256; cv=none; b=Rb5PBSAiwIfP3nxshBNGLRGmB4vxFAxCcUEMGbb+Ki9sNi3JMuasdJrr5XIuOPYkoz9J3K g056DWsMgZqwiN3/oCh+f2G5KSckeuvslEjm3z236OvC0wLWSRzZ8iicYzCKsHJoe+dceZ P9sRV5MoxS3zfQvRYElputWcQJbaHoA3I22omCd92n5oDOdcLcwy50PsCVokSviYnwKWbM HZAUZBWFhV8Y7iBPpwEWULc2efY9Yi1PaYhqcN9TzTjkZufa1jSObcNzW9aZifkSU3nCaq qpJxXS5Cwnvt24BL9r/VgCEDzazTZkWFjfKPPsZQGOn7g7x3Znlm323cTHgN3w== 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 4bl47q6gfBzqCj; Sun, 20 Jul 2025 00:25:59 +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 56K0PxoP093358; Sun, 20 Jul 2025 00:25:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56K0PxNE093355; Sun, 20 Jul 2025 00:25:59 GMT (envelope-from git) Date: Sun, 20 Jul 2025 00:25:59 GMT Message-Id: <202507200025.56K0PxNE093355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cf07a18b58cf - main - amd64 pmap: make large map sizing depend on kva_layout instead of pml4 indexes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf07a18b58cfc0771b89bc504e16c1c7314643f8 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cf07a18b58cfc0771b89bc504e16c1c7314643f8 commit cf07a18b58cfc0771b89bc504e16c1c7314643f8 Author: Konstantin Belousov AuthorDate: 2025-07-16 23:54:43 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-20 00:25:45 +0000 amd64 pmap: make large map sizing depend on kva_layout instead of pml4 indexes Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51364 --- sys/amd64/amd64/pmap.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 14f57ca94ba7..a7d17db19a3e 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2475,6 +2475,7 @@ pmap_init(void) struct pmap_preinit_mapping *ppim; vm_page_t m, mpte; pml4_entry_t *pml4e; + unsigned long lm_max; int error, i, ret, skz63; /* L1TF, reserve page @0 unconditionally */ @@ -2600,10 +2601,15 @@ pmap_init(void) lm_ents = 8; TUNABLE_INT_FETCH("vm.pmap.large_map_pml4_entries", &lm_ents); - if (lm_ents > LMEPML4I - LMSPML4I + 1) - lm_ents = LMEPML4I - LMSPML4I + 1; + lm_max = (kva_layout.lm_high - kva_layout.lm_low) / NBPML4; + if (lm_ents > lm_max) { + printf( + "pmap: shrinking large map from requested %d slots to %ld slots\n", + lm_ents, lm_max); + lm_ents = lm_max; + } #ifdef KMSAN - if (lm_ents > KMSANORIGPML4I - LMSPML4I) { + if (!la57 && lm_ents > KMSANORIGPML4I - LMSPML4I) { printf( "pmap: shrinking large map for KMSAN (%d slots to %ld slots)\n", lm_ents, KMSANORIGPML4I - LMSPML4I); @@ -2615,8 +2621,7 @@ pmap_init(void) lm_ents, (u_long)lm_ents * (NBPML4 / 1024 / 1024 / 1024)); if (lm_ents != 0) { large_vmem = vmem_create("large", kva_layout.lm_low, - (vmem_size_t)kva_layout.lm_high - kva_layout.lm_low, - PAGE_SIZE, 0, M_WAITOK); + (vmem_size_t)lm_ents * NBPML4, PAGE_SIZE, 0, M_WAITOK); if (large_vmem == NULL) { printf("pmap: cannot create large map\n"); lm_ents = 0;