From nobody Mon Sep 16 08:15:04 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 4X6d4n3Rftz5WkLt; Mon, 16 Sep 2024 08:15:05 +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 4X6d4m4DDkz4Rr7; Mon, 16 Sep 2024 08:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726474504; 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=P1ENwwx/bj/rH9spvkLNCdPxWJXM/HK1OFAtnCkgJ3A=; b=ALDGcVWswcWmpg1bk/hCExA+Yk8T8HXlmCW70Kqlqaa5bRGSdBtry8xTINRVyrKiEdfr6O wlg70v2iy8RT37cejDu824bHaSn4Hiy7tEVKBTP+OndbjeuzDxPFrvfuEQadp5YavbaGtO QmwVgS6OHhLYH6m6Bmo8UKHWYVePoMguL7a8EMCInTpi45uhGaRD+lJuUl/APbtfXJwSD2 SsF6+Ugr31ZzqYpWKCVBj6SDWViH5lrjkSn+z0ACbh6XHCGwmGoMp34Q6707lwQR4xjMWa whujswXec/dwFg0FpQQPbCKyBDXU/NAtXns8QionV+b5b81tKM7EKbI4v8tong== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726474504; a=rsa-sha256; cv=none; b=OwnMAA0niRSWpff5KVzbGQ7wOoEg91AY4cmC5tzh8gPoE/f3OeO61qz9C8mS+yxddDoFF/ +OlIfmusH3uRbymQXwCPK+FzEsn2/+vTJCwhFapUCY4bnPVVaSic7rocTPRfU1wtcfektn rapGmw3QLhHKCUWf82UOVFePenMI+i85H6UbLRWiV/uUhXtvQbEE+hK4RvJRg1aGaqb6Hh 5Zod17DcMNQN+9nVa6ztdwA+Qvk+KwG3K33ZIJGZYRNmiFrTdWrpYdX6ApYjmB75Dy5Lh4 Q1ivMG1by4paCzfiB2TZsGqhidUiFBVs0AI+rCsd5Y4G+7xaNJtYyyykYWxJFQ== 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=1726474504; 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=P1ENwwx/bj/rH9spvkLNCdPxWJXM/HK1OFAtnCkgJ3A=; b=mbvVNmKnRabFLEDxUDHGZgh8pZiTZw7q4otvCpfplPEkliHuwdVd6voqtnWv6PAxMqlf7H HwfCvXZ4LLvAvgqVBSR0tOu3euigwPuZBZlni8jogJjVDgvMadvjzA6bjhEtTP5tDwwbs8 Xy1PsnKj08BPplLW5+oyxct4xCyNDsXk3B3IRGL9uMCLzBGg69GWUOsbxAarJuo9tZn/Pw UjXMFto0v/a18sAhyQmfbsUq00Qo3cTSdHe7ioOtMpUsYLxNUTpI5yuLffQCUARIXTpf7+ irbYvulr+VKBI4MKSrDQ97kQNTCRD//fXk4YYhwoTKS2ga6hrchkYjQKgEjl7Q== 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 4X6d4m3Zchzn7b; Mon, 16 Sep 2024 08:15:04 +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 48G8F4EC027035; Mon, 16 Sep 2024 08:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48G8F4xg027032; Mon, 16 Sep 2024 08:15:04 GMT (envelope-from git) Date: Mon, 16 Sep 2024 08:15:04 GMT Message-Id: <202409160815.48G8F4xg027032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 180c8ab07995 - main - amd64 la57_trampoline: jump immediately after re-enabling paging 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/main X-Git-Reftype: branch X-Git-Commit: 180c8ab079950acb15c6629ce293055ea0117b39 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=180c8ab079950acb15c6629ce293055ea0117b39 commit 180c8ab079950acb15c6629ce293055ea0117b39 Author: Konstantin Belousov AuthorDate: 2022-09-17 01:35:20 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-16 08:09:03 +0000 amd64 la57_trampoline: jump immediately after re-enabling paging Literally follow requirements from SDM and execute jmp right after %cr0 CR0_PG bit is toggled back. Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/amd64/locore.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index e52d36125afd..a51e5047fe54 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -119,8 +119,9 @@ l1: movl $(3<<3),%eax movl %edi,%cr3 movl %edx,%cr0 + jmp 1f - pushl $(1<<3) +1: pushl $(1<<3) pushl %ebx lretl .code64