Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'powerpc-6.2-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- Fix interrupt exit race with security mitigation switching.
- Don't select ARCH_WANTS_NO_INSTR until warnings are fixed.
- Build fix for CONFIG_NUMA=n.
Thanks to Nicholas Piggin, Randy Dunlap, and Sachin Sant.
* tag 'powerpc-6.2-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/64s/interrupt: Fix interrupt exit race with security mitigation switch
powerpc/kexec_file: fix implicit decl error
powerpc: Don't select ARCH_WANTS_NO_INSTR
+5
-3
-1
arch/powerpc/Kconfig
-1
arch/powerpc/Kconfig
···
163
163
select ARCH_WANT_IRQS_OFF_ACTIVATE_MM
164
164
select ARCH_WANT_LD_ORPHAN_WARN
165
165
select ARCH_WANTS_MODULES_DATA_IN_VMALLOC if PPC_BOOK3S_32 || PPC_8xx
166
-
select ARCH_WANTS_NO_INSTR
167
166
select ARCH_WEAK_RELEASE_ACQUIRE
168
167
select BINFMT_ELF
169
168
select BUILDTIME_TABLE_SORT
+4
-2
arch/powerpc/kernel/interrupt.c
+4
-2
arch/powerpc/kernel/interrupt.c
···
50
50
*/
51
51
static notrace __always_inline bool prep_irq_for_enabled_exit(bool restartable)
52
52
{
53
+
bool must_hard_disable = (exit_must_hard_disable() || !restartable);
54
+
53
55
/* This must be done with RI=1 because tracing may touch vmaps */
54
56
trace_hardirqs_on();
55
57
56
-
if (exit_must_hard_disable() || !restartable)
58
+
if (must_hard_disable)
57
59
__hard_EE_RI_disable();
58
60
59
61
#ifdef CONFIG_PPC64
60
62
/* This pattern matches prep_irq_for_idle */
61
63
if (unlikely(lazy_irq_pending_nocheck())) {
62
-
if (exit_must_hard_disable() || !restartable) {
64
+
if (must_hard_disable) {
63
65
local_paca->irq_happened |= PACA_IRQ_HARD_DIS;
64
66
__hard_RI_enable();
65
67
}