preempt: Adjust PREEMPT_LOCK_OFFSET for RT
authorThomas Gleixner <tglx@linutronix.de>
Sun, 15 Aug 2021 21:29:22 +0000 (23:29 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 17 Aug 2021 17:06:04 +0000 (19:06 +0200)
On PREEMPT_RT regular spinlocks and rwlocks are substituted with rtmutex
based constructs. spin/rwlock held regions are preemptible on PREEMPT_RT,
so PREEMPT_LOCK_OFFSET has to be 0 to make the various cond_resched_*lock()
functions work correctly.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210815211305.804246275@linutronix.de
include/linux/preempt.h

index 9881eac..4d244e2 100644 (file)
 /*
  * The preempt_count offset after spin_lock()
  */
 /*
  * The preempt_count offset after spin_lock()
  */
+#if !defined(CONFIG_PREEMPT_RT)
 #define PREEMPT_LOCK_OFFSET    PREEMPT_DISABLE_OFFSET
 #define PREEMPT_LOCK_OFFSET    PREEMPT_DISABLE_OFFSET
+#else
+#define PREEMPT_LOCK_OFFSET    0
+#endif
 
 /*
  * The preempt_count offset needed for things like:
 
 /*
  * The preempt_count offset needed for things like: