From nobody Mon Sep 23 13:03:47 2024 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 4XC38h2kdHz52Fsd; Mon, 23 Sep 2024 13:03: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XC38g6Tfgz40XF; Mon, 23 Sep 2024 13:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727096627; 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=9IDWK11m326kUBPhUSDnHAb15nZkqO13VaFCYOhFfYY=; b=u7v2+yXdelAfG3DU5/1832r1piVS6appY67lsE5AhUbNhxxGeThWNbx0GZ3RbkVccNdrbg j4HyYYaLFnO2Tojpj/FrbL54sLYpyo9WZ6ggE6XPzF/EuQdSI0EUukUrH/499zvIOigTr+ N4YgykBVgeVA7lRsvzqsLcoitB8njq/TYI3V1vUonpuW2vkD73YhjB1H2rt47p1w43JQD+ UzoNfKufZEFUYFvb72GAEybhRUJsMcmz0sfbzpKksgJc000tBsqzW7nCS3bJdb6Vyo5cF6 b+l/tWpzibajDcQNEcKArH8+W1r2IlwaEjDSQALozAU1m9EhmNMjL9QukCJ68A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727096627; a=rsa-sha256; cv=none; b=xx4tuDEFxe1vFg86l1zEknyx3Kpuup2KHL2WGvPyt8MI3ob/6S78aN/l/QCHHOEiSEpPQc npBbCkph02CS97saYSYuhclvTkTHeO++u487wIRrKqHIhjul5ugFcYrR68pn2iATWsXUCo nScb1+1FoNqgnvBSIJ+AslIlG9rXBYLwtA/5w6IYLlvyX2kUDf6fI6djIV3Dhp7yN1VqNo fWiTY5g0tGN5SNjLE1OH3kH+VfPQQrnIWyhcoUVJ8f4TUUDE36Uxm+5CdMSX7OOcFy/RjG Qmc1EI7vqCr2NW0NbhwEvu5sT5WFc3JHdo9yJEvZ0RLGPXRWJUV8QueQPBux6Q== 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=1727096627; 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=9IDWK11m326kUBPhUSDnHAb15nZkqO13VaFCYOhFfYY=; b=sMkWPo0fhnbasIofF2MOHkenEtEiPkbTeH+DwzbV0nJUBTIvK3tinyy44Mm1WYO76z8Ye1 Ogp8e6a0R6xO93rkhV7M9x/e3cBCs1m0evYtSGOzagsbZzDHUWKD/j4ERdbDY6ajQNNE/a fGQv981m4eqhr+74MmCwFyhRAe5oAFsyyboW2+oUqHjoWiMeKbTsDIBv5my+V074uzvZAg OkeL+Xr0F6WLwLa/tMGi9H2rUsnGpk5rTLMwsDm9D4N6g6GhR/cQdh1NFfren6LYChGjZg p7zhBfrzLwZzmklU9cvgRAMfOG8/00kh/Q9YuJjpm/ldobng047qxhQ4GHpj/Q== 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 4XC38g5J1gzmD0; Mon, 23 Sep 2024 13:03:47 +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 48ND3lbk007223; Mon, 23 Sep 2024 13:03:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48ND3lD0007220; Mon, 23 Sep 2024 13:03:47 GMT (envelope-from git) Date: Mon, 23 Sep 2024 13:03:47 GMT Message-Id: <202409231303.48ND3lD0007220@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: 2e6e9d154100 - stable/14 - amd64 la57_trampoline: save registers in memory 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 2e6e9d154100f7bede90f2041cb3a897871f0766 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2e6e9d154100f7bede90f2041cb3a897871f0766 commit 2e6e9d154100f7bede90f2041cb3a897871f0766 Author: Konstantin Belousov AuthorDate: 2024-09-12 05:43:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-23 13:03:07 +0000 amd64 la57_trampoline: save registers in memory (cherry picked from commit 280e50461a1f638088e7a0b9116976821c374b56) --- 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 */