From nobody Mon Sep 23 13:03:44 2024 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 4XC38c5Kc8z52Fv1; Mon, 23 Sep 2024 13:03:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XC38c2kxgz40CK; Mon, 23 Sep 2024 13:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727096624; 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=lcjBsMcpiKbHcUYi+lLtj+DTz6w0FMv5gokel8hrdCM=; b=DUdsaslcUAJxkq+q8YXK/+cd374k2KyC0ypY3CFRPjTmVpzxlcvDdkBlhF4O7kOHG+javv bLSeqxBN8v1FT8ke/ZHnjCPLqagdfWvm3LA4cHPhOeV24C6wXvXNg3eQzrsMwduZJycBTO 5Ze6dTpCBZVKE+ifqFzfgFEWH2FytS31bylXC48n9RH/jKODVOCran9JkazXeunq/XoncZ oo6lwVOGkkDpAyZXEfQVIJZsG4mLFjE4pJY5U4E6UTsq4vlOa4pb13yMTDncMFHM9p4zlD G/ib6dIzTk8UNgTMEhVwKr9uOOGq7ihXwG2IzeWDU4rVQ2tLjDpph+zcbawcfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727096624; a=rsa-sha256; cv=none; b=u2yERjNYxkxoG0ujyKHqzeHKlMNVnN9zJvDLplZE3MP78OkhqqEzBNbtOqMQq7XIop4tNH m2jDonJmQ1lfkLLfNZCnfuqfkM5Bcl9I9Pb07QQUFmIktNU2MGwTvx4aRJLzZtOHTcxbok poLE8w9NxiWwVyeZ+gavXOwB9441VTbfYMmdrbfBMxWjTksXSHG1uLI+Lhf66M4mEiAshp 7Ko+mITYRbYwb7qkOhwaNt8luNJyniCN49mhDWnzbUoBgWlNOMoC7oRrc0AR787amyf8Cd 8COtMkOzZZKNeg07X+E7dHnew4sGJBChY30PTAXMSkFCdjPb/ypmiqaRIA2ujg== 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=1727096624; 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=lcjBsMcpiKbHcUYi+lLtj+DTz6w0FMv5gokel8hrdCM=; b=PGpnSJQs+4UokXWcX6o4+K/KkvKOEXu7PlcLby4YMpLgCuuaYKOMOwKwYxXsWrST1tCakU 7pqrzycUx7IlTqgRbcb6kme2ul/4MBFdj36Z7gZeF+lunpAze6erIFlCHwwe7aOgrvW4Su d7sAe2mBY1wf+XsO91XsFL+3yrlkW9Zhxjh69GSpqzvp1N4YQksN8qMPVdCEs58CeiKLaj VWuSnbdJtfaull2kQdLEPLY4bBC98c/hLxJY51XBwWrsLPKuJwHbx5Uwea3gVrsMqV9j/w 4EqGlusHZSAHsL9fKTb/xS3RR3ZOD7sIOloUdOQucvljp+dzoIX4QrgHZs9AIg== 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 4XC38c2MSGzmJv; Mon, 23 Sep 2024 13:03:44 +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 48ND3i5b007053; Mon, 23 Sep 2024 13:03:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48ND3iPG007050; Mon, 23 Sep 2024 13:03:44 GMT (envelope-from git) Date: Mon, 23 Sep 2024 13:03:44 GMT Message-Id: <202409231303.48ND3iPG007050@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: 3f79c8c46f24 - stable/14 - amd64 la57_trampoline: disable EFER.LME around setting CR4.LA57 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 3f79c8c46f24f2b87569444a034e1aa08ead2dbd Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3f79c8c46f24f2b87569444a034e1aa08ead2dbd commit 3f79c8c46f24f2b87569444a034e1aa08ead2dbd Author: Konstantin Belousov AuthorDate: 2024-09-11 00:39:30 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-23 13:03:06 +0000 amd64 la57_trampoline: disable EFER.LME around setting CR4.LA57 (cherry picked from commit b7ea2b69ef666ee8cdc6dcc814d610df0a7f0999) --- sys/amd64/amd64/locore.S | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 86db0f76b22b..9a991402cdc2 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -114,11 +114,21 @@ l1: movl $(3<<3),%eax andl $~CR0_PG,%eax movl %eax,%cr0 + movl $MSR_EFER,%ecx + rdmsr + andl $~EFER_LME,%eax + wrmsr + movl %cr4,%eax orl $CR4_LA57,%eax movl %eax,%cr4 movl %edi,%cr3 + + rdmsr + orl $EFER_LME,%eax + wrmsr + movl %ebp,%cr0 jmp 1f