From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: x86@kernel.org, Peter Zijlstra <peterz@infradead.org>,
Andy Lutomirski <luto@kernel.org>, Will Deacon <will@kernel.org>,
Paolo Bonzini <pbonzini@redhat.com>,
kvm@vger.kernel.org, linux-arch@vger.kernel.org,
Mike Rapoport <rppt@linux.ibm.com>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Miroslav Benes <mbenes@suse.cz>
Subject: [patch V2 04/17] x86/entry: Make DEBUG_ENTRY_ASSERT_IRQS_OFF available for 32bit
Date: Wed, 23 Oct 2019 14:27:09 +0200 [thread overview]
Message-ID: <20191023123117.976831752@linutronix.de> (raw)
In-Reply-To: 20191023122705.198339581@linutronix.de
Move the interrupt state verification debug macro to common code and fixup
the irqflags and paravirt components so it can be used in 32bit code later.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/entry/calling.h | 12 ++++++++++++
arch/x86/entry/entry_64.S | 12 ------------
arch/x86/include/asm/irqflags.h | 8 ++++++--
arch/x86/include/asm/paravirt.h | 9 +++++----
4 files changed, 23 insertions(+), 18 deletions(-)
--- a/arch/x86/entry/calling.h
+++ b/arch/x86/entry/calling.h
@@ -366,3 +366,15 @@ For 32-bit we have the following convent
#else
#define GET_CR2_INTO(reg) _ASM_MOV %cr2, reg
#endif
+
+.macro DEBUG_ENTRY_ASSERT_IRQS_OFF
+#ifdef CONFIG_DEBUG_ENTRY
+ push %_ASM_AX
+ SAVE_FLAGS(CLBR_EAX)
+ test $X86_EFLAGS_IF, %_ASM_AX
+ jz .Lokay_\@
+ ud2
+.Lokay_\@:
+ pop %_ASM_AX
+#endif
+.endm
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -387,18 +387,6 @@ ENTRY(spurious_entries_start)
.endr
END(spurious_entries_start)
-.macro DEBUG_ENTRY_ASSERT_IRQS_OFF
-#ifdef CONFIG_DEBUG_ENTRY
- pushq %rax
- SAVE_FLAGS(CLBR_RAX)
- testl $X86_EFLAGS_IF, %eax
- jz .Lokay_\@
- ud2
-.Lokay_\@:
- popq %rax
-#endif
-.endm
-
/*
* Enters the IRQ stack if we're not already using it. NMI-safe. Clobbers
* flags and puts old RSP into old_rsp, and leaves all other GPRs alone.
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -126,11 +126,15 @@ static inline notrace unsigned long arch
#define ENABLE_INTERRUPTS(x) sti
#define DISABLE_INTERRUPTS(x) cli
-#ifdef CONFIG_X86_64
#ifdef CONFIG_DEBUG_ENTRY
-#define SAVE_FLAGS(x) pushfq; popq %rax
+# ifdef CONFIG_X86_64
+# define SAVE_FLAGS(x) pushfq; popq %rax
+# else
+# define SAVE_FLAGS(x) pushfl; popl %eax
+# endif
#endif
+#ifdef CONFIG_X86_64
#define SWAPGS swapgs
/*
* Currently paravirt can't handle swapgs nicely when we
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -904,6 +904,11 @@ extern void default_banner(void);
ANNOTATE_RETPOLINE_SAFE; \
jmp PARA_INDIRECT(pv_ops+PV_CPU_usergs_sysret64);)
+#endif /* CONFIG_PARAVIRT_XXL */
+#endif /* CONFIG_X86_64 */
+
+#ifdef CONFIG_PARAVIRT_XXL
+
#ifdef CONFIG_DEBUG_ENTRY
#define SAVE_FLAGS(clobbers) \
PARA_SITE(PARA_PATCH(PV_IRQ_save_fl), \
@@ -912,10 +917,6 @@ extern void default_banner(void);
call PARA_INDIRECT(pv_ops+PV_IRQ_save_fl); \
PV_RESTORE_REGS(clobbers | CLBR_CALLEE_SAVE);)
#endif
-#endif /* CONFIG_PARAVIRT_XXL */
-#endif /* CONFIG_X86_64 */
-
-#ifdef CONFIG_PARAVIRT_XXL
#define GET_CR2_INTO_AX \
PARA_SITE(PARA_PATCH(PV_MMU_read_cr2), \
next prev parent reply other threads:[~2019-10-23 12:27 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 12:27 [patch V2 00/17] entry: Provide generic implementation for host and guest entry/exit work Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 01/17] x86/entry/32: Remove unused resume_userspace label Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 13:43 ` Sean Christopherson
2019-10-23 13:43 ` Sean Christopherson
2019-11-06 15:26 ` Alexandre Chartre
2019-11-06 15:26 ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 02/17] x86/entry/64: Remove pointless jump in paranoid_exit Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 13:45 ` Sean Christopherson
2019-10-23 13:45 ` Sean Christopherson
2019-11-06 15:29 ` Alexandre Chartre
2019-11-06 15:29 ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 03/17] x86/traps: Remove pointless irq enable from do_spurious_interrupt_bug() Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 13:52 ` Sean Christopherson
2019-10-23 13:52 ` Sean Christopherson
2019-10-23 21:31 ` Josh Poimboeuf
2019-10-23 21:31 ` Josh Poimboeuf
2019-10-23 22:35 ` Thomas Gleixner
2019-10-23 22:35 ` Thomas Gleixner
2019-10-23 22:49 ` Josh Poimboeuf
2019-10-23 22:49 ` Josh Poimboeuf
2019-10-23 23:18 ` Thomas Gleixner
2019-10-23 23:18 ` Thomas Gleixner
2019-11-06 15:33 ` Alexandre Chartre
2019-11-06 15:33 ` Alexandre Chartre
2019-10-23 12:27 ` Thomas Gleixner [this message]
2019-10-23 12:27 ` [patch V2 04/17] x86/entry: Make DEBUG_ENTRY_ASSERT_IRQS_OFF available for 32bit Thomas Gleixner
2019-10-23 14:16 ` Sean Christopherson
2019-10-23 14:16 ` Sean Christopherson
2019-11-06 15:50 ` Alexandre Chartre
2019-11-06 15:50 ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 05/17] x86/traps: Make interrupt enable/disable symmetric in C code Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 14:16 ` Sean Christopherson
2019-10-23 14:16 ` Sean Christopherson
2019-10-23 22:01 ` Josh Poimboeuf
2019-10-23 22:01 ` Josh Poimboeuf
2019-10-23 23:23 ` Thomas Gleixner
2019-10-23 23:23 ` Thomas Gleixner
2019-11-06 16:19 ` Alexandre Chartre
2019-11-06 16:19 ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 06/17] x86/entry/32: Remove redundant interrupt disable Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 14:17 ` Sean Christopherson
2019-10-23 14:17 ` Sean Christopherson
2019-11-08 10:41 ` Alexandre Chartre
2019-11-08 10:41 ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 07/17] x86/entry/64: " Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 14:20 ` Sean Christopherson
2019-10-23 14:20 ` Sean Christopherson
2019-10-23 22:06 ` Josh Poimboeuf
2019-10-23 22:06 ` Josh Poimboeuf
2019-10-23 23:52 ` Thomas Gleixner
2019-10-23 23:52 ` Thomas Gleixner
2019-10-24 16:18 ` Andy Lutomirski
2019-10-24 16:18 ` Andy Lutomirski
2019-10-24 20:52 ` Thomas Gleixner
2019-10-24 20:52 ` Thomas Gleixner
2019-10-24 20:59 ` Thomas Gleixner
2019-10-24 20:59 ` Thomas Gleixner
2019-10-24 21:21 ` Peter Zijlstra
2019-10-24 21:21 ` Peter Zijlstra
2019-10-24 21:24 ` Andy Lutomirski
2019-10-24 21:24 ` Andy Lutomirski
2019-10-24 22:33 ` Thomas Gleixner
2019-10-24 22:33 ` Thomas Gleixner
2019-11-08 11:07 ` Alexandre Chartre
2019-11-08 11:07 ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 08/17] x86/entry: Move syscall irq tracing to C code Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 21:30 ` Andy Lutomirski
2019-10-23 21:30 ` Andy Lutomirski
2019-10-23 21:35 ` Andy Lutomirski
2019-10-23 21:35 ` Andy Lutomirski
2019-10-23 23:31 ` Thomas Gleixner
2019-10-23 23:31 ` Thomas Gleixner
2019-10-23 23:16 ` Thomas Gleixner
2019-10-23 23:16 ` Thomas Gleixner
2019-10-24 16:24 ` Andy Lutomirski
2019-10-24 16:24 ` Andy Lutomirski
2019-10-24 17:40 ` Peter Zijlstra
2019-10-24 17:40 ` Peter Zijlstra
2019-10-24 20:54 ` Thomas Gleixner
2019-10-24 20:54 ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 09/17] x86/entry: Remove _TIF_NOHZ from _TIF_WORK_SYSCALL_ENTRY Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2020-01-06 4:11 ` Frederic Weisbecker
2020-01-06 4:11 ` Frederic Weisbecker
2019-10-23 12:27 ` [patch V2 10/17] entry: Provide generic syscall entry functionality Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 11/17] x86/entry: Use generic syscall entry function Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 12/17] entry: Provide generic syscall exit function Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 13/17] x86/entry: Use generic syscall exit functionality Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 14/17] entry: Provide generic exit to usermode functionality Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 21:34 ` Andy Lutomirski
2019-10-23 21:34 ` Andy Lutomirski
2019-10-23 23:20 ` Thomas Gleixner
2019-10-23 23:20 ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 15/17] x86/entry: Use generic exit to usermode Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 16/17] kvm/workpending: Provide infrastructure for work before entering a guest Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 14:55 ` Sean Christopherson
2019-10-23 14:55 ` Sean Christopherson
2019-10-23 12:27 ` [patch V2 17/17] x86/kvm: Use generic exit to guest work function Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 14:48 ` Sean Christopherson
2019-10-23 14:48 ` Sean Christopherson
2019-10-23 14:37 ` [patch V2 00/17] entry: Provide generic implementation for host and guest entry/exit work Peter Zijlstra
2019-10-23 14:37 ` Peter Zijlstra
2019-10-23 21:20 ` Josh Poimboeuf
2019-10-23 21:20 ` Josh Poimboeuf
2019-10-29 11:28 ` Will Deacon
2019-10-29 11:28 ` Will Deacon
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=20191023123117.976831752@linutronix.de \
--to=tglx@linutronix.de \
--cc=jpoimboe@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mbenes@suse.cz \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rppt@linux.ibm.com \
--cc=will@kernel.org \
--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