From nobody Mon Sep 16 08:15:10 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 4X6d4t3kcRz5WkQ1; Mon, 16 Sep 2024 08:15:10 +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 4X6d4t1zSFz4RcW; Mon, 16 Sep 2024 08:15:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726474510; 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=IxwUrho96MYaeZeVYvVvyDB0hGiPBOZZAlnPCfn7hWo=; b=KjJy5e3yH+f0NW+Sy/bp+amwzXquvY+IVmX9cvx5BGTNvh/ExmAxFFDTeM1Wn+2RQ5Et/h N9QKnxbTqz9zNGIXPhdQmrTTEwQBjBop7In0K3hpgLq4e8Yf5OVpZaNp4BbrlT9nNw1umC CXkTiiBLZqHNUYYzrl9pYFFrzMqq8OYTp4QNvLBYGE2MdsCJcrf3TmjuoxlwNeEkXdYYrr 803oelcIxmiX22ZgV2lZGZLC2L3S1RTmodrF/2W8HEGOK4powuwY+DFg+/nD/eoFqGrSvU B5I0Nqq/mj5CNbk+JuRiFktAosLcOxssmtot/RtIscpapKTLOrgWsDkZIwLViQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726474510; a=rsa-sha256; cv=none; b=gRB5zLZbcM6hIiuv0KlVgfdmKasrc/5lADiEf8xdXHuqFP+1R+RAkmBPiukIdSEvDwhgnA 4HJO3PWlHLcJS24MgaGoQp9HAvoOKeMtDJuvKIibDm91aUV+dDe3h+COZgKCTBPWJ3BM+7 7oQCc2+2hPA2n1g+my/CpNLp4JrOdrkJPbckE/3ctiVoBglUNaoFoxg52TJzijnAtZvn+m c8WT5qfMTakAONkd5KXXE5iIJWySeJT/df9XDnp0gsovZMgDGOuceGQzTpmaAk0nRa22pU qXMkdYscUvC+IsJkDTX40rraxNDq0Nexx9VkajaZ5Za2mdQiy9Kq5PDp/w6+PQ== 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=1726474510; 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=IxwUrho96MYaeZeVYvVvyDB0hGiPBOZZAlnPCfn7hWo=; b=jnMeRNdHVpyMYo4ffjigyQDhg2K7ld9dESDJHlUOgigPkwxYXHqwcmsnl2IVzG+YNQi/wE EoZBDPtPI9NjLpTDwU5ZY/U5/ZNiSNfKDEwdc++XxP9CVDxb/R67mSSnzTmGRkOI7jbDj9 Xb8auqrGxq1DoWVk3U6wvQjf0t24X8K5ZdDWkRy78Ls70XTMSV6wA4k1NIjz6AmHiz+SI/ fsCnQKcssPnSPspFG9h7HVj4ePl3V0+gtEZqGuxPXvdufbj4Bi0QXT6cnC5DBB2ECJUmnW 6dUFLHQoyjW7x1R/dptQ9YPIKUnD+sXm+t0P96ohNLOL5KPphRaqfrUAwPd+rw== 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 4X6d4t1bRTzmty; Mon, 16 Sep 2024 08:15:10 +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 48G8FAPN027316; Mon, 16 Sep 2024 08:15:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48G8FAXP027313; Mon, 16 Sep 2024 08:15:10 GMT (envelope-from git) Date: Mon, 16 Sep 2024 08:15:10 GMT Message-Id: <202409160815.48G8FAXP027313@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: 280e50461a1f - main - amd64 la57_trampoline: save registers in memory 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: 280e50461a1f638088e7a0b9116976821c374b56 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=280e50461a1f638088e7a0b9116976821c374b56 commit 280e50461a1f638088e7a0b9116976821c374b56 Author: Konstantin Belousov AuthorDate: 2024-09-12 05:43:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-16 08:12:25 +0000 amd64 la57_trampoline: save registers in memory AMD64 ARM states that 64bit part of the architectural state is undefined after 32<->64 mode switching. Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/amd64/locore.S | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 3df3dd722f45..1ed9085e655c 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -91,11 +91,12 @@ ENTRY(btext) /* la57_trampoline(%rdi pml5) */ ENTRY(la57_trampoline) - movq %rsp,%r11 - movq %rbx,%r10 - movq %rbp,%r9 - movq %cr4,%r8 - orl $CR4_LA57,%r8d + movq %rsp,lst(%rip) + movq %rbx,lst+8(%rip) + movq %rbp,lst+0x10(%rip) + movq %cr4,%rax + orq $CR4_LA57,%rax + movq %rax,lst+0x18(%rip) leaq la57_trampoline_end(%rip),%rsp movq %cr0,%rbp @@ -143,12 +144,14 @@ l1: movl $(3<<3),%eax lretl .code64 -l2: movq %r11,%rsp - movq %r10,%rbx - movq %r9,%rbp - movq %r8,%cr4 +l2: movq lst(%rip),%rsp + movq lst+8(%rip),%rbx + movq lst+0x10(%rip),%rbp + movq lst+0x18(%rip),%rax + movq %rax,%cr4 retq .p2align 4,0 +lst: .quad 0,0,0,0 ENTRY(la57_trampoline_gdt_desc) .word la57_trampoline_end - la57_trampoline_gdt .long 0, 0 /* filled by pmap_bootstrap_la57 */