From nobody Tue Oct 24 14:37:48 2023 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 4SFF5m2ZpCz4y6M4; Tue, 24 Oct 2023 14:37:48 +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 4SFF5m1nBNz4lS2; Tue, 24 Oct 2023 14:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158268; 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=+BM+aIzfuXcq+r7dq9nShKwF8/eNPvoxrp/OQSarbQA=; b=gg20wqU3fAkFnmykwwbCGrQBJvOJ+ENoM4goBNzKb8uY0aCDpvX1h6iWfgIV5TyTtEDraK u+uuQYhqQjQiGxR5C6KLWoPQ3SFTtoV7xNfI2lsYAwnrBzl9LdU8/NMxGIfBhAgGMW1ze9 6WPtvIqHkn8CYNP4ytnl/tIJYjpuIjkV8q6xPlXyrZ/1L+JLAWu/0feY+qKT5A3mbkkC97 lv4C8CVek5eYvORPMterQIwc3P8kNs7jdRGEtX1FXynwksgFikz7mkpbR6mAUMbootGHsK lYwkOi5Fa46fxdbByLIrK90dfI2/UwT/b4m+oQKhlzz7yqMtVci+UFXo2dN69w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158268; a=rsa-sha256; cv=none; b=Zw5iY6PLkj9b/DxFM22+P2WiRUf/UxQSk12DntS51IVtc390ZSwA1olTeUYeCET77sKUdX dNa3enk2qHFFLx0gH6sKzgAblb8b//v/amPSShXA4fiyELSJVj+p72m45jiEjZE7bDk1YE IVY2VJ5hO5bFN31IOciWxd7GAZK8GnkX7CIGCOBoQ/IIBrY1gV23eF0A+w3af6/cPXz2Jo KQf2qppFTrYwJ3nMXmvoQ8XbrvzCxmwGqTDqwtJKlIa5GynCMdf68tDMqTZzAjPqfuJhVb WaalZj0QLt4Poewgm47aqsKtJG/hmw7jl3qiU8Lg8WuNyHeusTXDqsN4JE72hQ== 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=1698158268; 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=+BM+aIzfuXcq+r7dq9nShKwF8/eNPvoxrp/OQSarbQA=; b=v6y8dddGSL6oMaLPIdPP5h7lgWtaNSq987s1SwfzfenLuUWRmOQ43VrzsLayfA2RO1Efll Es3DDYHIiPx65cAskSgR1+mBw03g8pcEeTVDMLWiGgvpUSN++fqYN/9aC4F4KspQ7CIcCe cr/Eq83ldluanU42j9oyjawFWnJQRFdZUS9zXaRpXbmycp3VXVn8v3jWGRj8ZeEc/7vV2M XAbw5+69EjmXyH44MmnQU33elBFNXX0DXcHBW85Y9KbglTcYVqGdIgm0IwIYqXFbrjy0mo Jl66lB/nJMBfaCb6tvjnlpyGV+1lHbNueWMMLL3XopUqJh25Lb+R0tOgOkad5w== 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 4SFF5m0tcWzBpv; Tue, 24 Oct 2023 14:37:48 +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 39OEbmTg089761; Tue, 24 Oct 2023 14:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbmME089758; Tue, 24 Oct 2023 14:37:48 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:48 GMT Message-Id: <202310241437.39OEbmME089758@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: 8934fcb4983e - releng/14.0 - amd64 pmap: Prefer consistent naming for loader tunable 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 8934fcb4983ea74fa0b741add4d8b1bd65fa0c54 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8934fcb4983ea74fa0b741add4d8b1bd65fa0c54 commit 8934fcb4983ea74fa0b741add4d8b1bd65fa0c54 Author: Zhenlei Huang AuthorDate: 2023-10-20 07:31:44 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:51 +0000 amd64 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.allow_2m_x_ept' is loader tunable and have public document entry in security(7) but is fetched from kernel environment 'hw.allow_2m_x_ept'. That is inconsistent and obscure. As there is public security advisory FreeBSD-SA-19:25.mcepsc [1], people may refer to it and use 'hw.allow_2m_x_ept', let's keep old name for compatibility. [1] https://www.freebsd.org/security/advisories/FreeBSD-SA-19:25.mcepsc.asc Reviewed by: kib Approved by: re (gjb) Fixes: c08973d09c95 Workaround for Intel SKL002/SKL012S errata MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42311 (cherry picked from commit 9e7f349ff10691c2e3fb03898dbc942794a47566) (cherry picked from commit 8784b153a31fc0b3a12449a2f0377eb038e6fb7b) --- sys/amd64/amd64/pmap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index b10997fd657b..38eab9969bb2 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2342,7 +2342,10 @@ pmap_allow_2m_x_ept_recalculate(void) CPUID_TO_MODEL(cpu_id) == 0x57 || /* Knights */ CPUID_TO_MODEL(cpu_id) == 0x85)))) pmap_allow_2m_x_ept = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.allow_2m_x_ept", &pmap_allow_2m_x_ept); +#endif + TUNABLE_INT_FETCH("vm.pmap.allow_2m_x_ept", &pmap_allow_2m_x_ept); } static bool