From nobody Wed Oct 1 03:13:11 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 4cc0P36TSmz69tB2; Wed, 01 Oct 2025 03:13:11 +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 4cc0P35lVLz3L7Q; Wed, 01 Oct 2025 03:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759288391; 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=lCZ0qSkNlJYlmCPAOaDCEElwRA7m7Rs7tUUuA1C2//Y=; b=YrDpoxo5N90Mp158oXvCxQvWnX9Ig8kbv6rnfySWri5Avyg8LR6oMHo9TVmLVYuu1hp+hM Ce9vuCu7AIg5QiezJ+w2YGP1nCdKKI3p3TZl6JPW1r+no6J/Skuj+neA6k3cjxv2tBLFgS 6FhgPsjoCqpjLUVbHSHw2J7SrcvDqhCsKgsjrsNG05cOhPQGjSF4M4j+YWWbicGEYGixk/ tSzano5e52MGhwZjdNbldeGsGq6IPNxMQNkwuCG0EiwbR0AMzWnHTci82ANXQh2+XwmT30 KzZUy9IQ0bGg1aWJPt5NEqZwhjgrI0j2+4w5r5MfWM5k53b0b1ksM43TkjGJPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759288391; 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=lCZ0qSkNlJYlmCPAOaDCEElwRA7m7Rs7tUUuA1C2//Y=; b=xjvgzB6giMwFJS3E6UGi//V8h5fhP8wC24a5OW4SbsERGDA9vbLc/xnE0dH2wwi84qaVgE DNEGjVJoyPFpC6oMyel3rRusUU1uh9vynpxMlThL/ImsVaOMSZEO/wJaXmpcl+ViGE24+f hfqU8O23bn0S9ntWkws/qUrPyGXqeAfxV/T3hGIUj8eiG84bLOM+dHHYkjY1ZfjXzTkmme 5a74RBCOSRZNyQ7Jz75ePKh1ivmdXWv4HCxgmBosL31Au4PkqZo4sWFnNwjd5asqYhNhMD HVgX11Z01j3Nf7oK8td/J/1Tt8wk5TPA1VUF5gpjOdjF6XRhZtFTH9rn4FIJyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759288391; a=rsa-sha256; cv=none; b=OdRZXYH19Sr9sAfESGGDLUziyWdiUrbAp3beph1sETx2bVrIsEeW4ZR8yRSUXU2eFwzbDS XTH5/8JTCfHZjMF+EtNfqSqK7HV7KeHJiaEdo2hVfnimradCmFeng5vFyQ//tmn3PN7l6K y4epTXFiV1QQcHeDFjtzfzof0K6qHbtP7PDvTgAUEQEhd/FQjcEvFxy4rWobiXEppOcoaz q7EiibnTcGQlg3k3YfPSKRjv/KeUhExybEvPp7TodC2Wj1ppnRR9sT3eZAYcj3EgYa0S0z L1UZYEX/LEo6dyDKKMQipT8dm3SKedvlZC+N6cTcm4vVvruLlgLVRVS8tNKJ0w== 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 4cc0P357Mkz13JV; Wed, 01 Oct 2025 03:13:11 +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 5913DBAF089636; Wed, 1 Oct 2025 03:13:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5913DBUg089633; Wed, 1 Oct 2025 03:13:11 GMT (envelope-from git) Date: Wed, 1 Oct 2025 03:13:11 GMT Message-Id: <202510010313.5913DBUg089633@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: d4f91b6d25cb - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: d4f91b6d25cbae9658035f86ee15e454141fae8e Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d4f91b6d25cbae9658035f86ee15e454141fae8e commit d4f91b6d25cbae9658035f86ee15e454141fae8e Author: Konstantin Belousov AuthorDate: 2025-09-18 21:55:19 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-01 03:00: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 9ff60439d1ec..2fce1a7e64b6 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1822,6 +1822,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 870cd255abb7..27694a95653c 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -1565,6 +1565,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__ */