From: "Xin Li (Intel)" <xin@zytor.com>
To: linux-kernel@vger.kernel.org
Cc: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com,
bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org,
peterz@infradead.org, andrew.cooper3@citrix.com,
nik.borisov@suse.com, houwenlong.hwl@antgroup.com
Subject: [PATCH v1 2/4] x86/fred: Write to FRED MSRs with wrmsrns()
Date: Wed, 3 Jul 2024 01:54:24 -0700 [thread overview]
Message-ID: <20240703085426.274801-3-xin@zytor.com> (raw)
In-Reply-To: <20240703085426.274801-1-xin@zytor.com>
Do FRED MSR writes with wrmsrns() rather than wrmsrl().
No functional change intended.
Signed-off-by: Xin Li (Intel) <xin@zytor.com>
---
arch/x86/kernel/fred.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/x86/kernel/fred.c b/arch/x86/kernel/fred.c
index 4bcd8791ad96..b202685b8e77 100644
--- a/arch/x86/kernel/fred.c
+++ b/arch/x86/kernel/fred.c
@@ -26,27 +26,27 @@ void cpu_init_fred_exceptions(void)
/* When FRED is enabled by default, remove this log message */
pr_info("Initialize FRED on CPU%d\n", smp_processor_id());
- wrmsrl(MSR_IA32_FRED_CONFIG,
- /* Reserve for CALL emulation */
- FRED_CONFIG_REDZONE |
- FRED_CONFIG_INT_STKLVL(0) |
- FRED_CONFIG_ENTRYPOINT(asm_fred_entrypoint_user));
+ wrmsrns(MSR_IA32_FRED_CONFIG,
+ /* Reserve for CALL emulation */
+ FRED_CONFIG_REDZONE |
+ FRED_CONFIG_INT_STKLVL(0) |
+ FRED_CONFIG_ENTRYPOINT(asm_fred_entrypoint_user));
/*
* The purpose of separate stacks for NMI, #DB and #MC *in the kernel*
* (remember that user space faults are always taken on stack level 0)
* is to avoid overflowing the kernel stack.
*/
- wrmsrl(MSR_IA32_FRED_STKLVLS,
- FRED_STKLVL(X86_TRAP_DB, FRED_DB_STACK_LEVEL) |
- FRED_STKLVL(X86_TRAP_NMI, FRED_NMI_STACK_LEVEL) |
- FRED_STKLVL(X86_TRAP_MC, FRED_MC_STACK_LEVEL) |
- FRED_STKLVL(X86_TRAP_DF, FRED_DF_STACK_LEVEL));
+ wrmsrns(MSR_IA32_FRED_STKLVLS,
+ FRED_STKLVL(X86_TRAP_DB, FRED_DB_STACK_LEVEL) |
+ FRED_STKLVL(X86_TRAP_NMI, FRED_NMI_STACK_LEVEL) |
+ FRED_STKLVL(X86_TRAP_MC, FRED_MC_STACK_LEVEL) |
+ FRED_STKLVL(X86_TRAP_DF, FRED_DF_STACK_LEVEL));
/* The FRED equivalents to IST stacks... */
- wrmsrl(MSR_IA32_FRED_RSP1, __this_cpu_ist_top_va(DB));
- wrmsrl(MSR_IA32_FRED_RSP2, __this_cpu_ist_top_va(NMI));
- wrmsrl(MSR_IA32_FRED_RSP3, __this_cpu_ist_top_va(DF));
+ wrmsrns(MSR_IA32_FRED_RSP1, __this_cpu_ist_top_va(DB));
+ wrmsrns(MSR_IA32_FRED_RSP2, __this_cpu_ist_top_va(NMI));
+ wrmsrns(MSR_IA32_FRED_RSP3, __this_cpu_ist_top_va(DF));
/* Enable FRED */
cr4_set_bits(X86_CR4_FRED);
--
2.45.2
next prev parent reply other threads:[~2024-07-03 8:55 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-03 8:54 [PATCH v1 0/4] Enable FRED earlier Xin Li (Intel)
2024-07-03 8:54 ` [PATCH v1 1/4] x86/fred: Parse cmdline param "fred=" in cpu_parse_early_param() Xin Li (Intel)
2024-07-04 11:20 ` Nikolay Borisov
2024-07-07 17:42 ` Xin Li
2024-07-03 8:54 ` Xin Li (Intel) [this message]
2024-07-03 15:43 ` [PATCH v1 2/4] x86/fred: Write to FRED MSRs with wrmsrns() Dave Hansen
2024-07-03 15:54 ` Borislav Petkov
2024-07-03 16:00 ` Andrew Cooper
2024-07-03 16:06 ` H. Peter Anvin
2024-07-03 16:17 ` Borislav Petkov
2024-07-05 2:45 ` H. Peter Anvin
2024-07-05 9:44 ` Borislav Petkov
2024-07-05 10:30 ` Andrew Cooper
2024-07-05 13:45 ` Borislav Petkov
2024-07-09 13:58 ` Xin Li
2024-07-09 20:51 ` H. Peter Anvin
2024-07-03 16:18 ` Andrew Cooper
2024-07-04 5:57 ` Xin Li
2024-07-04 7:58 ` H. Peter Anvin
2024-07-04 8:23 ` Borislav Petkov
2024-07-04 8:28 ` H. Peter Anvin
2024-07-03 16:43 ` Dave Hansen
2024-07-03 22:48 ` Xin Li
2024-07-05 9:28 ` Peter Zijlstra
2024-07-05 11:33 ` H. Peter Anvin
2024-07-03 8:54 ` [PATCH v1 3/4] x86/fred: Split FRED RSP initialization into a separate function Xin Li (Intel)
2024-07-03 8:54 ` [PATCH v1 4/4] x86/fred: Enable FRED right after init_mem_mapping() Xin Li (Intel)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240703085426.274801-3-xin@zytor.com \
--to=xin@zytor.com \
--cc=andrew.cooper3@citrix.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=houwenlong.hwl@antgroup.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=nik.borisov@suse.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox