From nobody Fri Feb 3 00:27:01 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 4P7GgT5kqQz3klt3; Fri, 3 Feb 2023 00:27:01 +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 4P7GgT4qMXz3pmV; Fri, 3 Feb 2023 00:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675384021; 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=mCscEXXdm8Yh6Aa6dBlBQR5L/MLCrsNZOTDgW2ssuDs=; b=e4RVULOiXjcaB+5e1MBeQEXzPJJZptIedS3t/sCw7W/Ebwkk7wtJu4av/VSbVNxHbyPjRy l7thLHbTGtRaGuGoxL3bh6QoiBXz5Bn8q/6FIg/kw/koNkRlK0uN/8Kw34PQmT4JY8ph5H LXxNeVJFUiSbuBUMEb+edKf2PEdgbGrdGXYIwDEefQCet0H1kCGqs3tH1AKiSpTuik8OPd Tby5mfis3EB06XyPQFcvX3afxCvrwHJAXW1OxXSzt3/jUogi9qLkNRjf3nABJwK4Rk2+1D yY0o3d/ge7ugS4U/RilsgW7I8dHY+vdcB+EKx8w5oqFgKvZJ2jllSf220QnAwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675384021; 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=mCscEXXdm8Yh6Aa6dBlBQR5L/MLCrsNZOTDgW2ssuDs=; b=ThsSmfmb3coVGa4TnOrYeqGpJQveJ5EauyjDV77nZ44yehUevf6Qf7+saLBLka26el3jTV LNAtt1TcBt/Pa11uYzIT7+aUiBSgQ3LLry11Py/qNZVWu+C9HmWpFWyrEX+tIDfC1vYBVS biCfj2ONkTMWlIVC2VqlDjeyjHLIJ9jOB+ro5EJUXodvE5F3VRoOQwRt06wbxY7T2TCGh2 NBoKwxpqb/U7cGySO5pF2OGDt+nA8Y9fqviKNpnHFZ1BZBrxhXKu82qw7zveWgSRjvx+RG MBONxtgSMqGE5nMnbQe0a5COwUnDSIGKW4kVuD+UPeWGLZO2DDxofzYsvM37GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675384021; a=rsa-sha256; cv=none; b=XDcZ7c5sBywMvH8f2UInkg7vEYxj7XXk9dJt3EW39TQu9gqBbb9O3hjx9QPA5Dh6o4wWzw h1Y092CR8KeBA3fglI7ewg98fTjkgmJQTjhVLsIdusl8KS7RIN6JglFPVfpbftExov73kM a8z0n64jz/kd/yKXZUSCpGvAwdSJXQu0/DaR9sYXGxoUPNQ77I3eFvQeZ/GQVoCMXcEe8p clkwYLJDlrSlo9FG7UGiGTtzocWkuar6ROhxHdsTP8UCY7EosWwhLCqnYbyFmjVjHe+Ntp EBQFqqifi5jqGbNRnsJv23F8WNvTGRcrT7EQTmE0l4Bn2ekBjvsbFssRLTRZ8Q== 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 4P7GgT3xJXzFXc; Fri, 3 Feb 2023 00:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3130R1ka006195; Fri, 3 Feb 2023 00:27:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3130R1rx006194; Fri, 3 Feb 2023 00:27:01 GMT (envelope-from git) Date: Fri, 3 Feb 2023 00:27:01 GMT Message-Id: <202302030027.3130R1rx006194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9b16d1435123 - stable/13 - amd64: do not enable PKRU if user disabled saving PKRU register in xsave mask 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9b16d143512368ac33988c6ae54e7939db2ed036 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9b16d143512368ac33988c6ae54e7939db2ed036 commit 9b16d143512368ac33988c6ae54e7939db2ed036 Author: Konstantin Belousov AuthorDate: 2023-01-27 10:45:02 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-03 00:26:12 +0000 amd64: do not enable PKRU if user disabled saving PKRU register in xsave mask (cherry picked from commit 153643a5bc8ac3b1d47fc8e4de18d8c8a59817da) --- sys/amd64/amd64/fpu.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 8be69a347d63..f51c042bf8de 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -394,6 +394,7 @@ void fpuinit(void) { register_t saveintr; + uint64_t cr4; u_int mxcsr; u_short control; @@ -401,7 +402,22 @@ fpuinit(void) fpuinit_bsp1(); if (use_xsave) { - load_cr4(rcr4() | CR4_XSAVE); + cr4 = rcr4(); + + /* + * Revert enablement of PKRU if user disabled its + * saving on context switches by clearing the bit in + * the xsave mask. Also redundantly clear the bit in + * cpu_stdext_feature2 to prevent pmap from ever + * trying to set the page table bits. + */ + if ((cpu_stdext_feature2 & CPUID_STDEXT2_PKU) != 0 && + (xsave_mask & XFEATURE_ENABLED_PKRU) == 0) { + cr4 &= ~CR4_PKE; + cpu_stdext_feature2 &= ~CPUID_STDEXT2_PKU; + } + + load_cr4(cr4 | CR4_XSAVE); load_xcr(XCR0, xsave_mask); }