From: Brian Gerst <brgerst@gmail.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
"the arch/x86 maintainers" <x86@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Juergen Gross <jgross@suse.com>,
Frederic Weisbecker <frederic@kernel.org>,
Alexandre Chartre <alexandre.chartre@oracle.com>
Subject: Re: [patch part-III V2 05/23] x86/entry/32: Provide macro to emit IDT entry stubs
Date: Mon, 9 Mar 2020 01:08:35 -0400 [thread overview]
Message-ID: <CAMzpN2itqrztb+wA1k-KDwYMyQw3nZaMjzkHCu4GLr=t10ug=w@mail.gmail.com> (raw)
In-Reply-To: <20200308231718.931465601@linutronix.de>
On Sun, Mar 8, 2020 at 7:24 PM Thomas Gleixner <tglx@linutronix.de> wrote:
>
> From: Thomas Gleixner <tglx@linutronix.de>
>
> 32 and 64 bit have unnecessary different ways to populate the exception
> entry code. Provide a idtentry macro which allows to consolidate all of
> that.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
>
> ---
> arch/x86/entry/entry_32.S | 42 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 42 insertions(+)
>
> --- a/arch/x86/entry/entry_32.S
> +++ b/arch/x86/entry/entry_32.S
> @@ -44,6 +44,7 @@
> #include <asm/asm.h>
> #include <asm/smap.h>
> #include <asm/frame.h>
> +#include <asm/trapnr.h>
> #include <asm/nospec-branch.h>
>
> #include "calling.h"
> @@ -726,6 +727,47 @@
>
> .Lend_\@:
> .endm
> +
> +#ifdef CONFIG_X86_INVD_BUG
> +.macro idtentry_push_func vector cfunc
> + .if \vector == X86_TRAP_XF
> + /* AMD 486 bug: invd from userspace calls exception 19 instead of #GP */
> + ALTERNATIVE "pushl $do_general_protection", \
> + "pushl $do_simd_coprocessor_error", \
> + X86_FEATURE_XMM
> + .else
> + pushl $\cfunc
> + .endif
> +.endm
> +#else
> +.macro idtentry_push_func vector cfunc
> + pushl $\cfunc
> +.endm
> +#endif
IMHO it would be better to push this to the C code and not make the
asm more complicated. Something like:
dotraplinkage void
do_simd_coprocessor_error(struct pt_regs *regs, long error_code)
{
#ifdef CONFIG_X86_INVD_BUG
/* AMD 486 bug: invd from userspace calls exception 19 instead of #GP */
if (!static_cpu_has(X86_FEATURE_XMM)) {
do_general_protection(regs, error_code);
return;
}
#endif
RCU_LOCKDEP_WARN(!rcu_is_watching(), "entry code didn't wake RCU");
math_error(regs, error_code, X86_TRAP_XF);
}
--
Brian Gerst
next prev parent reply other threads:[~2020-03-09 5:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-08 23:14 [patch part-III V2 00/23] x86/entry: Consolidation - Part III (simple exceptions) Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 01/23] x86/traps: Split trap numbers out in a seperate header Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 02/23] x86/entry/64: Avoid pointless code when CONTEXT_TRACKING=n Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 03/23] x86/entry/64: Reorder idtentries Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 04/23] x86/entry: Distangle idtentry Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 05/23] x86/entry/32: Provide macro to emit IDT entry stubs Thomas Gleixner
2020-03-09 5:08 ` Brian Gerst [this message]
2020-03-09 7:01 ` Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 06/23] x86/idtentry: Provide macros to define/declare IDT entry points Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 07/23] x86/traps: Prepare for using DEFINE_IDTENTRY Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 08/23] x86/entry: Convert Divide Error to IDTENTRY Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 09/23] x86/entry: Convert Overflow exception " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 10/23] x86/entry: Convert Bounds " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 11/23] x86/entry: Convert Invalid Opcode " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 12/23] x86/entry: Convert Device not available " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 13/23] x86/entry: Convert Coprocessor segment overrun " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 14/23] x86/entry: Provide IDTENTRY_ERRORCODE Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 15/23] x86/entry: Convert Invalid TSS exception to IDTENTRY Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 16/23] x86/entry: Convert Segment not present " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 17/23] x86/entry: Convert Stack segment " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 18/23] x86/entry: Convert General protection " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 19/23] x86/entry: Convert Spurious interrupt bug " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 20/23] x86/entry: Convert Coprocessor error " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 21/23] x86/entry: Convert Alignment check " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 22/23] x86/entry: Convert SIMD coprocessor error " Thomas Gleixner
2020-03-08 23:14 ` [patch part-III V2 23/23] x86/entry/32: Convert IRET exception to IDTENTRY_SW Thomas Gleixner
2020-03-09 9:32 ` [patch part-III V2 00/23] x86/entry: Consolidation - Part III (simple exceptions) Jürgen Groß
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='CAMzpN2itqrztb+wA1k-KDwYMyQw3nZaMjzkHCu4GLr=t10ug=w@mail.gmail.com' \
--to=brgerst@gmail.com \
--cc=alexandre.chartre@oracle.com \
--cc=frederic@kernel.org \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.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;
as well as URLs for NNTP newsgroup(s).