From nobody Wed Oct 1 03:22:29 2025 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 4cc0bp1B6Rz69v30; Wed, 01 Oct 2025 03:22:30 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cc0bp0b8Cz3Mr4; Wed, 01 Oct 2025 03:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759288950; 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=4fCAZxLRdkPJeSJMbDfq12bWofjijn+9oRhC54fZIbo=; b=lM3Hm05yDOiZLy7j9NfbXCt0/ayZ0EMS/XCNc235oDSEdSs23hEeJwDrHS3oJqzLWiwclY 4CxPg0HhZCtk7xJF8L1t8By1QMjSPtYuVzRn/FpgS+XsKZx4BsqQLmILSFj1Dt6LpGYZOv PFyhmX8ERvu7VnJl/eVm7hh+djbdWh58P+p2SnNddAboNEXS7foXguH+fly/2891NdA6T4 Q/LJs2aVjbs9umEsMMmMmLJ5rHlKM+GWdSmEQQXiC9+4ihCp+5WHbrMeEWl8AWIzDvMJhc UtKmEJCNEP4xBgoWjZKDAlipmeYcbj3Ku7x4pENXO2f56BlwD8v2FCP2rD5YJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759288950; 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=4fCAZxLRdkPJeSJMbDfq12bWofjijn+9oRhC54fZIbo=; b=f65uAoENtNxZ41IS5+L7jKKVi/mJ6qKeySupAVyXDrk1RTCPcy9Ivt2m6lGZPYWployrj1 9d2l33XH3o6yO4lcthi1d80/7XeAdORuhp+pYoV68hT7WKWAKQn8N72PMAmU2Yl29+oOsR tJCOQGHmLtiEUGa7VvKZbSRIULsm/m/dWWIFwnFyKSprP2zqyP45qd46mEV8r9KoDmxem5 KJJWeWvwawNfFascWLRucrnNPa4TdHDtZ3WpzJJ1y9GZa7C4aub+W1wge1StiNiE7H7gKu 14u0DHHOToEvc23zbMZrrkjl50eZgGM9ipJ6mBcRmehsOVl4vVhJ18e4XEkx9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759288950; a=rsa-sha256; cv=none; b=HG9eTIlMNe2OwFcU/xhZnavQ7Zh0Y4KpMDEPbXpHYnEPoc+b7CiLTWTSWD1qv0yKTpTy/a 2r9h0ZoT3hd8eSHVzj4uxvGP1QrZy68ZVMjCijZZAkI7p7RM08e2LziuHW+sJgGNTuCmvj ll29omy1bTUg7Nxt63aZyIN/klMNMVZHvBIPqyz5rJddPZvHeZvtSbyEJK7iq9WT2dO9Eh 0jn6qbdQGa2HEyBhonE3QefN7bVIQHmu1VaJHha2/2XaskXuoHdn//RZxGurR4sAFpiepm w5YcP5iY9BWfkNqHs6n/lg0lDv2Cceu5zeNsUfPHBDiaQ/9jI6QYV2I/Pv6Zaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cc0bp05pzz14YQ; Wed, 01 Oct 2025 03:22:30 +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 5913MTn6008091; Wed, 1 Oct 2025 03:22:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5913MTWD008088; Wed, 1 Oct 2025 03:22:29 GMT (envelope-from git) Date: Wed, 1 Oct 2025 03:22:29 GMT Message-Id: <202510010322.5913MTWD008088@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: d83bd3bb94fe - stable/14 - amd64: add wrmsr_early_safe(9) 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: d83bd3bb94fe6ddc52c96e5e824607dadb1c47a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d83bd3bb94fe6ddc52c96e5e824607dadb1c47a4 commit d83bd3bb94fe6ddc52c96e5e824607dadb1c47a4 Author: Konstantin Belousov AuthorDate: 2025-09-18 21:55:19 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-01 03:20:08 +0000 amd64: add wrmsr_early_safe(9) (cherry picked from commit a319696875451229f492b6c15e58a0ac54dbcda1) --- sys/amd64/amd64/machdep.c | 33 +++++++++++++++++++++++++++++++++ sys/amd64/amd64/support.S | 16 ++++++++++++++++ sys/amd64/include/md_var.h | 4 ++++ 3 files changed, 53 insertions(+) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 70a7aa677c9f..f5733eef685e 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1833,6 +1833,39 @@ clear_pcb_flags(struct pcb *pcb, const u_int flags) : "cc", "memory"); } +extern const char wrmsr_early_safe_gp_handler[]; +static struct region_descriptor wrmsr_early_safe_orig_efi_idt; + +void +wrmsr_early_safe_start(void) +{ + struct region_descriptor efi_idt; + struct gate_descriptor *gpf_descr; + + sidt(&wrmsr_early_safe_orig_efi_idt); + efi_idt.rd_limit = 32 * sizeof(idt0[0]); + efi_idt.rd_base = (uintptr_t)idt0; + lidt(&efi_idt); + + gpf_descr = &idt0[IDT_GP]; + gpf_descr->gd_looffset = (uintptr_t)wrmsr_early_safe_gp_handler; + gpf_descr->gd_hioffset = (uintptr_t)wrmsr_early_safe_gp_handler >> 16; + gpf_descr->gd_selector = rcs(); + gpf_descr->gd_type = SDT_SYSTGT; + gpf_descr->gd_p = 1; +} + +void +wrmsr_early_safe_end(void) +{ + struct gate_descriptor *gpf_descr; + + lidt(&wrmsr_early_safe_orig_efi_idt); + + gpf_descr = &idt0[IDT_GP]; + memset(gpf_descr, 0, sizeof(*gpf_descr)); +} + #ifdef KDB /* diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index c95696bbe7ef..3393b8fadbba 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -1577,6 +1577,22 @@ msr_onfault: POP_FRAME_POINTER ret +ENTRY(wrmsr_early_safe) + movl %edi,%ecx + movl %esi,%eax + sarq $32,%rsi + movl %esi,%edx + wrmsr + xorl %eax,%eax +wrmsr_early_faulted: + ret + +ENTRY(wrmsr_early_safe_gp_handler) + addq $8,%rsp + movl $EFAULT,%eax + movq $wrmsr_early_faulted,(%rsp) + iretq + /* * void pmap_pti_pcid_invalidate(uint64_t ucr3, uint64_t kcr3); * Invalidates address space addressed by ucr3, then returns to kcr3. diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index b6ddc6eaaebe..b6d8c469cdf6 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -99,6 +99,10 @@ void get_fpcontext(struct thread *td, struct __mcontext *mcp, int set_fpcontext(struct thread *td, struct __mcontext *mcp, char *xfpustate, size_t xfpustate_len); +void wrmsr_early_safe_start(void); +void wrmsr_early_safe_end(void); +int wrmsr_early_safe(u_int msr, uint64_t data); + #endif /* !_MACHINE_MD_VAR_H_ */ #endif /* __i386__ */