From: Andy Lutomirski <luto@kernel.org>
To: x86@kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>,
"Krzysztof Mazur" <krzysiek@podlesie.net>,
"Krzysztof Olędzki" <ole@ans.pl>, "Arnd Bergmann" <arnd@arndb.de>,
"Andy Lutomirski" <luto@kernel.org>
Subject: [PATCH 2/4] x86/mmx: Use KFPU_MMX for MMX string operations
Date: Sun, 17 Jan 2021 22:20:39 -0800 [thread overview]
Message-ID: <233a815f5c34cdefb25628fead19b6789b8bd273.1610950681.git.luto@kernel.org> (raw)
In-Reply-To: <cover.1610950681.git.luto@kernel.org>
The default kernel_fpu_begin() doesn't work on systems that support XMM but
haven't yet enabled OSFXSR. This causes crashes when _mmx_memcpy() is
called too early.
Fix it by using kernel_fpu_begin(KFPU_MMX) explicitly. This should also be
faster, since it skips both the reasonably fast LDMXCSR and also the rather
slow FNINIT instructions.
Fixes: 7ad816762f9b ("x86/fpu: Reset MXCSR to default in kernel_fpu_begin()")
Reported-by: Krzysztof Mazur <krzysiek@podlesie.net>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
arch/x86/lib/mmx_32.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
index 4321fa02e18d..daa80fa005fb 100644
--- a/arch/x86/lib/mmx_32.c
+++ b/arch/x86/lib/mmx_32.c
@@ -37,7 +37,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
p = to;
i = len >> 6; /* len/64 */
- kernel_fpu_begin();
+ kernel_fpu_begin_mask(KFPU_MMX);
__asm__ __volatile__ (
"1: prefetch (%0)\n" /* This set is 28 bytes */
@@ -127,7 +127,7 @@ static void fast_clear_page(void *page)
{
int i;
- kernel_fpu_begin();
+ kernel_fpu_begin_mask(KFPU_MMX);
__asm__ __volatile__ (
" pxor %%mm0, %%mm0\n" : :
@@ -160,7 +160,7 @@ static void fast_copy_page(void *to, void *from)
{
int i;
- kernel_fpu_begin();
+ kernel_fpu_begin_mask(KFPU_MMX);
/*
* maybe the prefetch stuff can go before the expensive fnsave...
@@ -247,7 +247,7 @@ static void fast_clear_page(void *page)
{
int i;
- kernel_fpu_begin();
+ kernel_fpu_begin_mask(KFPU_MMX);
__asm__ __volatile__ (
" pxor %%mm0, %%mm0\n" : :
@@ -282,7 +282,7 @@ static void fast_copy_page(void *to, void *from)
{
int i;
- kernel_fpu_begin();
+ kernel_fpu_begin_mask(KFPU_MMX);
__asm__ __volatile__ (
"1: prefetch (%0)\n"
--
2.29.2
next prev parent reply other threads:[~2021-01-18 6:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 6:20 [PATCH 0/4] x86/fpu: Reduce unnecessary FNINIT and MXCSR usage Andy Lutomirski
2021-01-18 6:20 ` [PATCH 1/4] x86/fpu: Add kernel_fpu_begin_mask() to selectively initialize state Andy Lutomirski
2021-01-18 12:21 ` Peter Zijlstra
2021-01-18 14:03 ` David Laight
2021-01-19 11:08 ` Borislav Petkov
2021-01-18 6:20 ` Andy Lutomirski [this message]
2021-01-18 6:20 ` [PATCH 3/4] x86/fpu: Make the EFI FPU calling convention explicit Andy Lutomirski
2021-01-18 12:13 ` Borislav Petkov
2021-01-18 6:20 ` [PATCH 4/4] x86/fpu/64: Don't FNINIT in kernel_fpu_begin() Andy Lutomirski
2021-01-18 8:25 ` [PATCH 0/4] x86/fpu: Reduce unnecessary FNINIT and MXCSR usage Krzysztof Olędzki
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=233a815f5c34cdefb25628fead19b6789b8bd273.1610950681.git.luto@kernel.org \
--to=luto@kernel.org \
--cc=arnd@arndb.de \
--cc=krzysiek@podlesie.net \
--cc=linux-kernel@vger.kernel.org \
--cc=ole@ans.pl \
--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
all inboxes | Powered by JetHome®