From nobody Mon Oct 23 10:18:06 2023 X-Original-To: dev-commits-src-branches@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 4SDWNZ557Tz4xs1R; Mon, 23 Oct 2023 10:18:06 +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 4SDWNZ4Cqnz3LPb; Mon, 23 Oct 2023 10:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698056286; 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=yBMPpnH3q7iqtSZPHifbLvR+jbDtElrliwbrh/wAFa8=; b=PgTAVu4dw5+nqRpqn/33217XX9pgdurlcnIqYByzWZzz7cyqeBa14lzxf6VAalSCQVXRep /cVY0wAqKx9b6dxnpsa33TBd7L5N8F1Bkx48zt1+fNoF7oojD1qE+xnNhR/ETtCKLyMXA9 JWda956zz1VSN3B3FksJGqNA2uY8KL5uPEXhw2e/cfDgjyaGptWBFSqc4zorMQA07wEz9v 7PO3AO7dvS5tDJZNFXMcic6CcCbnfRq1WKcHUcy39rBE/bj25Az+kE5lYgAlgVVvNSwNsY ldrC+zjuFj/nWKsru+ps+D3B3Tf3b8GKNnmPkEWrTDLp+ywfUq6uRVN/X1LrrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698056286; a=rsa-sha256; cv=none; b=Fci/eNHMI7ZFdjWcS3FDGXXoPRfhIsXgoonm4PWSydua5BWNE6A3I3zSo3dF5dvfE1FJzq 5joCd+Rm5QQ8oHuDzySJpbPyUuRPjMvt7HbpTmv2yyhhCBFjvew+XpfEwDCjTm1FBNUuEu a7JRgKpAtWKj88P/hTYPZm0WDwGsYWw7ombknihqAumoRbVgB0TMavJipv2km9oa87kkqA PjfaNQU0P50N5EzegkOpa3QFrN0kUhd+wx+dAQB2ee2hCd+Mw0M7vstZrxi/MTltnFRFUc l/b9+NQLDVGTU0xEeQvTeKsO+uQXvRitA7iImnmd4cKaEnJFAeHQn4RcaMi29A== 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=1698056286; 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=yBMPpnH3q7iqtSZPHifbLvR+jbDtElrliwbrh/wAFa8=; b=VH6BTOwM8QyVLgiWjFI0JnCdHnAlFdjGUCmPGC1cURzDD13ZqFgLs9RbEj/BEw4ICuRV4t HkQ6HTOjNzawqCNjBadR1hS0mwFYMF1o2+ChL1LJVnEhwRAr+5no3TO+eynaweNL+Gm7PR d4iEJJJLHFJZWoKELtH6ssVhG3nesAtiQiRHJ10v/rb95gkNTN+8l8zMF6+DeTxbn+dK3x LTjQp4hMpPrh04qKEwz+VkMA+mLlTaxVxT9fWO/aEsroeAZdroaVAIx8V7xenEncDjvels U4r/t4WlYVyt4xv7W//etAx8aLwjNXJsPs0byAfTpEbTgjmVrhkU8u9Rcb9bdQ== 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 4SDWNZ38dFzc6v; Mon, 23 Oct 2023 10:18:06 +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 39NAI603047164; Mon, 23 Oct 2023 10:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NAI6Ko047161; Mon, 23 Oct 2023 10:18:06 GMT (envelope-from git) Date: Mon, 23 Oct 2023 10:18:06 GMT Message-Id: <202310231018.39NAI6Ko047161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 0ceaf5d46282 - stable/12 - pmap: Prefer consistent naming for loader tunable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/12 X-Git-Reftype: branch X-Git-Commit: 0ceaf5d4628210226d0bafc2650b494a07ca9aaf Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0ceaf5d4628210226d0bafc2650b494a07ca9aaf commit 0ceaf5d4628210226d0bafc2650b494a07ca9aaf Author: Zhenlei Huang AuthorDate: 2023-10-19 17:00:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-23 10:17:44 +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 (cherry picked from commit 02320f64209563e35fa371fc5eac94067f688f7f) (cherry picked from commit e53f8ca323e8e563d4b55883fc3544bea75aab29) (cherry picked from commit 16afc2a4d9c581064aa32babc29c748ccd59863c) --- 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 11c2ba658b82..c94232f1c04b 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1752,7 +1752,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); @@ -3035,7 +3035,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 611bfb414cb3..f1b1b9f3d0ca 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -974,7 +974,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); @@ -2590,7 +2590,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 79e774b33bf4..4c3e0754c010 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -2156,7 +2156,7 @@ mmu_booke_init(mmu_t mmu) 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);