From nobody Thu Oct 19 17:01:30 2023 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 4SBDWv2ds4z4xfm3; Thu, 19 Oct 2023 17:01:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBDWt6r5zz3M31; Thu, 19 Oct 2023 17:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697734891; 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=gXhq+7QzcnhE4AZfMtWbexxC3ZRuq2hcF/CiwOv7VrQ=; b=WPtSXNsmD9VQcn+LdXgeXw1Vz8h3V6hXtZ/SOW6ipC7ydY0Apo9fDaWGEj+LZPkUYGvxGj Fu1faCDQDZa7rK+QWJRmlQMEkts622LboxhK5nmTjDE39hYlNgA13yvt35qBTtZ+D7E1XK IIt5l8mG1EZECr7tVOCxkJTakbIKwtzSC1C7jt/6w6m2SAHbMYtpsvwtW1uJ5crpdRRui0 mr57FiTtYN5M6DOEdV92OkKa1V+0KwKcrFaMratqzQ1cvJYqJ+VDz7O7ak0Gt7YpiJqViv 5Ilo5bWrIahOuK9GNRui+UGdCldZ7yme22IgeLMmQnUCqMKq4TEAr+ito9ZdAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697734891; a=rsa-sha256; cv=none; b=CnoVuqFrgwDqfc8lbhKRRYgVIxSWGNK8+0lI3EgLm3fEcy3TEvVBV5hMSC77Oj2A7fv94f ar5GLStJxNdkC2aoOLyIU2D4cP01xNTQVysFAKmildKtKGBAq/W9COkU69lfnpDOxii6WL 93Bqw6/u7yYJrif5NbcYwY124hYF6ew7uwSuyIuBeMpapjZaSg/IEIzGgq8FiOtS+DyxQD 7BBeOL00/2dhQ7XtrTF0bfPfTAgdnGaTIf492yWoJc01XYb5QwgylGyZ1f4JQIKQ8HX2Dk Cg7iu0LwJV6YVLihtoYG6CMI7E0oJjMxcvHCxc9flw1iY3u2X/TR4X0aZm+weA== 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=1697734891; 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=gXhq+7QzcnhE4AZfMtWbexxC3ZRuq2hcF/CiwOv7VrQ=; b=ZwlV6kx16NkQHV8C8Hsn80esd5/bYdg8h0hq8H+Q/QJOZeR1pb3N6rH8fhwYqXiu33BogX v2bWFqSKg2CBhLpXWTaUaMTEqcBaGAu3aPltnKCpqO/eB7T9mVpedj5JM/DR9aq4Jjm6Rh d6YpjSrpYHNEzJQlEOftYscmgZ+ie9JhIu2hV8StZUiw0hKnyrmVjIW3CoMGaAmA4XEegf LXgpgv8ACF+Ka455h3Zagy3zj/TLPzi9ErOcVyo+RnVQcvsiuN1MnBHpG+REfmA2NZdh7K 1LIGvIm6x4ar32NoYQfCSuJnY94fLR85jysz9OmPqMw9gUiSBNRQvOuzcCsydA== 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 4SBDWt5tbbzyGP; Thu, 19 Oct 2023 17:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JH1Uoa041170; Thu, 19 Oct 2023 17:01:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JH1UXB041167; Thu, 19 Oct 2023 17:01:30 GMT (envelope-from git) Date: Thu, 19 Oct 2023 17:01:30 GMT Message-Id: <202310191701.39JH1UXB041167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 02320f642095 - main - pmap: Prefer consistent naming for loader tunable 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02320f64209563e35fa371fc5eac94067f688f7f Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=02320f64209563e35fa371fc5eac94067f688f7f commit 02320f64209563e35fa371fc5eac94067f688f7f Author: Zhenlei Huang AuthorDate: 2023-10-19 17:00:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 17:00:31 +0000 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.pv_entry_max' becomes a loader tunable since 7ff48af7040f (Allow a specific setting for pv entries) but is fetched from system environment 'vm.pmap.pv_entries'. That is inconsistent and obscure. This reverts 36e1b9702e21 (Correct the tunable name in the message). PR: 231577 Reviewed by: jhibbits, alc, kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42274 --- sys/arm/arm/pmap-v6.c | 4 ++-- sys/i386/i386/pmap.c | 4 ++-- sys/powerpc/booke/pmap.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 719851432203..92e992a4b25e 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1750,7 +1750,7 @@ pmap_init(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -3012,7 +3012,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 6b839484e6c5..967ad48de460 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -998,7 +998,7 @@ __CONCAT(PMTYPE, init)(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -2519,7 +2519,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index fe6b95eda085..f41ea24cd30c 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1069,7 +1069,7 @@ mmu_booke_init(void) TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); uma_zone_reserve_kva(pvzone, pv_entry_max);