gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TO RESET: lock: check if runq lock is held with IRQs disabled

Browse Source 
Change-Id: I9a79ceaf9e399ad3695ed8959ca10c587591751a
This commit is contained in:
Masamichi Takagi
2020-06-15 12:43:29 +09:00
parent 8f2c8791bf
commit 4f7fd90300
4 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm64/kernel/cpu.c
View File

@ -869,6 +869,21 @@ unsigned long cpu_enable_interrupt_save(void)
return flags; return flags;
} }
#ifdef ENABLE_FUGAKU_HACKS
int cpu_interrupt_disabled(void)
{
unsigned long flags;
unsigned long masked = ICC_PMR_EL1_MASKED;
asm volatile(
"mrs_s %0, " __stringify(ICC_PMR_EL1)
: "=&r" (flags)
:
: "memory");
return (flags == masked);
}
#endif
#else /* defined(CONFIG_HAS_NMI) */ #else /* defined(CONFIG_HAS_NMI) */
/* @ref.impl arch/arm64/include/asm/irqflags.h::arch_local_irq_enable */ /* @ref.impl arch/arm64/include/asm/irqflags.h::arch_local_irq_enable */

27
arch/arm64/kernel/include/arch-lock.h
View File

@ -9,6 +9,9 @@
#include "affinity.h" #include "affinity.h"
#include <lwk/compiler.h> #include <lwk/compiler.h>
#include "config.h" #include "config.h"
#ifdef ENABLE_FUGAKU_HACKS
#include <ihk/debug.h>
#endif
//#define DEBUG_SPINLOCK //#define DEBUG_SPINLOCK
//#define DEBUG_MCS_RWLOCK //#define DEBUG_MCS_RWLOCK
@ -31,6 +34,10 @@ typedef struct {
#endif /* __AARCH64EB__ */ #endif /* __AARCH64EB__ */
} __attribute__((aligned(4))) ihk_spinlock_t; } __attribute__((aligned(4))) ihk_spinlock_t;
#ifdef ENABLE_FUGAKU_HACKS
extern ihk_spinlock_t *get_this_cpu_runq_lock(void);
#endif
extern void preempt_enable(void); extern void preempt_enable(void);
extern void preempt_disable(void); extern void preempt_disable(void);
@ -98,6 +105,18 @@ static int __ihk_mc_spinlock_trylock_noirq(ihk_spinlock_t *lock)
: "memory"); : "memory");
success = !tmp; success = !tmp;
#ifdef ENABLE_FUGAKU_HACKS
#if 0
if (success) {
if (get_this_cpu_runq_lock() == lock &&
!cpu_interrupt_disabled()) {
kprintf("%s: WARNING: runq lock held without IRQs disabled?\n", __func__); \
}
}
#endif
#endif
if (!success) { if (!success) {
preempt_enable(); preempt_enable();
} }
@ -182,6 +201,14 @@ static void __ihk_mc_spinlock_lock_noirq(ihk_spinlock_t *lock)
: "=&r" (lockval), "=&r" (newval), "=&r" (tmp), "+Q" (*lock) : "=&r" (lockval), "=&r" (newval), "=&r" (tmp), "+Q" (*lock)
: "Q" (lock->owner), "I" (1 << TICKET_SHIFT) : "Q" (lock->owner), "I" (1 << TICKET_SHIFT)
: "memory"); : "memory");
#ifdef ENABLE_FUGAKU_HACKS
#if 0
if (get_this_cpu_runq_lock() == lock &&
!cpu_interrupt_disabled()) {
kprintf("%s: WARNING: runq lock held without IRQs disabled?\n", __func__); \
}
#endif
#endif
} }
#ifdef DEBUG_SPINLOCK #ifdef DEBUG_SPINLOCK

7
kernel/cls.c
View File

@ -120,3 +120,10 @@ void do_backlog(void)
} }
} }
} }
#ifdef ENABLE_FUGAKU_HACKS
ihk_spinlock_t *get_this_cpu_runq_lock(void)
{
return &get_this_cpu_local_var()->runq_lock;
}
#endif

3
lib/include/ihk/cpu.h
View File

@ -23,6 +23,9 @@ extern int num_processors;
void cpu_enable_interrupt(void); void cpu_enable_interrupt(void);
void cpu_disable_interrupt(void); void cpu_disable_interrupt(void);
#ifdef ENABLE_FUGAKU_HACKS
int cpu_interrupt_disabled(void);
#endif
void cpu_halt(void); void cpu_halt(void);
#ifdef ENABLE_FUGAKU_HACKS #ifdef ENABLE_FUGAKU_HACKS
void cpu_halt_panic(void); void cpu_halt_panic(void);