Treewide: Use CONFIG_PREEMPTION
Subsystems (39)
cover Treewide: Use CONFIG_PREEMPTION
This series replaces 'PREEMPT' with 'PREEMPTION' if the functionality behind it is not limited to the preemption model CONFIG_PREEMPT but also required by the preemption model CONFIG_PREEMPT_RT.
Sebastian
PATCH 1/34 ARM: Use CONFIG_PREEMPTION
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code, cache over to use CONFIG_PREEMPTION and add output in show_stack() for PREEMPT_RT.
--- arch/arm/include/asm/switch_to.h | 2 +- arch/arm/kernel/entry-armv.S | 4 ++-- arch/arm/kernel/traps.c | 2 ++ arch/arm/mm/cache-v7.S | 4 ++-- arch/arm/mm/cache-v7m.S | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-)
arch/arm/include/asm/switch_to.h +1 -1
@@ -10,7 +10,7 @@* to ensure that the maintenance completes in case we migrate to another * CPU. */ -#if defined(CONFIG_PREEMPT ) && defined(CONFIG_SMP ) && defined(CONFIG_CPU_V7 ) +#if defined(CONFIG_PREEMPTION ) && defined(CONFIG_SMP ) && defined(CONFIG_CPU_V7 )#define __complete_pending_tlbi () dsb(ish)#else #define __complete_pending_tlbi ()
arch/arm/kernel/entry-armv.S +2 -2
@@ -211,7 +211,7 @@ ENDPROC(__dabt_svc) svc_entry irq_handler -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION ldr r8, [tsk, #TI_PREEMPT] @ get preempt count ldr r0, [tsk, #TI_FLAGS] @ get flags teq r8, #0 @ if preempt count != 0
@@ -226,7 +226,7 @@ ENDPROC(__irq_svc) .ltorg -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION svc_preempt: mov r8, lr 1: bl preempt_schedule_irq @ irq en/disable is done inside
arch/arm/kernel/traps.c +2 -0
@@ -248,6 +248,8 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)#ifdef CONFIG_PREEMPT #define S_PREEMPT " PREEMPT" +#elif defined(CONFIG_PREEMPT_RT ) +#define S_PREEMPT " PREEMPT_RT"#else #define S_PREEMPT ""#endif
arch/arm/mm/cache-v7.S +2 -2
@@ -135,13 +135,13 @@ ENTRY(v7_flush_dcache_all) and r1, r1, #7 @ mask of the bits for current cache only cmp r1, #2 @ see what cache we have at this level blt skip @ skip if no cache, or just i-cache -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION save_and_disable_irqs_notrace r9 @ make cssr&csidr read atomic #endif mcr p15, 2, r10, c0, c0, 0 @ select current cache level in cssr isb @ isb to sych the new cssr&csidr mrc p15, 1, r1, c0, c0, 0 @ read the new csidr -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION restore_irqs_notrace r9 #endif and r2, r1, #7 @ extract the length of the cache lines
arch/arm/mm/cache-v7m.S +2 -2
@@ -183,13 +183,13 @@ ENTRY(v7m_flush_dcache_all) and r1, r1, #7 @ mask of the bits for current cache only cmp r1, #2 @ see what cache we have at this level blt skip @ skip if no cache, or just i-cache -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION save_and_disable_irqs_notrace r9 @ make cssr&csidr read atomic #endif write_csselr r10, r1 @ set current cache level isb @ isb to sych the new cssr&csidr read_ccsidr r1 @ read the new csidr -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION restore_irqs_notrace r9 #endif and r2, r1, #7 @ extract the length of the cache lines
Signature · 7 lines
2.23.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
[tip: sched/urgent] sched/rt, ARM: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: e7289c6de81c8e8991148e46c9ab43e2d23940f3 Gitweb: https://git.kernel.org/tip/e7289c6de81c8e8991148e46c9ab43e2d23940f3 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:17:48 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:32 +01:00
sched/rt, ARM: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code, cache over to use CONFIG_PREEMPTION and add output in show_stack() for PREEMPT_RT.
[bigeasy: +traps.c]
--- arch/arm/include/asm/switch_to.h | 2 +- arch/arm/kernel/entry-armv.S | 4 ++-- arch/arm/kernel/traps.c | 2 ++ arch/arm/mm/cache-v7.S | 4 ++-- arch/arm/mm/cache-v7m.S | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-)
arch/arm/include/asm/switch_to.h +1 -1
@@ -10,7 +10,7 @@* to ensure that the maintenance completes in case we migrate to another * CPU. */ -#if defined(CONFIG_PREEMPT ) && defined(CONFIG_SMP ) && defined(CONFIG_CPU_V7 ) +#if defined(CONFIG_PREEMPTION ) && defined(CONFIG_SMP ) && defined(CONFIG_CPU_V7 )#define __complete_pending_tlbi () dsb(ish)#else #define __complete_pending_tlbi ()
arch/arm/kernel/entry-armv.S +2 -2
@@ -211,7 +211,7 @@ __irq_svc: svc_entry irq_handler -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION ldr r8, [tsk, #TI_PREEMPT] @ get preempt count ldr r0, [tsk, #TI_FLAGS] @ get flags teq r8, #0 @ if preempt count != 0
@@ -226,7 +226,7 @@ ENDPROC(__irq_svc) .ltorg -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION svc_preempt: mov r8, lr 1: bl preempt_schedule_irq @ irq en/disable is done inside
arch/arm/kernel/traps.c +2 -0
@@ -248,6 +248,8 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)#ifdef CONFIG_PREEMPT #define S_PREEMPT " PREEMPT" +#elif defined(CONFIG_PREEMPT_RT ) +#define S_PREEMPT " PREEMPT_RT"#else #define S_PREEMPT ""#endif
arch/arm/mm/cache-v7.S +2 -2
@@ -135,13 +135,13 @@ flush_levels: and r1, r1, #7 @ mask of the bits for current cache only cmp r1, #2 @ see what cache we have at this level blt skip @ skip if no cache, or just i-cache -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION save_and_disable_irqs_notrace r9 @ make cssr&csidr read atomic #endif mcr p15, 2, r10, c0, c0, 0 @ select current cache level in cssr isb @ isb to sych the new cssr&csidr mrc p15, 1, r1, c0, c0, 0 @ read the new csidr -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION restore_irqs_notrace r9 #endif and r2, r1, #7 @ extract the length of the cache lines
arch/arm/mm/cache-v7m.S +2 -2
@@ -183,13 +183,13 @@ flush_levels: and r1, r1, #7 @ mask of the bits for current cache only cmp r1, #2 @ see what cache we have at this level blt skip @ skip if no cache, or just i-cache -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION save_and_disable_irqs_notrace r9 @ make cssr&csidr read atomic #endif write_csselr r10, r1 @ set current cache level isb @ isb to sych the new cssr&csidr read_ccsidr r1 @ read the new csidr -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION restore_irqs_notrace r9 #endif and r2, r1, #7 @ extract the length of the cache lines
PATCH 2/34 arm64: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the Kconfig dependency, entry code and preemption handling over to use CONFIG_PREEMPTION. Add PREEMPT_RT output in show_stack().
--- arch/arm64/Kconfig | 52 +++++++++++++++--------------- arch/arm64/crypto/sha256-glue.c | 2 +- arch/arm64/include/asm/assembler.h | 6 ++-- arch/arm64/include/asm/preempt.h | 4 +-- arch/arm64/kernel/entry.S | 2 +- arch/arm64/kernel/traps.c | 3 ++ 6 files changed, 36 insertions(+), 33 deletions(-)
arch/arm64/Kconfig +26 -26
@@ -35,32 +35,32 @@ config ARM64 select ARCH_HAS_TEARDOWN_DMA_OPS if IOMMU_SUPPORT select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAVE_NMI_SAFE_CMPXCHG - select ARCH_INLINE_READ_LOCK if !PREEMPT - select ARCH_INLINE_READ_LOCK_BH if !PREEMPT - select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPT - select ARCH_INLINE_READ_LOCK_IRQSAVE if !PREEMPT - select ARCH_INLINE_READ_UNLOCK if !PREEMPT - select ARCH_INLINE_READ_UNLOCK_BH if !PREEMPT - select ARCH_INLINE_READ_UNLOCK_IRQ if !PREEMPT - select ARCH_INLINE_READ_UNLOCK_IRQRESTORE if !PREEMPT - select ARCH_INLINE_WRITE_LOCK if !PREEMPT - select ARCH_INLINE_WRITE_LOCK_BH if !PREEMPT - select ARCH_INLINE_WRITE_LOCK_IRQ if !PREEMPT - select ARCH_INLINE_WRITE_LOCK_IRQSAVE if !PREEMPT - select ARCH_INLINE_WRITE_UNLOCK if !PREEMPT - select ARCH_INLINE_WRITE_UNLOCK_BH if !PREEMPT - select ARCH_INLINE_WRITE_UNLOCK_IRQ if !PREEMPT - select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE if !PREEMPT - select ARCH_INLINE_SPIN_TRYLOCK if !PREEMPT - select ARCH_INLINE_SPIN_TRYLOCK_BH if !PREEMPT - select ARCH_INLINE_SPIN_LOCK if !PREEMPT - select ARCH_INLINE_SPIN_LOCK_BH if !PREEMPT - select ARCH_INLINE_SPIN_LOCK_IRQ if !PREEMPT - select ARCH_INLINE_SPIN_LOCK_IRQSAVE if !PREEMPT - select ARCH_INLINE_SPIN_UNLOCK if !PREEMPT - select ARCH_INLINE_SPIN_UNLOCK_BH if !PREEMPT - select ARCH_INLINE_SPIN_UNLOCK_IRQ if !PREEMPT - select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE if !PREEMPT + select ARCH_INLINE_READ_LOCK if !PREEMPTION + select ARCH_INLINE_READ_LOCK_BH if !PREEMPTION + select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPTION + select ARCH_INLINE_READ_LOCK_IRQSAVE if !PREEMPTION + select ARCH_INLINE_READ_UNLOCK if !PREEMPTION + select ARCH_INLINE_READ_UNLOCK_BH if !PREEMPTION + select ARCH_INLINE_READ_UNLOCK_IRQ if !PREEMPTION + select ARCH_INLINE_READ_UNLOCK_IRQRESTORE if !PREEMPTION + select ARCH_INLINE_WRITE_LOCK if !PREEMPTION + select ARCH_INLINE_WRITE_LOCK_BH if !PREEMPTION + select ARCH_INLINE_WRITE_LOCK_IRQ if !PREEMPTION + select ARCH_INLINE_WRITE_LOCK_IRQSAVE if !PREEMPTION + select ARCH_INLINE_WRITE_UNLOCK if !PREEMPTION + select ARCH_INLINE_WRITE_UNLOCK_BH if !PREEMPTION + select ARCH_INLINE_WRITE_UNLOCK_IRQ if !PREEMPTION + select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE if !PREEMPTION + select ARCH_INLINE_SPIN_TRYLOCK if !PREEMPTION + select ARCH_INLINE_SPIN_TRYLOCK_BH if !PREEMPTION + select ARCH_INLINE_SPIN_LOCK if !PREEMPTION + select ARCH_INLINE_SPIN_LOCK_BH if !PREEMPTION + select ARCH_INLINE_SPIN_LOCK_IRQ if !PREEMPTION + select ARCH_INLINE_SPIN_LOCK_IRQSAVE if !PREEMPTION + select ARCH_INLINE_SPIN_UNLOCK if !PREEMPTION + select ARCH_INLINE_SPIN_UNLOCK_BH if !PREEMPTION + select ARCH_INLINE_SPIN_UNLOCK_IRQ if !PREEMPTION + select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE if !PREEMPTION select ARCH_KEEP_MEMBLOCK select ARCH_USE_CMPXCHG_LOCKREF select ARCH_USE_QUEUED_RWLOCKS
arch/arm64/crypto/sha256-glue.c +1 -1
@@ -97,7 +97,7 @@ static int sha256_update_neon(struct shash_desc *desc, const u8 *data,* input when running on a preemptible kernel, but process the * data block by block instead. */ -if (IS_ENABLED (CONFIG_PREEMPT ) && +if (IS_ENABLED (CONFIG_PREEMPTION ) && chunk + sctx->count %SHA256_BLOCK_SIZE >SHA256_BLOCK_SIZE ) chunk =SHA256_BLOCK_SIZE - sctx->count %SHA256_BLOCK_SIZE ;
arch/arm64/include/asm/assembler.h +3 -3
@@ -699,8 +699,8 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU* where <label> is optional, and marks the point where execution will resume * after a yield has been performed. If omitted, execution resumes right after * the endif_yield_neon invocation. Note that the entire sequence, including -* the provided patchup code, will be omitted from the image if CONFIG_PREEMPT -* is not defined. +* the provided patchup code, will be omitted from the image if +* CONFIG_PREEMPTION is not defined. * * As a convenience, in the case where no patchup code is required, the above * sequence may be abbreviated to
@@ -728,7 +728,7 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU .endm .macro if_will_cond_yield_neon -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION get_current_task x0 ldr x0, [x0, #TSK_TI_PREEMPT] sub x0, x0, #PREEMPT_DISABLE_OFFSET
arch/arm64/include/asm/preempt.h +2 -2
@@ -79,11 +79,11 @@ static inline bool should_resched(int preempt_offset) return pc == preempt_offset; } -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION void preempt_schedule (void );#define __preempt_schedule () preempt_schedule()void preempt_schedule_notrace (void );#define __preempt_schedule_notrace () preempt_schedule_notrace() -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ #endif /* __ASM_PREEMPT_H */
arch/arm64/kernel/entry.S +1 -1
@@ -669,7 +669,7 @@ ENDPROC(el1_sync) irq_handler -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION ldr x24, [tsk, #TSK_TI_PREEMPT] // get preempt count alternative_if ARM64_HAS_IRQ_PRIO_MASKING /*
arch/arm64/kernel/traps.c +3 -0
@@ -143,9 +143,12 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)#ifdef CONFIG_PREEMPT #define S_PREEMPT " PREEMPT" +#elif defined(CONFIG_PREEMPT_RT ) +#define S_PREEMPT " PREEMPT_RT"#else #define S_PREEMPT ""#endif +#define S_SMP " SMP"static int __die (const char *str,int err,struct pt_regs *regs)
Signature · 7 lines
2.23.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
[tip: sched/urgent] sched/rt, arm64: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 7ef858dad9fa6cabfe3b78997c3114cd641de6e3 Gitweb: https://git.kernel.org/tip/7ef858dad9fa6cabfe3b78997c3114cd641de6e3 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:17:49 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:32 +01:00
sched/rt, arm64: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the Kconfig dependency, entry code and preemption handling over to use CONFIG_PREEMPTION. Add PREEMPT_RT output in show_stack().
[bigeasy: +traps.c, Kconfig]
--- arch/arm64/Kconfig | 52 ++++++++++++++--------------- arch/arm64/crypto/sha256-glue.c | 2 +- arch/arm64/include/asm/assembler.h | 6 +-- arch/arm64/include/asm/preempt.h | 4 +- arch/arm64/kernel/entry.S | 2 +- arch/arm64/kernel/traps.c | 3 ++- 6 files changed, 36 insertions(+), 33 deletions(-)
arch/arm64/Kconfig +26 -26
@@ -34,32 +34,32 @@ config ARM64 select ARCH_HAS_TEARDOWN_DMA_OPS if IOMMU_SUPPORT select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAVE_NMI_SAFE_CMPXCHG - select ARCH_INLINE_READ_LOCK if !PREEMPT - select ARCH_INLINE_READ_LOCK_BH if !PREEMPT - select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPT - select ARCH_INLINE_READ_LOCK_IRQSAVE if !PREEMPT - select ARCH_INLINE_READ_UNLOCK if !PREEMPT - select ARCH_INLINE_READ_UNLOCK_BH if !PREEMPT - select ARCH_INLINE_READ_UNLOCK_IRQ if !PREEMPT - select ARCH_INLINE_READ_UNLOCK_IRQRESTORE if !PREEMPT - select ARCH_INLINE_WRITE_LOCK if !PREEMPT - select ARCH_INLINE_WRITE_LOCK_BH if !PREEMPT - select ARCH_INLINE_WRITE_LOCK_IRQ if !PREEMPT - select ARCH_INLINE_WRITE_LOCK_IRQSAVE if !PREEMPT - select ARCH_INLINE_WRITE_UNLOCK if !PREEMPT - select ARCH_INLINE_WRITE_UNLOCK_BH if !PREEMPT - select ARCH_INLINE_WRITE_UNLOCK_IRQ if !PREEMPT - select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE if !PREEMPT - select ARCH_INLINE_SPIN_TRYLOCK if !PREEMPT - select ARCH_INLINE_SPIN_TRYLOCK_BH if !PREEMPT - select ARCH_INLINE_SPIN_LOCK if !PREEMPT - select ARCH_INLINE_SPIN_LOCK_BH if !PREEMPT - select ARCH_INLINE_SPIN_LOCK_IRQ if !PREEMPT - select ARCH_INLINE_SPIN_LOCK_IRQSAVE if !PREEMPT - select ARCH_INLINE_SPIN_UNLOCK if !PREEMPT - select ARCH_INLINE_SPIN_UNLOCK_BH if !PREEMPT - select ARCH_INLINE_SPIN_UNLOCK_IRQ if !PREEMPT - select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE if !PREEMPT + select ARCH_INLINE_READ_LOCK if !PREEMPTION + select ARCH_INLINE_READ_LOCK_BH if !PREEMPTION + select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPTION + select ARCH_INLINE_READ_LOCK_IRQSAVE if !PREEMPTION + select ARCH_INLINE_READ_UNLOCK if !PREEMPTION + select ARCH_INLINE_READ_UNLOCK_BH if !PREEMPTION + select ARCH_INLINE_READ_UNLOCK_IRQ if !PREEMPTION + select ARCH_INLINE_READ_UNLOCK_IRQRESTORE if !PREEMPTION + select ARCH_INLINE_WRITE_LOCK if !PREEMPTION + select ARCH_INLINE_WRITE_LOCK_BH if !PREEMPTION + select ARCH_INLINE_WRITE_LOCK_IRQ if !PREEMPTION + select ARCH_INLINE_WRITE_LOCK_IRQSAVE if !PREEMPTION + select ARCH_INLINE_WRITE_UNLOCK if !PREEMPTION + select ARCH_INLINE_WRITE_UNLOCK_BH if !PREEMPTION + select ARCH_INLINE_WRITE_UNLOCK_IRQ if !PREEMPTION + select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE if !PREEMPTION + select ARCH_INLINE_SPIN_TRYLOCK if !PREEMPTION + select ARCH_INLINE_SPIN_TRYLOCK_BH if !PREEMPTION + select ARCH_INLINE_SPIN_LOCK if !PREEMPTION + select ARCH_INLINE_SPIN_LOCK_BH if !PREEMPTION + select ARCH_INLINE_SPIN_LOCK_IRQ if !PREEMPTION + select ARCH_INLINE_SPIN_LOCK_IRQSAVE if !PREEMPTION + select ARCH_INLINE_SPIN_UNLOCK if !PREEMPTION + select ARCH_INLINE_SPIN_UNLOCK_BH if !PREEMPTION + select ARCH_INLINE_SPIN_UNLOCK_IRQ if !PREEMPTION + select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE if !PREEMPTION select ARCH_KEEP_MEMBLOCK select ARCH_USE_CMPXCHG_LOCKREF select ARCH_USE_QUEUED_RWLOCKS
arch/arm64/crypto/sha256-glue.c +1 -1
@@ -97,7 +97,7 @@ static int sha256_update_neon(struct shash_desc *desc, const u8 *data,* input when running on a preemptible kernel, but process the * data block by block instead. */ -if (IS_ENABLED (CONFIG_PREEMPT ) && +if (IS_ENABLED (CONFIG_PREEMPTION ) && chunk + sctx->count %SHA256_BLOCK_SIZE >SHA256_BLOCK_SIZE ) chunk =SHA256_BLOCK_SIZE - sctx->count %SHA256_BLOCK_SIZE ;
arch/arm64/include/asm/assembler.h +3 -3
@@ -699,8 +699,8 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU* where <label> is optional, and marks the point where execution will resume * after a yield has been performed. If omitted, execution resumes right after * the endif_yield_neon invocation. Note that the entire sequence, including -* the provided patchup code, will be omitted from the image if CONFIG_PREEMPT -* is not defined. +* the provided patchup code, will be omitted from the image if +* CONFIG_PREEMPTION is not defined. * * As a convenience, in the case where no patchup code is required, the above * sequence may be abbreviated to
@@ -728,7 +728,7 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU .endm .macro if_will_cond_yield_neon -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION get_current_task x0 ldr x0, [x0, #TSK_TI_PREEMPT] sub x0, x0, #PREEMPT_DISABLE_OFFSET
arch/arm64/include/asm/preempt.h +2 -2
@@ -79,11 +79,11 @@ static inline bool should_resched(int preempt_offset) return pc == preempt_offset; } -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION void preempt_schedule (void );#define __preempt_schedule () preempt_schedule()void preempt_schedule_notrace (void );#define __preempt_schedule_notrace () preempt_schedule_notrace() -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ #endif /* __ASM_PREEMPT_H */
arch/arm64/kernel/entry.S +1 -1
@@ -604,7 +604,7 @@ el1_irq: irq_handler -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION ldr x24, [tsk, #TSK_TI_PREEMPT] // get preempt count alternative_if ARM64_HAS_IRQ_PRIO_MASKING /*
arch/arm64/kernel/traps.c +3 -0
@@ -144,9 +144,12 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)#ifdef CONFIG_PREEMPT #define S_PREEMPT " PREEMPT" +#elif defined(CONFIG_PREEMPT_RT ) +#define S_PREEMPT " PREEMPT_RT"#else #define S_PREEMPT ""#endif +#define S_SMP " SMP"static int __die (const char *str,int err,struct pt_regs *regs)
PATCH 3/34 powerpc: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION. Add PREEMPT_RT output in __die().
--- arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/entry_32.S | 4 ++-- arch/powerpc/kernel/entry_64.S | 4 ++-- arch/powerpc/kernel/traps.c | 7 ++++++- 4 files changed, 11 insertions(+), 6 deletions(-)
arch/powerpc/Kconfig +1 -1
@@ -106,7 +106,7 @@ config LOCKDEP_SUPPORT config GENERIC_LOCKBREAK bool default y - depends on SMP && PREEMPT + depends on SMP && PREEMPTION config GENERIC_HWEIGHT bool
arch/powerpc/kernel/entry_32.S +2 -2
@@ -897,7 +897,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */ bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* check current_thread_info->preempt_count */ lwz r0,TI_PREEMPT(r2) cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
@@ -921,7 +921,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */ */ bl trace_hardirqs_on #endif -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ restore_kuap: kuap_restore r1, r2, r9, r10, r0
arch/powerpc/kernel/entry_64.S +2 -2
@@ -840,7 +840,7 @@ _GLOBAL(ret_from_except_lite) bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* Check if we need to preempt */ andi. r0,r4,_TIF_NEED_RESCHED beq+ restore
@@ -871,7 +871,7 @@ _GLOBAL(ret_from_except_lite) li r10,MSR_RI mtmsrd r10,1 /* Update machine state */ #endif /* CONFIG_PPC_BOOK3E */ -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ .globl fast_exc_return_irq fast_exc_return_irq:
arch/powerpc/kernel/traps.c +6 -1
@@ -252,14 +252,19 @@ NOKPROBE_SYMBOL(oops_end);static int __die (const char *str,struct pt_regs *regs,long err) { +const char *pr ="" ; +printk ("Oops: %s, sig: %ld [#%d]\n" , str, err, ++die_counter); +if (IS_ENABLED (CONFIG_PREEMPTION )) + pr =IS_ENABLED (CONFIG_PREEMPT_RT ) ?" PREEMPT_RT" :" PREEMPT" ; + printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s%s %s\n", IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE", PAGE_SIZE / 1024, early_radix_enabled() ? " MMU=Radix" : "", early_mmu_has_feature(MMU_FTR_HPTE_TABLE) ? " MMU=Hash" : "", - IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "", + pr, IS_ENABLED(CONFIG_SMP) ? " SMP" : "", IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "", debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",
Signature · 1 line
2.23.0
Re: [PATCH 03/34] powerpc: Use CONFIG_PREEMPTION
Le 15/10/2019 à 21:17, Sebastian Andrzej Siewior a écrit :
Quoted 8 lines
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Switch the entry code over to use
CONFIG_PREEMPTION. AddPREEMPT_RToutput in__die().
powerpc doesn't select ARCH_SUPPORTS_RT, so this change is useless as CONFIG_PREEMPT_RT cannot be selected.
Quoted 77 lines
Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Michael Ellerman <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>[bigeasy: +traps.c, Kconfig]Signed-off-by Sebastian Andrzej Siewior <[email protected]>--- arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/entry_32.S | 4 ++-- arch/powerpc/kernel/entry_64.S | 4 ++-- arch/powerpc/kernel/traps.c | 7 ++++++- 4 files changed, 11 insertions(+), 6 deletions(-)arch/powerpc/Kconfig +1
-1@@ -106,7 +106,7 @@ config LOCKDEP_SUPPORT config GENERIC_LOCKBREAK bool default y - depends on SMP && PREEMPT + depends on SMP && PREEMPTION config GENERIC_HWEIGHT boolarch/powerpc/kernel/entry_32.S +2
-2@@ -897,7 +897,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */ bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* check current_thread_info->preempt_count */ lwz r0,TI_PREEMPT(r2) cmpwi 0,r0,0 /* if non-zero, just restore regs and return */@@ -921,7 +921,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */ */ bl trace_hardirqs_on #endif -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ restore_kuap: kuap_restore r1, r2, r9, r10, r0arch/powerpc/kernel/entry_64.S +2
-2@@ -840,7 +840,7 @@ _GLOBAL(ret_from_except_lite) bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* Check if we need to preempt */ andi. r0,r4,_TIF_NEED_RESCHED beq+ restore@@ -871,7 +871,7 @@ _GLOBAL(ret_from_except_lite) li r10,MSR_RI mtmsrd r10,1 /* Update machine state */ #endif /* CONFIG_PPC_BOOK3E */ -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ .globl fast_exc_return_irq fast_exc_return_irq:arch/powerpc/kernel/traps.c +0
-0
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 256
Quoted 5 lines
arch/powerpc/kernel/traps.c +2
-0@@ -252,14 +252,19 @@ NOKPROBE_SYMBOL(oops_end);static int __die (const char *str,struct pt_regs *regs,long err) { +const char *pr ="" ; +
Please follow the same approach as already existing. Don't add a local var for that.
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 261
Quoted 5 lines
arch/powerpc/kernel/traps.c +3
-0printk ("Oops: %s, sig: %ld [#%d]\n" , str, err, ++die_counter); +if (IS_ENABLED (CONFIG_PREEMPTION )) + pr =IS_ENABLED (CONFIG_PREEMPT_RT ) ?" PREEMPT_RT" :" PREEMPT" ; +
drop
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 262
Quoted 1 line
arch/powerpc/kernel/traps.c +0
-0printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s%s %s\n",
Add one %s
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 262
Quoted 5 lines
arch/powerpc/kernel/traps.c +0
-1IS_ENABLED (CONFIG_CPU_LITTLE_ENDIAN ) ?"LE" :"BE" ,PAGE_SIZE /1024 ,early_radix_enabled () ?" MMU=Radix" :"" , early_mmu_has_feature(MMU_FTR_HPTE_TABLE) ? " MMU=Hash" : "", - IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",
Replace by: IS_ENABLED(CONFIG_PREEMPTION) ? " PREEMPT" : ""
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 267
Quoted 1 line
arch/powerpc/kernel/traps.c +1
-0+ pr,
add something like: IS_ENABLED(CONFIG_PREEMPT_RT) ? "_RT" : ""
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 270
Quoted 4 lines
arch/powerpc/kernel/traps.c +0
-0IS_ENABLED (CONFIG_SMP ) ?" SMP" :"" ,IS_ENABLED (CONFIG_SMP ) ? (" NR_CPUS=" __stringify(NR_CPUS )) :"" , debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",
Christophe
Re: [PATCH 03/34] powerpc: Use CONFIG_PREEMPTION
Quoted 9 lines · Christophe Leroy
Le 15/10/2019 à 21:17, Sebastian Andrzej Siewior a écrit :
Quoted 6 lines
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.
Quoted 5 lines
Quoted 2 lines
Switch the entry code over to use
CONFIG_PREEMPTION. AddPREEMPT_RToutput in__die().powerpc doesn't select
ARCH_SUPPORTS_RT, so this change is useless asCONFIG_PREEMPT_RTcannot be selected.
No it is not. It makes it possible for PowerPC to select it one day and I have patches for it today. Also, if other ARCH copies code from PowerPC it will copy the correct thing (as in distinguish between the flavour PREEMPT and the functionality PREEMPTION).
Quoted 4 lines
Quoted 4 lines
arch/powerpc/kernel/traps.c +0
-0
Quoted 8 lines
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 255
Quoted 5 lines
arch/powerpc/kernel/traps.c +2
-0@@ -252,14 +252,19 @@ NOKPROBE_SYMBOL(oops_end);static int __die (const char *str,struct pt_regs *regs,long err) { +const char *pr ="" ; +Please follow the same approach as already existing. Don't add a local var for that.
I would leave it to the maintainer to comment on that and decide which one they want. My eyes find it more readable and the compiles does not create more code.
Quoted 19 lines
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 261
Quoted 4 lines
arch/powerpc/kernel/traps.c +3
-0printk ("Oops: %s, sig: %ld [#%d]\n" , str, err, ++die_counter); +if (IS_ENABLED (CONFIG_PREEMPTION )) + pr =IS_ENABLED (CONFIG_PREEMPT_RT ) ?" PREEMPT_RT" :" PREEMPT" ; +drop
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 262
Quoted 1 line
arch/powerpc/kernel/traps.c +0
-0printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s%s %s\n",Add one %s
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 262
Quoted 5 lines
arch/powerpc/kernel/traps.c +0
-1IS_ENABLED (CONFIG_CPU_LITTLE_ENDIAN ) ?"LE" :"BE" ,PAGE_SIZE /1024 ,early_radix_enabled () ?" MMU=Radix" :"" , early_mmu_has_feature(MMU_FTR_HPTE_TABLE) ? " MMU=Hash" : "", - IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",Replace by:
IS_ENABLED(CONFIG_PREEMPTION)? " PREEMPT" : ""
Quoted 3 lines
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 267
Quoted 1 line
arch/powerpc/kernel/traps.c +1
-0+ pr,add something like:
IS_ENABLED(CONFIG_PREEMPT_RT)? "_RT" : ""
this on the other hand will create more code which is not strictly required.
Quoted 6 lines
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end);
Quoted 4 lines
arch/powerpc/kernel/traps.c +0
-0IS_ENABLED (CONFIG_SMP ) ?" SMP" :"" ,IS_ENABLED (CONFIG_SMP ) ? (" NR_CPUS=" __stringify(NR_CPUS )) :"" , debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",Christophe
Sebastian
Michael Ellerman
reviewerRe: [PATCH 03/34] powerpc: Use CONFIG_PREEMPTION
In reply to Christophe LeroyQuoted 7 lines · Christophe Leroy
Le 15/10/2019 à 21:17, Sebastian Andrzej Siewior a écrit :
Quoted 6 lines
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.
Quoted 5 lines
Quoted 2 lines
Switch the entry code over to use
CONFIG_PREEMPTION. AddPREEMPT_RToutput in__die().powerpc doesn't select
ARCH_SUPPORTS_RT, so this change is useless asCONFIG_PREEMPT_RTcannot be selected.
Yeah I don't think there's any point adding the "_RT" to the __die() output until/if we ever start supporting PREEMPT_RT.
cheers
Quoted 101 lines
Quoted 62 lines
arch/powerpc/Kconfig +1
-1@@ -106,7 +106,7 @@ config LOCKDEP_SUPPORT config GENERIC_LOCKBREAK bool default y - depends on SMP && PREEMPT + depends on SMP && PREEMPTION config GENERIC_HWEIGHT boolarch/powerpc/kernel/entry_32.S +2
-2@@ -897,7 +897,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */ bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* check current_thread_info->preempt_count */ lwz r0,TI_PREEMPT(r2) cmpwi 0,r0,0 /* if non-zero, just restore regs and return */@@ -921,7 +921,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */ */ bl trace_hardirqs_on #endif -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ restore_kuap: kuap_restore r1, r2, r9, r10, r0arch/powerpc/kernel/entry_64.S +2
-2@@ -840,7 +840,7 @@ _GLOBAL(ret_from_except_lite) bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* Check if we need to preempt */ andi. r0,r4,_TIF_NEED_RESCHED beq+ restore@@ -871,7 +871,7 @@ _GLOBAL(ret_from_except_lite) li r10,MSR_RI mtmsrd r10,1 /* Update machine state */ #endif /* CONFIG_PPC_BOOK3E */ -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ .globl fast_exc_return_irq fast_exc_return_irq:arch/powerpc/kernel/traps.c +0
-0arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 256
Quoted 5 lines
arch/powerpc/kernel/traps.c +2
-0@@ -252,14 +252,19 @@ NOKPROBE_SYMBOL(oops_end);static int __die (const char *str,struct pt_regs *regs,long err) { +const char *pr ="" ; +Please follow the same approach as already existing. Don't add a local var for that.
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 261
Quoted 5 lines
arch/powerpc/kernel/traps.c +3
-0printk ("Oops: %s, sig: %ld [#%d]\n" , str, err, ++die_counter); +if (IS_ENABLED (CONFIG_PREEMPTION )) + pr =IS_ENABLED (CONFIG_PREEMPT_RT ) ?" PREEMPT_RT" :" PREEMPT" ; +drop
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 262
Quoted 1 line
arch/powerpc/kernel/traps.c +0
-0printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s%s %s\n",Add one %s
arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 262
Quoted 5 lines
arch/powerpc/kernel/traps.c +0
-1IS_ENABLED (CONFIG_CPU_LITTLE_ENDIAN ) ?"LE" :"BE" ,PAGE_SIZE /1024 ,early_radix_enabled () ?" MMU=Radix" :"" , early_mmu_has_feature(MMU_FTR_HPTE_TABLE) ? " MMU=Hash" : "", - IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",Replace by:
IS_ENABLED(CONFIG_PREEMPTION)? " PREEMPT" : ""arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 267
Quoted 1 line
arch/powerpc/kernel/traps.c +1
-0+ pr,add something like:
IS_ENABLED(CONFIG_PREEMPT_RT)? "_RT" : ""arch/powerpc/kernel/traps.c NOKPROBE_SYMBOL(oops_end); · line 270
Quoted 4 lines
arch/powerpc/kernel/traps.c +0
-0IS_ENABLED (CONFIG_SMP ) ?" SMP" :"" ,IS_ENABLED (CONFIG_SMP ) ? (" NR_CPUS=" __stringify(NR_CPUS )) :"" , debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",Christophe
Re: [PATCH 03/34] powerpc: Use CONFIG_PREEMPTION
Quoted 8 lines · Michael Ellerman
Quoted 7 lines · Christophe Leroy
Le 15/10/2019 à 21:17, Sebastian Andrzej Siewior a écrit :
Quoted 6 lines
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Switch the entry code over to use
CONFIG_PREEMPTION. AddPREEMPT_RToutput in__die().powerpc doesn't select
ARCH_SUPPORTS_RT, so this change is useless asCONFIG_PREEMPT_RTcannot be selected.Yeah I don't think there's any point adding the "
_RT" to the__die()output until/if we ever start supportingPREEMPT_RT.
so jut the PREEMPT -> PREEMPTION bits then?
Quoted 1 line
cheers
Sebastian
PATCH v2 3/34 powerpc: Use CONFIG_PREEMPTION
In reply to Michael EllermanFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION. Add PREEMPT_RT output in __die().
---
v1…v2: Remove the changes to die.c
arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/entry_32.S | 4 ++-- arch/powerpc/kernel/entry_64.S | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/Kconfig +1 -1
@@ -106,7 +106,7 @@ config LOCKDEP_SUPPORT config GENERIC_LOCKBREAK bool default y - depends on SMP && PREEMPT + depends on SMP && PREEMPTION config GENERIC_HWEIGHT bool
arch/powerpc/kernel/entry_32.S +2 -2
@@ -897,7 +897,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */ bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* check current_thread_info->preempt_count */ lwz r0,TI_PREEMPT(r2) cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
@@ -921,7 +921,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */ */ bl trace_hardirqs_on #endif -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ restore_kuap: kuap_restore r1, r2, r9, r10, r0
arch/powerpc/kernel/entry_64.S +2 -2
@@ -840,7 +840,7 @@ _GLOBAL(ret_from_except_lite) bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* Check if we need to preempt */ andi. r0,r4,_TIF_NEED_RESCHED beq+ restore
@@ -871,7 +871,7 @@ _GLOBAL(ret_from_except_lite) li r10,MSR_RI mtmsrd r10,1 /* Update machine state */ #endif /* CONFIG_PPC_BOOK3E */ -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ .globl fast_exc_return_irq fast_exc_return_irq:
Signature · 1 line
2.23.0
PATCH v3 3/34 powerpc: Use CONFIG_PREEMPTION
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
---
v2…v3: Don't mention die.c changes in the description. v1…v2: Remove the changes to die.c.
arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/entry_32.S | 4 ++-- arch/powerpc/kernel/entry_64.S | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/Kconfig +1 -1
@@ -106,7 +106,7 @@ config LOCKDEP_SUPPORT config GENERIC_LOCKBREAK bool default y - depends on SMP && PREEMPT + depends on SMP && PREEMPTION config GENERIC_HWEIGHT bool
arch/powerpc/kernel/entry_32.S +2 -2
@@ -897,7 +897,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */ bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* check current_thread_info->preempt_count */ lwz r0,TI_PREEMPT(r2) cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
@@ -921,7 +921,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */ */ bl trace_hardirqs_on #endif -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ restore_kuap: kuap_restore r1, r2, r9, r10, r0
arch/powerpc/kernel/entry_64.S +2 -2
@@ -840,7 +840,7 @@ _GLOBAL(ret_from_except_lite) bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* Check if we need to preempt */ andi. r0,r4,_TIF_NEED_RESCHED beq+ restore
@@ -871,7 +871,7 @@ _GLOBAL(ret_from_except_lite) li r10,MSR_RI mtmsrd r10,1 /* Update machine state */ #endif /* CONFIG_PPC_BOOK3E */ -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ .globl fast_exc_return_irq fast_exc_return_irq:
Signature · 1 line
2.23.0
Re: [PATCH 03/34 v3] powerpc: Use CONFIG_PREEMPTION
Quoted 15 lines · Sebastian Andrzej Siewior
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Switch the entry code over to use
CONFIG_PREEMPTION.Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Michael Ellerman <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>[bigeasy: +Kconfig]Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Quoted 3 lines
---
v2…v3: Don't mentiondie.cchanges in the description. v1…v2: Remove the changes todie.c.
cheers
[tip: sched/urgent] sched/rt, powerpc: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorThe following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: fdc5569eaba997852e0bfb57d11af496e4c1fa9a Gitweb: https://git.kernel.org/tip/fdc5569eaba997852e0bfb57d11af496e4c1fa9a Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 24 Oct 2019 18:04:58 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:32 +01:00
sched/rt, powerpc: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
[bigeasy: +Kconfig]
--- arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/entry_32.S | 4 ++-- arch/powerpc/kernel/entry_64.S | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/Kconfig +1 -1
@@ -106,7 +106,7 @@ config LOCKDEP_SUPPORT config GENERIC_LOCKBREAK bool default y - depends on SMP && PREEMPT + depends on SMP && PREEMPTION config GENERIC_HWEIGHT bool
arch/powerpc/kernel/entry_32.S +2 -2
@@ -897,7 +897,7 @@ resume_kernel: bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* check current_thread_info->preempt_count */ lwz r0,TI_PREEMPT(r2) cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
@@ -921,7 +921,7 @@ resume_kernel: */ bl trace_hardirqs_on #endif -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ restore_kuap: kuap_restore r1, r2, r9, r10, r0
arch/powerpc/kernel/entry_64.S +2 -2
@@ -846,7 +846,7 @@ resume_kernel: bne- 0b 1: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* Check if we need to preempt */ andi. r0,r4,_TIF_NEED_RESCHED beq+ restore
@@ -877,7 +877,7 @@ resume_kernel: li r10,MSR_RI mtmsrd r10,1 /* Update machine state */ #endif /* CONFIG_PPC_BOOK3E */ -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ .globl fast_exc_return_irq fast_exc_return_irq:
PATCH 4/34 ARC: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/arc/kernel/entry.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arc/kernel/entry.S +3 -3
@@ -337,11 +337,11 @@ ENTRY(ret_from_exception) resume_kernel_mode: ; Disable Interrupts from this point on - ; CONFIG_PREEMPT: This is a must for preempt_schedule_irq() - ; !CONFIG_PREEMPT: To ensure restore_regs is intr safe + ; CONFIG_PREEMPTION: This is a must for preempt_schedule_irq() + ; !CONFIG_PREEMPTION: To ensure restore_regs is intr safe IRQ_DISABLE r9 -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION ; Can't preempt if preemption disabled GET_CURR_THR_INFO_FROM_SP r10
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, ARC: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 916591722c7543570843b54d5896121146b498f5 Gitweb: https://git.kernel.org/tip/916591722c7543570843b54d5896121146b498f5 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:17:51 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:32 +01:00
sched/rt, ARC: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/arc/kernel/entry.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arc/kernel/entry.S +3 -3
@@ -337,11 +337,11 @@ resume_user_mode_begin: resume_kernel_mode: ; Disable Interrupts from this point on - ; CONFIG_PREEMPT: This is a must for preempt_schedule_irq() - ; !CONFIG_PREEMPT: To ensure restore_regs is intr safe + ; CONFIG_PREEMPTION: This is a must for preempt_schedule_irq() + ; !CONFIG_PREEMPTION: To ensure restore_regs is intr safe IRQ_DISABLE r9 -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION ; Can't preempt if preemption disabled GET_CURR_THR_INFO_FROM_SP r10
PATCH 5/34 c6x: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/c6x/kernel/entry.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/c6x/kernel/entry.S +4 -4
@@ -18,7 +18,7 @@ #define DP B14 #define SP B15 -#ifndef CONFIG_PREEMPT +#ifndef CONFIG_PREEMPTION #define resume_kernel restore_all #endif
@@ -287,7 +287,7 @@ ;; is a little bit different ;; ENTRY(ret_from_exception) -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION MASK_INT B2 #endif
@@ -557,7 +557,7 @@ ENDPROC(_nmi_handler) ;; ;; Jump to schedule() then return to ret_from_isr ;; -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION resume_kernel: GET_THREAD_INFO A12 LDW .D1T1 *+A12(THREAD_INFO_PREEMPT_COUNT),A1
@@ -582,7 +582,7 @@ ENDPROC(_nmi_handler) B .S2 preempt_schedule_irq #endif ADDKPC .S2 preempt_schedule,B3,4 -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ ENTRY(enable_exception) DINT
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, c6x: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 51466979c754d11e1e8da0e46a66218ffc7226ee Gitweb: https://git.kernel.org/tip/51466979c754d11e1e8da0e46a66218ffc7226ee Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:17:52 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:32 +01:00
sched/rt, c6x: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/c6x/kernel/entry.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/c6x/kernel/entry.S +4 -4
@@ -18,7 +18,7 @@ #define DP B14 #define SP B15 -#ifndef CONFIG_PREEMPT +#ifndef CONFIG_PREEMPTION #define resume_kernel restore_all #endif
@@ -287,7 +287,7 @@ work_notifysig: ;; is a little bit different ;; ENTRY(ret_from_exception) -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION MASK_INT B2 #endif
@@ -557,7 +557,7 @@ ENDPROC(_nmi_handler) ;; ;; Jump to schedule() then return to ret_from_isr ;; -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION resume_kernel: GET_THREAD_INFO A12 LDW .D1T1 *+A12(THREAD_INFO_PREEMPT_COUNT),A1
@@ -582,7 +582,7 @@ preempt_schedule: B .S2 preempt_schedule_irq #endif ADDKPC .S2 preempt_schedule,B3,4 -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ ENTRY(enable_exception) DINT
PATCH 6/34 csky: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/csky/kernel/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/csky/kernel/entry.S +2 -2
@@ -277,7 +277,7 @@ ENTRY(csky_irq) zero_fp psrset ee -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION mov r9, sp /* Get current stack pointer */ bmaski r10, THREAD_SHIFT andn r9, r10 /* Get thread_info */
@@ -294,7 +294,7 @@ ENTRY(csky_irq) mov a0, sp jbsr csky_do_IRQ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION subi r12, 1 stw r12, (r9, TINFO_PREEMPT) cmpnei r12, 0
Signature · 1 line
2.23.0
Guo Ren
maintainerRe: [PATCH 06/34] csky: Use CONFIG_PREEMPTION
Could CONFIG_PREEMPT_RT be supported in csky ? Any arch backend porting ?
Quoted 41 lines · Sebastian Andrzej Siewior
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Switch the entry code over to use
CONFIG_PREEMPTION.Cc Guo Ren <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>--- arch/csky/kernel/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/csky/kernel/entry.S +2
-3@@ -277,7 +277,7 @@ ENTRY(csky_irq) zero_fp psrset ee -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION mov r9, sp /* Get current stack pointer */ bmaski r10, THREAD_SHIFT andn r9, r10 /* Get thread_info */@@ -294,7 +294,7 @@ ENTRY(csky_irq) mov a0, sp jbsr csky_do_IRQ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION subi r12, 1 stw r12, (r9, TINFO_PREEMPT) cmpnei r12, 0 --2.23.0
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Re: [PATCH 06/34] csky: Use CONFIG_PREEMPTION
Quoted 1 line · Guo Ren
Could
CONFIG_PREEMPT_RTbe supported in csky ? Any arch backend porting ?
It could. HIGH_RES_TIMERS is useful and IRQ_FORCED_THREADING is required. You already have PREEMPT(ION) which is good. Then you would have to try and my guess would be that some of spinlock_t vs raw_spinlock_t could require changes but we should have lockdep support for that which would make things easier.
Sebastian
Re: [PATCH 06/34] csky: Use CONFIG_PREEMPTION
Thx for explanation.
Quoted 11 lines · Sebastian Andrzej Siewior
Quoted 1 line · Guo Ren
Could
CONFIG_PREEMPT_RTbe supported in csky ? Any arch backend porting ?It could.
HIGH_RES_TIMERSis useful andIRQ_FORCED_THREADINGis required. You already have PREEMPT(ION) which is good. Then you would have to try and my guess would be that some ofspinlock_tvsraw_spinlock_tcould require changes but we should have lockdep support for that which would make things easier.Sebastian
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
[tip: sched/urgent] sched/rt, csky: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorThe following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 365a795a13326df11a5114d2b6067ca2a6d53364 Gitweb: https://git.kernel.org/tip/365a795a13326df11a5114d2b6067ca2a6d53364 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:17:53 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:33 +01:00
sched/rt, csky: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/csky/kernel/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/csky/kernel/entry.S +2 -2
@@ -277,7 +277,7 @@ ENTRY(csky_irq) zero_fp psrset ee -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION mov r9, sp /* Get current stack pointer */ bmaski r10, THREAD_SHIFT andn r9, r10 /* Get thread_info */
@@ -294,7 +294,7 @@ ENTRY(csky_irq) mov a0, sp jbsr csky_do_IRQ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION subi r12, 1 stw r12, (r9, TINFO_PREEMPT) cmpnei r12, 0
PATCH 7/34 h8300: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/h8300/kernel/entry.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/h8300/kernel/entry.S +3 -3
@@ -284,12 +284,12 @@ INTERRUPTS = 128 mov.l er0,@(LER0:16,sp) bra resume_userspace -#if !defined(CONFIG_PREEMPT) +#if !defined(CONFIG_PREEMPTION) #define resume_kernel restore_all #endif ret_from_exception: -#if defined(CONFIG_PREEMPT) +#if defined(CONFIG_PREEMPTION) orc #0xc0,ccr #endif ret_from_interrupt:
@@ -319,7 +319,7 @@ INTERRUPTS = 128 restore_all: RESTORE_ALL /* Does RTE */ -#if defined(CONFIG_PREEMPT) +#if defined(CONFIG_PREEMPTION) resume_kernel: mov.l @(TI_PRE_COUNT:16,er4),er0 bne restore_all:8
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, h8300: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 7462b759b1c2fc3848fe54f71bf553f8f4e6d323 Gitweb: https://git.kernel.org/tip/7462b759b1c2fc3848fe54f71bf553f8f4e6d323 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:17:54 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:33 +01:00
sched/rt, h8300: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/h8300/kernel/entry.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/h8300/kernel/entry.S +3 -3
@@ -284,12 +284,12 @@ badsys: mov.l er0,@(LER0:16,sp) bra resume_userspace -#if !defined(CONFIG_PREEMPT) +#if !defined(CONFIG_PREEMPTION) #define resume_kernel restore_all #endif ret_from_exception: -#if defined(CONFIG_PREEMPT) +#if defined(CONFIG_PREEMPTION) orc #0xc0,ccr #endif ret_from_interrupt:
@@ -319,7 +319,7 @@ work_resched: restore_all: RESTORE_ALL /* Does RTE */ -#if defined(CONFIG_PREEMPT) +#if defined(CONFIG_PREEMPTION) resume_kernel: mov.l @(TI_PRE_COUNT:16,er4),er0 bne restore_all:8
PATCH 8/34 hexagon: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/hexagon/kernel/vm_entry.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/hexagon/kernel/vm_entry.S +3 -3
@@ -265,12 +265,12 @@ * should be in the designated register (usually R19) * * If we were in kernel mode, we don't need to check scheduler - * or signals if CONFIG_PREEMPT is not set. If set, then it has + * or signals if CONFIG_PREEMPTION is not set. If set, then it has * to jump to a need_resched kind of block. - * BTW, CONFIG_PREEMPT is not supported yet. + * BTW, CONFIG_PREEMPTION is not supported yet. */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION R0 = #VM_INT_DISABLE trap1(#HVM_TRAP1_VMSETIE) #endif
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, hexagon: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 143cd41f50e0c074fbdb06c3ab75a45e3076b5a6 Gitweb: https://git.kernel.org/tip/143cd41f50e0c074fbdb06c3ab75a45e3076b5a6 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:17:55 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:33 +01:00
sched/rt, hexagon: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/hexagon/kernel/vm_entry.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/hexagon/kernel/vm_entry.S +3 -3
@@ -265,12 +265,12 @@ event_dispatch: * should be in the designated register (usually R19) * * If we were in kernel mode, we don't need to check scheduler - * or signals if CONFIG_PREEMPT is not set. If set, then it has + * or signals if CONFIG_PREEMPTION is not set. If set, then it has * to jump to a need_resched kind of block. - * BTW, CONFIG_PREEMPT is not supported yet. + * BTW, CONFIG_PREEMPTION is not supported yet. */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION R0 = #VM_INT_DISABLE trap1(#HVM_TRAP1_VMSETIE) #endif
PATCH 9/34 ia64: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code and kprobes over to use CONFIG_PREEMPTION.
--- arch/ia64/kernel/entry.S | 12 ++++++------ arch/ia64/kernel/kprobes.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
arch/ia64/kernel/entry.S +6 -6
@@ -670,12 +670,12 @@ GLOBAL_ENTRY(ia64_leave_syscall) * * p6 controls whether current_thread_info()->flags needs to be check for * extra work. We always check for extra work when returning to user-level. - * With CONFIG_PREEMPT, we also check for extra work when the preempt_count + * With CONFIG_PREEMPTION, we also check for extra work when the preempt_count * is 0. After extra work processing has been completed, execution * resumes at ia64_work_processed_syscall with p6 set to 1 if the extra-work-check * needs to be redone. */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION RSM_PSR_I(p0, r2, r18) // disable interrupts cmp.eq pLvSys,p0=r0,r0 // pLvSys=1: leave from syscall (pKStk) adds r20=TI_PRE_COUNT+IA64_TASK_SIZE,r13
@@ -685,7 +685,7 @@ GLOBAL_ENTRY(ia64_leave_syscall) (pUStk) mov r21=0 // r21 <- 0 ;; cmp.eq p6,p0=r21,r0 // p6 <- pUStk || (preempt_count == 0) -#else /* !CONFIG_PREEMPT */ +#else /* !CONFIG_PREEMPTION */ RSM_PSR_I(pUStk, r2, r18) cmp.eq pLvSys,p0=r0,r0 // pLvSys=1: leave from syscall (pUStk) cmp.eq.unc p6,p0=r0,r0 // p6 <- pUStk
@@ -814,12 +814,12 @@ GLOBAL_ENTRY(ia64_leave_kernel) * * p6 controls whether current_thread_info()->flags needs to be check for * extra work. We always check for extra work when returning to user-level. - * With CONFIG_PREEMPT, we also check for extra work when the preempt_count + * With CONFIG_PREEMPTION, we also check for extra work when the preempt_count * is 0. After extra work processing has been completed, execution * resumes at .work_processed_syscall with p6 set to 1 if the extra-work-check * needs to be redone. */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION RSM_PSR_I(p0, r17, r31) // disable interrupts cmp.eq p0,pLvSys=r0,r0 // pLvSys=0: leave from kernel (pKStk) adds r20=TI_PRE_COUNT+IA64_TASK_SIZE,r13
@@ -1120,7 +1120,7 @@ GLOBAL_ENTRY(ia64_leave_kernel) /* * On entry: - * r20 = ¤t->thread_info->pre_count (if CONFIG_PREEMPT) + * r20 = ¤t->thread_info->pre_count (if CONFIG_PREEMPTION) * r31 = current->thread_info->flags * On exit: * p6 = TRUE if work-pending-check needs to be redone
arch/ia64/kernel/kprobes.c +1 -1
@@ -841,7 +841,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args)return 1 ; } -#if !defined(CONFIG_PREEMPT ) +#if !defined(CONFIG_PREEMPTION )if (p->ainsn.inst_flag ==INST_FLAG_BOOSTABLE && !p->post_handler) {/* Boost up -- we can execute copied instructions directly */ ia64_psr (regs)->ri = p->ainsn.slot;
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, ia64: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: b9b75e53b2fb040bc74a750fb27bbfa80059b3fe Gitweb: https://git.kernel.org/tip/b9b75e53b2fb040bc74a750fb27bbfa80059b3fe Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:17:56 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:33 +01:00
sched/rt, ia64: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code and kprobes over to use CONFIG_PREEMPTION.
--- arch/ia64/kernel/entry.S | 12 ++++++------ arch/ia64/kernel/kprobes.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
arch/ia64/kernel/entry.S +6 -6
@@ -670,12 +670,12 @@ GLOBAL_ENTRY(ia64_leave_syscall) * * p6 controls whether current_thread_info()->flags needs to be check for * extra work. We always check for extra work when returning to user-level. - * With CONFIG_PREEMPT, we also check for extra work when the preempt_count + * With CONFIG_PREEMPTION, we also check for extra work when the preempt_count * is 0. After extra work processing has been completed, execution * resumes at ia64_work_processed_syscall with p6 set to 1 if the extra-work-check * needs to be redone. */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION RSM_PSR_I(p0, r2, r18) // disable interrupts cmp.eq pLvSys,p0=r0,r0 // pLvSys=1: leave from syscall (pKStk) adds r20=TI_PRE_COUNT+IA64_TASK_SIZE,r13
@@ -685,7 +685,7 @@ GLOBAL_ENTRY(ia64_leave_syscall) (pUStk) mov r21=0 // r21 <- 0 ;; cmp.eq p6,p0=r21,r0 // p6 <- pUStk || (preempt_count = 0) -#else /* !CONFIG_PREEMPT */ +#else /* !CONFIG_PREEMPTION */ RSM_PSR_I(pUStk, r2, r18) cmp.eq pLvSys,p0=r0,r0 // pLvSys=1: leave from syscall (pUStk) cmp.eq.unc p6,p0=r0,r0 // p6 <- pUStk
@@ -814,12 +814,12 @@ GLOBAL_ENTRY(ia64_leave_kernel) * * p6 controls whether current_thread_info()->flags needs to be check for * extra work. We always check for extra work when returning to user-level. - * With CONFIG_PREEMPT, we also check for extra work when the preempt_count + * With CONFIG_PREEMPTION, we also check for extra work when the preempt_count * is 0. After extra work processing has been completed, execution * resumes at .work_processed_syscall with p6 set to 1 if the extra-work-check * needs to be redone. */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION RSM_PSR_I(p0, r17, r31) // disable interrupts cmp.eq p0,pLvSys=r0,r0 // pLvSys=0: leave from kernel (pKStk) adds r20=TI_PRE_COUNT+IA64_TASK_SIZE,r13
@@ -1120,7 +1120,7 @@ skip_rbs_switch: /* * On entry: - * r20 = ¤t->thread_info->pre_count (if CONFIG_PREEMPT) + * r20 = ¤t->thread_info->pre_count (if CONFIG_PREEMPTION) * r31 = current->thread_info->flags * On exit: * p6 = TRUE if work-pending-check needs to be redone
arch/ia64/kernel/kprobes.c +1 -1
@@ -841,7 +841,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args)return 1 ; } -#if !defined(CONFIG_PREEMPT ) +#if !defined(CONFIG_PREEMPTION )if (p->ainsn.inst_flag =INST_FLAG_BOOSTABLE && !p->post_handler) {/* Boost up -- we can execute copied instructions directly */ ia64_psr (regs)->ri = p->ainsn.slot;
PATCH 10/34 m68k/coldfire: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/m68k/coldfire/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/coldfire/entry.S +1 -1
@@ -108,7 +108,7 @@ ENTRY(system_call) btst #5,%sp@(PT_OFF_SR) /* check if returning to kernel */ jeq Luser_return /* if so, skip resched, signals */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION movel %sp,%d1 /* get thread_info pointer */ andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ movel %d1,%a0
Signature · 1 line
2.23.0
Re: [PATCH 10/34] m68k/coldfire: Use CONFIG_PREEMPTION
Hi Sebastian,
Quoted 9 lines · Sebastian Andrzej Siewior
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Switch the entry code over to use
CONFIG_PREEMPTION.Cc Greg Ungerer <[email protected]>
Do you want me to take this via the m68knommu git tree? Or are you taking the whole series via some other tree?
Regards
Greg
Quoted 22 lines
Cc Geert Uytterhoeven <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>--- arch/m68k/coldfire/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/m68k/coldfire/entry.S +1
-1@@ -108,7 +108,7 @@ ENTRY(system_call) btst #5,%sp@(PT_OFF_SR) /* check if returning to kernel */ jeq Luser_return /* if so, skip resched, signals */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION movel %sp,%d1 /* get thread_info pointer */ andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ movel %d1,%a0
Re: [PATCH 10/34] m68k/coldfire: Use CONFIG_PREEMPTION
Quoted 1 line · Greg Ungerer
Hi Sebastian,
Hi Greg,
Quoted 7 lines · Sebastian Andrzej Siewior
Quoted 6 lines
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.
Quoted 5 lines
Quoted 3 lines
Switch the entry code over to use
CONFIG_PREEMPTION.Cc Greg Ungerer <[email protected]>Acked-by Greg Ungerer <[email protected]>
Thank you.
Quoted 2 lines
Do you want me to take this via the m68knommu git tree? Or are you taking the whole series via some other tree?
It is up to you. You have all the dependencies so you can either add it to your -next branch or leave it and we will pick it up for you.
Quoted 2 lines
Regards
Greg
Sebastian
Greg Ungerer
maintainerRe: [PATCH 10/34] m68k/coldfire: Use CONFIG_PREEMPTION
Hi Sebastian,
Quoted 17 lines · Sebastian Andrzej Siewior
Quoted 1 line · Greg Ungerer
Hi Sebastian,
Hi Greg,
Quoted 7 lines · Sebastian Andrzej Siewior
Quoted 6 lines
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Quoted 5 lines
Quoted 3 lines
Switch the entry code over to use
CONFIG_PREEMPTION.Cc Greg Ungerer <[email protected]>Acked-by Greg Ungerer <[email protected]>
Quoted 7 lines
Thank you.
Quoted 2 lines
Do you want me to take this via the m68knommu git tree? Or are you taking the whole series via some other tree?
It is up to you. You have all the dependencies so you can either add it to your -next branch or leave it and we will pick it up for you.
Patch added to the m68knommu git tree, for-next branch.
Thanks
Greg
PATCH 11/34 microblaze: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/microblaze/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/microblaze/kernel/entry.S +1 -1
@@ -728,7 +728,7 @@ irq_call:rtbd r0, do_IRQ; bri 6f; /* MS: Return to kernel state. */ 2: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION lwi r11, CURRENT_TASK, TS_THREAD_INFO; /* MS: get preempt_count from thread info */ lwi r5, r11, TI_PREEMPT_COUNT;
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, microblaze: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 18803733bd67b8e8f608a0bbb491e1491dcce01e Gitweb: https://git.kernel.org/tip/18803733bd67b8e8f608a0bbb491e1491dcce01e Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:17:58 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:33 +01:00
sched/rt, microblaze: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/microblaze/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/microblaze/kernel/entry.S +1 -1
@@ -728,7 +728,7 @@ no_intr_resched: bri 6f; /* MS: Return to kernel state. */ 2: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION lwi r11, CURRENT_TASK, TS_THREAD_INFO; /* MS: get preempt_count from thread info */ lwi r5, r11, TI_PREEMPT_COUNT;
PATCH 12/34 MIPS: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code and assmebly macros over to use CONFIG_PREEMPTION.
--- arch/mips/include/asm/asmmacro.h | 4 ++-- arch/mips/kernel/entry.S | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/mips/include/asm/asmmacro.h +2 -2
@@ -63,7 +63,7 @@ .endm .macro local_irq_disable reg=t0 -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION lw \reg, TI_PRE_COUNT($28) addi \reg, \reg, 1 sw \reg, TI_PRE_COUNT($28)
@@ -73,7 +73,7 @@ xori \reg, \reg, 1 mtc0 \reg, CP0_STATUS irq_disable_hazard -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION lw \reg, TI_PRE_COUNT($28) addi \reg, \reg, -1 sw \reg, TI_PRE_COUNT($28)
arch/mips/kernel/entry.S +3 -3
@@ -19,7 +19,7 @@ #include <asm/thread_info.h> #include <asm/war.h> -#ifndef CONFIG_PREEMPT +#ifndef CONFIG_PREEMPTION #define resume_kernel restore_all #else #define __ret_from_irq ret_from_exception
@@ -27,7 +27,7 @@ .text .align 5 -#ifndef CONFIG_PREEMPT +#ifndef CONFIG_PREEMPTION FEXPORT(ret_from_exception) local_irq_disable # preempt stop b __ret_from_irq
@@ -53,7 +53,7 @@ FEXPORT(__ret_from_irq) bnez t0, work_pending j restore_all -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION resume_kernel: local_irq_disable lw t0, TI_PRE_COUNT($28)
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, MIPS: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 098fa51b1d054fbc9ec1286a3c74231aebd6ff15 Gitweb: https://git.kernel.org/tip/098fa51b1d054fbc9ec1286a3c74231aebd6ff15 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:17:59 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:34 +01:00
sched/rt, MIPS: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code and assmebly macros over to use CONFIG_PREEMPTION.
--- arch/mips/include/asm/asmmacro.h | 4 ++-- arch/mips/kernel/entry.S | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/mips/include/asm/asmmacro.h +2 -2
@@ -63,7 +63,7 @@ .endm .macro local_irq_disable reg=t0 -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION lw \reg, TI_PRE_COUNT($28) addi \reg, \reg, 1 sw \reg, TI_PRE_COUNT($28)
@@ -73,7 +73,7 @@ xori \reg, \reg, 1 mtc0 \reg, CP0_STATUS irq_disable_hazard -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION lw \reg, TI_PRE_COUNT($28) addi \reg, \reg, -1 sw \reg, TI_PRE_COUNT($28)
arch/mips/kernel/entry.S +3 -3
@@ -19,7 +19,7 @@ #include <asm/thread_info.h> #include <asm/war.h> -#ifndef CONFIG_PREEMPT +#ifndef CONFIG_PREEMPTION #define resume_kernel restore_all #else #define __ret_from_irq ret_from_exception
@@ -27,7 +27,7 @@ .text .align 5 -#ifndef CONFIG_PREEMPT +#ifndef CONFIG_PREEMPTION FEXPORT(ret_from_exception) local_irq_disable # preempt stop b __ret_from_irq
@@ -53,7 +53,7 @@ resume_userspace: bnez t0, work_pending j restore_all -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION resume_kernel: local_irq_disable lw t0, TI_PRE_COUNT($28)
PATCH 13/34 nds32: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the ex-exit code over to use CONFIG_PREEMPTION.
--- arch/nds32/Kconfig | 2 +- arch/nds32/kernel/ex-exit.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/nds32/Kconfig +1 -1
@@ -61,7 +61,7 @@ config GENERIC_HWEIGHT config GENERIC_LOCKBREAK def_bool y - depends on PREEMPT + depends on PREEMPTION config TRACE_IRQFLAGS_SUPPORT def_bool y
arch/nds32/kernel/ex-exit.S +2 -2
@@ -72,7 +72,7 @@ restore_user_regs_last .endm -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION .macro preempt_stop .endm #else
@@ -158,7 +158,7 @@ ENTRY(ret_slow_syscall) /* * preemptive kernel */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION resume_kernel: gie_disable lwi $t0, [tsk+#TSK_TI_PREEMPT]
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, nds32: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 10c1537b32e7667842ccefbc2970153784837c27 Gitweb: https://git.kernel.org/tip/10c1537b32e7667842ccefbc2970153784837c27 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:00 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:34 +01:00
sched/rt, nds32: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the ex-exit code over to use CONFIG_PREEMPTION.
[bigeasy: +Kconfig]
--- arch/nds32/Kconfig | 2 +- arch/nds32/kernel/ex-exit.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/nds32/Kconfig +1 -1
@@ -62,7 +62,7 @@ config GENERIC_HWEIGHT config GENERIC_LOCKBREAK def_bool y - depends on PREEMPT + depends on PREEMPTION config TRACE_IRQFLAGS_SUPPORT def_bool y
arch/nds32/kernel/ex-exit.S +2 -2
@@ -72,7 +72,7 @@ restore_user_regs_last .endm -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION .macro preempt_stop .endm #else
@@ -158,7 +158,7 @@ no_work_pending: /* * preemptive kernel */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION resume_kernel: gie_disable lwi $t0, [tsk+#TSK_TI_PREEMPT]
PATCH 14/34 nios2: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/nios2/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/nios2/kernel/entry.S +1 -1
@@ -365,7 +365,7 @@ ENTRY(ret_from_interrupt) ldw r1, PT_ESTATUS(sp) /* check if returning to kernel */ TSTBNZ r1, r1, ESTATUS_EU, Luser_return -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION GET_THREAD_INFO r1 ldw r4, TI_PREEMPT_COUNT(r1) bne r4, r0, restore_all
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, nios2: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: f0365eb50b04de91d0119619026865ba2a352a34 Gitweb: https://git.kernel.org/tip/f0365eb50b04de91d0119619026865ba2a352a34 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:01 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:34 +01:00
sched/rt, nios2: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/nios2/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/nios2/kernel/entry.S +1 -1
@@ -365,7 +365,7 @@ ENTRY(ret_from_interrupt) ldw r1, PT_ESTATUS(sp) /* check if returning to kernel */ TSTBNZ r1, r1, ESTATUS_EU, Luser_return -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION GET_THREAD_INFO r1 ldw r4, TI_PREEMPT_COUNT(r1) bne r4, r0, restore_all
PATCH 15/34 parisc: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/parisc/Kconfig | 2 +- arch/parisc/kernel/entry.S | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/parisc/Kconfig +1 -1
@@ -81,7 +81,7 @@ config STACK_GROWSUP config GENERIC_LOCKBREAK bool default y - depends on SMP && PREEMPT + depends on SMP && PREEMPTION config ARCH_HAS_ILOG2_U32 bool
arch/parisc/kernel/entry.S +5 -5
@@ -940,14 +940,14 @@ ENTRY(intr_return) rfi nop -#ifndef CONFIG_PREEMPT +#ifndef CONFIG_PREEMPTION # define intr_do_preempt intr_restore -#endif /* !CONFIG_PREEMPT */ +#endif /* !CONFIG_PREEMPTION */ .import schedule,code intr_do_resched: /* Only call schedule on return to userspace. If we're returning - * to kernel space, we may schedule if CONFIG_PREEMPT, otherwise + * to kernel space, we may schedule if CONFIG_PREEMPTION, otherwise * we jump back to intr_restore. */ LDREG PT_IASQ0(%r16), %r20
@@ -979,7 +979,7 @@ ENTRY(intr_return) * and preempt_count is 0. otherwise, we continue on * our merry way back to the current running task. */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION .import preempt_schedule_irq,code intr_do_preempt: rsm PSW_SM_I, %r0 /* disable interrupts */
@@ -999,7 +999,7 @@ ENTRY(intr_return) nop b,n intr_restore /* ssm PSW_SM_I done by intr_restore */ -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ /* * External interrupts.
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, parisc: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 09613e8320cda150717126ba88c0ddc38bfc0c68 Gitweb: https://git.kernel.org/tip/09613e8320cda150717126ba88c0ddc38bfc0c68 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:02 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:34 +01:00
sched/rt, parisc: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
[bigeasy: +Kconfig]
--- arch/parisc/Kconfig | 2 +- arch/parisc/kernel/entry.S | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/parisc/Kconfig +1 -1
@@ -81,7 +81,7 @@ config STACK_GROWSUP config GENERIC_LOCKBREAK bool default y - depends on SMP && PREEMPT + depends on SMP && PREEMPTION config ARCH_HAS_ILOG2_U32 bool
arch/parisc/kernel/entry.S +5 -5
@@ -940,14 +940,14 @@ intr_restore: rfi nop -#ifndef CONFIG_PREEMPT +#ifndef CONFIG_PREEMPTION # define intr_do_preempt intr_restore -#endif /* !CONFIG_PREEMPT */ +#endif /* !CONFIG_PREEMPTION */ .import schedule,code intr_do_resched: /* Only call schedule on return to userspace. If we're returning - * to kernel space, we may schedule if CONFIG_PREEMPT, otherwise + * to kernel space, we may schedule if CONFIG_PREEMPTION, otherwise * we jump back to intr_restore. */ LDREG PT_IASQ0(%r16), %r20
@@ -979,7 +979,7 @@ intr_do_resched: * and preempt_count is 0. otherwise, we continue on * our merry way back to the current running task. */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION .import preempt_schedule_irq,code intr_do_preempt: rsm PSW_SM_I, %r0 /* disable interrupts */
@@ -999,7 +999,7 @@ intr_do_preempt: nop b,n intr_restore /* ssm PSW_SM_I done by intr_restore */ -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ /* * External interrupts.
PATCH 16/34 riscv: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/riscv/kernel/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kernel/entry.S +2 -2
@@ -155,7 +155,7 @@ REG_L x2, PT_SP(sp) .endm -#if !IS_ENABLED(CONFIG_PREEMPT) +#if !IS_ENABLED(CONFIG_PREEMPTION) .set resume_kernel, restore_all #endif
@@ -269,7 +269,7 @@ ENTRY(handle_exception) RESTORE_ALL sret -#if IS_ENABLED(CONFIG_PREEMPT) +#if IS_ENABLED(CONFIG_PREEMPTION) resume_kernel: REG_L s0, TASK_TI_PREEMPT_COUNT(tp) bnez s0, restore_all
Signature · 7 lines
2.23.0 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH 16/34] riscv: Use CONFIG_PREEMPTION
Quoted 6 lines · Sebastian Andrzej Siewior
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.
Quoted 8 lines
Switch the entry code over to use
CONFIG_PREEMPTION.Cc Paul Walmsley <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Albert Ou <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>
- Paul
[tip: sched/urgent] sched/rt, riscv: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorThe following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 29ff64929e6caf3a6df8e719aa5b9dc36e8e407a Gitweb: https://git.kernel.org/tip/29ff64929e6caf3a6df8e719aa5b9dc36e8e407a Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:03 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:34 +01:00
sched/rt, riscv: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/riscv/kernel/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kernel/entry.S +2 -2
@@ -155,7 +155,7 @@ _save_context: REG_L x2, PT_SP(sp) .endm -#if !IS_ENABLED(CONFIG_PREEMPT) +#if !IS_ENABLED(CONFIG_PREEMPTION) .set resume_kernel, restore_all #endif
@@ -304,7 +304,7 @@ restore_all: sret #endif -#if IS_ENABLED(CONFIG_PREEMPT) +#if IS_ENABLED(CONFIG_PREEMPTION) resume_kernel: REG_L s0, TASK_TI_PREEMPT_COUNT(tp) bnez s0, restore_all
PATCH 17/34 s390: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the preemption and entry code over to use CONFIG_PREEMPTION. Add PREEMPT_RT output to die().
--- arch/s390/Kconfig | 2 +- arch/s390/include/asm/preempt.h | 4 ++-- arch/s390/kernel/dumpstack.c | 2 ++ arch/s390/kernel/entry.S | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-)
arch/s390/Kconfig +1 -1
@@ -30,7 +30,7 @@ config GENERIC_BUG_RELATIVE_POINTERS def_bool y config GENERIC_LOCKBREAK - def_bool y if PREEMPT + def_bool y if PREEMPTTION config PGSTE def_bool y if KVM
arch/s390/include/asm/preempt.h +2 -2
@@ -130,11 +130,11 @@ static inline bool should_resched(int preempt_offset)#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION extern asmlinkage void preempt_schedule(void);#define __preempt_schedule () preempt_schedule() extern asmlinkage void preempt_schedule_notrace(void);#define __preempt_schedule_notrace () preempt_schedule_notrace() -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ #endif /* __ASM_PREEMPT_H */
arch/s390/kernel/dumpstack.c +2 -0
@@ -194,6 +194,8 @@ void die(struct pt_regs *regs, const char *str) regs->int_code >> 17, ++die_counter);#ifdef CONFIG_PREEMPT pr_cont ("PREEMPT " ); +#elif defined(CONFIG_PREEMPT_RT ) +pr_cont ("PREEMPT_RT " );#endif pr_cont ("SMP " );if (debug_pagealloc_enabled ())
arch/s390/kernel/entry.S +1 -1
@@ -790,7 +790,7 @@ ENTRY(io_int_handler) .Lio_work: tm __PT_PSW+1(%r11),0x01 # returning to user ? jo .Lio_work_user # yes -> do resched & signal -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION # check for preemptive scheduling icm %r0,15,__LC_PREEMPT_COUNT jnz .Lio_restore # preemption is disabled
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, s390: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: fa686453053b70a8a01b7517df8cfc5872f63196 Gitweb: https://git.kernel.org/tip/fa686453053b70a8a01b7517df8cfc5872f63196 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:04 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:35 +01:00
sched/rt, s390: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the preemption and entry code over to use CONFIG_PREEMPTION. Add PREEMPT_RT output to die().
[bigeasy: +Kconfig, dumpstack.c]
--- arch/s390/Kconfig | 2 +- arch/s390/include/asm/preempt.h | 4 ++-- arch/s390/kernel/dumpstack.c | 2 ++ arch/s390/kernel/entry.S | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-)
arch/s390/Kconfig +1 -1
@@ -30,7 +30,7 @@ config GENERIC_BUG_RELATIVE_POINTERS def_bool y config GENERIC_LOCKBREAK - def_bool y if PREEMPT + def_bool y if PREEMPTTION config PGSTE def_bool y if KVM
arch/s390/include/asm/preempt.h +2 -2
@@ -130,11 +130,11 @@ static inline bool should_resched(int preempt_offset)#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION extern asmlinkage void preempt_schedule(void);#define __preempt_schedule () preempt_schedule() extern asmlinkage void preempt_schedule_notrace(void);#define __preempt_schedule_notrace () preempt_schedule_notrace() -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ #endif /* __ASM_PREEMPT_H */
arch/s390/kernel/dumpstack.c +2 -0
@@ -195,6 +195,8 @@ void die(struct pt_regs *regs, const char *str) regs->int_code >> 17, ++die_counter);#ifdef CONFIG_PREEMPT pr_cont ("PREEMPT " ); +#elif defined(CONFIG_PREEMPT_RT ) +pr_cont ("PREEMPT_RT " );#endif pr_cont ("SMP " );if (debug_pagealloc_enabled ())
arch/s390/kernel/entry.S +1 -1
@@ -790,7 +790,7 @@ ENTRY(io_int_handler) .Lio_work: tm __PT_PSW+1(%r11),0x01 # returning to user ? jo .Lio_work_user # yes -> do resched & signal -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION # check for preemptive scheduling icm %r0,15,__LC_PREEMPT_COUNT jnz .Lio_restore # preemption is disabled
PATCH 18/34 sh: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
--- arch/sh/Kconfig | 2 +- arch/sh/kernel/cpu/sh5/entry.S | 4 ++-- arch/sh/kernel/entry-common.S | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/sh/Kconfig +1 -1
@@ -108,7 +108,7 @@ config GENERIC_CALIBRATE_DELAY config GENERIC_LOCKBREAK def_bool y - depends on SMP && PREEMPT + depends on SMP && PREEMPTION config ARCH_SUSPEND_POSSIBLE def_bool n
arch/sh/kernel/cpu/sh5/entry.S +2 -2
@@ -86,7 +86,7 @@ andi r6, ~0xf0, r6; \ putcon r6, SR; -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION # define preempt_stop() CLI() #else # define preempt_stop()
@@ -884,7 +884,7 @@ LRESVEC_block_end: /* Marker. Unused. */ /* Check softirqs */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION pta ret_from_syscall, tr0 blink tr0, ZERO
arch/sh/kernel/entry-common.S +2 -2
@@ -41,7 +41,7 @@ */ #include <asm/dwarf.h> -#if defined(CONFIG_PREEMPT) +#if defined(CONFIG_PREEMPTION) # define preempt_stop() cli ; TRACE_IRQS_OFF #else # define preempt_stop()
@@ -84,7 +84,7 @@ ENTRY(ret_from_irq) get_current_thread_info r8, r0 bt resume_kernel ! Yes, it's from kernel, go back soon -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION bra resume_userspace nop ENTRY(resume_kernel)
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, sh: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 7be60ccbc59098f5251edae51bbf08e2d2226da0 Gitweb: https://git.kernel.org/tip/7be60ccbc59098f5251edae51bbf08e2d2226da0 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:05 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:35 +01:00
sched/rt, sh: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION.
[bigeasy: +Kconfig]
--- arch/sh/Kconfig | 2 +- arch/sh/kernel/cpu/sh5/entry.S | 4 ++-- arch/sh/kernel/entry-common.S | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/sh/Kconfig +1 -1
@@ -108,7 +108,7 @@ config GENERIC_CALIBRATE_DELAY config GENERIC_LOCKBREAK def_bool y - depends on SMP && PREEMPT + depends on SMP && PREEMPTION config ARCH_SUSPEND_POSSIBLE def_bool n
arch/sh/kernel/cpu/sh5/entry.S +2 -2
@@ -86,7 +86,7 @@ andi r6, ~0xf0, r6; \ putcon r6, SR; -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION # define preempt_stop() CLI() #else # define preempt_stop()
@@ -884,7 +884,7 @@ ret_from_exception: /* Check softirqs */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION pta ret_from_syscall, tr0 blink tr0, ZERO
arch/sh/kernel/entry-common.S +2 -2
@@ -41,7 +41,7 @@ */ #include <asm/dwarf.h> -#if defined(CONFIG_PREEMPT) +#if defined(CONFIG_PREEMPTION) # define preempt_stop() cli ; TRACE_IRQS_OFF #else # define preempt_stop()
@@ -84,7 +84,7 @@ ENTRY(ret_from_irq) get_current_thread_info r8, r0 bt resume_kernel ! Yes, it's from kernel, go back soon -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION bra resume_userspace nop ENTRY(resume_kernel)
PATCH 19/34 sparc: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the trap code over to use CONFIG_PREEMPTION.
--- arch/sparc/Kconfig | 2 +- arch/sparc/kernel/rtrap_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/sparc/Kconfig +1 -1
@@ -278,7 +278,7 @@ config US3_MC config GENERIC_LOCKBREAK bool default y - depends on SPARC64 && SMP && PREEMPT + depends on SPARC64 && SMP && PREEMPTION config NUMA bool "NUMA support"
arch/sparc/kernel/rtrap_64.S +1 -1
@@ -310,7 +310,7 @@ kern_rtt: rdpr %canrestore, %g1 retry to_kernel: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION ldsw [%g6 + TI_PRE_COUNT], %l5 brnz %l5, kern_fpucheck ldx [%g6 + TI_FLAGS], %l5
Signature · 1 line
2.23.0
Re: [PATCH 19/34] sparc: Use CONFIG_PREEMPTION
From: Sebastian Andrzej Siewior <[email protected]>
Date: Tue, 15 Oct 2019 21:18:06 +0200
Quoted 6 lines
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.
Quoted 7 lines
Switch the trap code over to use
CONFIG_PREEMPTION.Cc "David S. Miller" <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>[bigeasy: +Kconfig]Signed-off-by Sebastian Andrzej Siewior <[email protected]>
[tip: sched/urgent] sched/rt, sparc: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorThe following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 85a683d0a6895026b535bf40643687c626e376f3 Gitweb: https://git.kernel.org/tip/85a683d0a6895026b535bf40643687c626e376f3 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:06 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:35 +01:00
sched/rt, sparc: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the trap code over to use CONFIG_PREEMPTION.
[bigeasy: +Kconfig]
--- arch/sparc/Kconfig | 2 +- arch/sparc/kernel/rtrap_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/sparc/Kconfig +1 -1
@@ -277,7 +277,7 @@ config US3_MC config GENERIC_LOCKBREAK bool default y - depends on SPARC64 && SMP && PREEMPT + depends on SPARC64 && SMP && PREEMPTION config NUMA bool "NUMA support"
arch/sparc/kernel/rtrap_64.S +1 -1
@@ -310,7 +310,7 @@ kern_rtt_restore: retry to_kernel: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION ldsw [%g6 + TI_PRE_COUNT], %l5 brnz %l5, kern_fpucheck ldx [%g6 + TI_FLAGS], %l5
PATCH 20/34 xtensa: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION. Add PREEMPT_RT output to die().
--- arch/xtensa/kernel/entry.S | 2 +- arch/xtensa/kernel/traps.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
arch/xtensa/kernel/entry.S +1 -1
@@ -520,7 +520,7 @@ ENTRY(kernel_exception) call4 schedule # void schedule (void) j 1b -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION 6: _bbci.l a4, TIF_NEED_RESCHED, 4f
arch/xtensa/kernel/traps.c +5 -2
@@ -524,12 +524,15 @@ DEFINE_SPINLOCK(die_lock);void die (const char * str,struct pt_regs * regs,long err) {static int die_counter; +const char *pr ="" ; + +if (IS_ENABLED (CONFIG_PREEMPTION )) + pr =IS_ENABLED (CONFIG_PREEMPT_RT ) ?" PREEMPT_RT" :" PREEMPT" ;console_verbose ();spin_lock_irq (&die_lock); -pr_info ("%s: sig: %ld [#%d]%s\n" , str, err, ++die_counter, -IS_ENABLED (CONFIG_PREEMPT ) ?" PREEMPT" :"" ); +pr_info ("%s: sig: %ld [#%d]%s\n" , str, err, ++die_counter, pr);show_regs (regs);if (!user_mode (regs))show_stack (NULL , (unsigned long *)regs->areg[1 ]);
Signature · 1 line
2.23.0
Re: [PATCH 20/34] xtensa: Use CONFIG_PREEMPTION
Quoted 16 lines · Sebastian Andrzej Siewior
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Switch the entry code over to use
CONFIG_PREEMPTION. AddPREEMPT_RToutput todie().Cc Chris Zankel <[email protected]>Cc Max Filippov <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>[bigeasy: +traps.c]Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Quoted 4 lines
--- arch/xtensa/kernel/entry.S | 2 +- arch/xtensa/kernel/traps.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
Signature · 2 lines
Thanks. -- Max
[tip: sched/urgent] sched/rt, xtensa: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorThe following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 6c5260d73d2b723f072c312eb80ef83711b4e166 Gitweb: https://git.kernel.org/tip/6c5260d73d2b723f072c312eb80ef83711b4e166 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:07 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:35 +01:00
sched/rt, xtensa: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the entry code over to use CONFIG_PREEMPTION. Add PREEMPT_RT output to die().
[bigeasy: +traps.c]
--- arch/xtensa/kernel/entry.S | 2 +- arch/xtensa/kernel/traps.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
arch/xtensa/kernel/entry.S +1 -1
@@ -520,7 +520,7 @@ common_exception_return: call4 schedule # void schedule (void) j 1b -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION 6: _bbci.l a4, TIF_NEED_RESCHED, 4f
arch/xtensa/kernel/traps.c +5 -2
@@ -519,12 +519,15 @@ DEFINE_SPINLOCK(die_lock);void die (const char * str,struct pt_regs * regs,long err) {static int die_counter; +const char *pr ="" ; + +if (IS_ENABLED (CONFIG_PREEMPTION )) + pr =IS_ENABLED (CONFIG_PREEMPT_RT ) ?" PREEMPT_RT" :" PREEMPT" ;console_verbose ();spin_lock_irq (&die_lock); -pr_info ("%s: sig: %ld [#%d]%s\n" , str, err, ++die_counter, -IS_ENABLED (CONFIG_PREEMPT ) ?" PREEMPT" :"" ); +pr_info ("%s: sig: %ld [#%d]%s\n" , str, err, ++die_counter, pr);show_regs (regs);if (!user_mode (regs))show_stack (NULL , (unsigned long *)regs->areg[1 ]);
PATCH 21/34 net: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Update the comment to use CONFIG_PREEMPTION.
--- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/dev.c +1 -1
@@ -901,7 +901,7 @@ EXPORT_SYMBOL(dev_get_by_napi_id);* * The use of raw_seqcount_begin() and cond_resched() before * retrying is required as we want to give the writers a chance -* to complete when CONFIG_PREEMPT is not set. +* to complete when CONFIG_PREEMPTION is not set. */ int netdev_get_name (struct net *net,char *name,int ifindex) {
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, net: Use CONFIG_PREEMPTION.patch
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 2da2b32fd9346009e9acdb68c570ca8d3966aba7 Gitweb: https://git.kernel.org/tip/2da2b32fd9346009e9acdb68c570ca8d3966aba7 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:08 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:35 +01:00
sched/rt, net: Use CONFIG_PREEMPTION.patch
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Update the comment to use CONFIG_PREEMPTION.
--- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/dev.c +1 -1
@@ -928,7 +928,7 @@ EXPORT_SYMBOL(dev_get_by_napi_id);* * The use of raw_seqcount_begin() and cond_resched() before * retrying is required as we want to give the writers a chance -* to complete when CONFIG_PREEMPT is not set. +* to complete when CONFIG_PREEMPTION is not set. */ int netdev_get_name (struct net *net,char *name,int ifindex) {
PATCH 22/34 xen: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the preempt anand xen-ops code over to use CONFIG_PREEMPTION.
--- drivers/xen/preempt.c | 4 ++-- include/xen/xen-ops.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/xen/preempt.c +2 -2
@@ -8,7 +8,7 @@#include <linux/sched.h> #include <xen/xen-ops.h> -#ifndef CONFIG_PREEMPT +#ifndef CONFIG_PREEMPTION /* * Some hypercalls issued by the toolstack can take many 10s of
@@ -37,4 +37,4 @@ asmlinkage __visible void xen_maybe_preempt_hcall(void) __this_cpu_write(xen_in_preemptible_hcall, true); } } -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */
include/xen/xen-ops.h +2 -2
@@ -215,7 +215,7 @@ bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);void xen_efi_runtime_setup (void ); -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION static inline void xen_preemptible_hcall_begin (void ) {
@@ -239,6 +239,6 @@ static inline void xen_preemptible_hcall_end(void)__this_cpu_write (xen_in_preemptible_hcall, false); } -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ #endif /* INCLUDE_XEN_OPS_H */
Signature · 7 lines
2.23.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH 22/34] xen: Use CONFIG_PREEMPTION
Quoted 6 lines · Sebastian Andrzej Siewior
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.
Quoted 8 lines
Switch the preempt anand xen-ops code over to use
CONFIG_PREEMPTION.Cc Boris Ostrovsky <[email protected]>Cc Juergen Gross <[email protected]>Cc Stefano Stabellini <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Juergen
[tip: sched/urgent] sched/rt, xen: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorThe following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: d4a3dcbc4727966a64a64d57e2b5106a138d426d Gitweb: https://git.kernel.org/tip/d4a3dcbc4727966a64a64d57e2b5106a138d426d Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:09 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:36 +01:00
sched/rt, xen: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the preempt anand xen-ops code over to use CONFIG_PREEMPTION.
--- drivers/xen/preempt.c | 4 ++-- include/xen/xen-ops.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/xen/preempt.c +2 -2
@@ -8,7 +8,7 @@#include <linux/sched.h> #include <xen/xen-ops.h> -#ifndef CONFIG_PREEMPT +#ifndef CONFIG_PREEMPTION /* * Some hypercalls issued by the toolstack can take many 10s of
@@ -37,4 +37,4 @@ asmlinkage __visible void xen_maybe_preempt_hcall(void) __this_cpu_write(xen_in_preemptible_hcall, true); } } -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */
include/xen/xen-ops.h +2 -2
@@ -215,7 +215,7 @@ bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);void xen_efi_runtime_setup (void ); -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION static inline void xen_preemptible_hcall_begin (void ) {
@@ -239,6 +239,6 @@ static inline void xen_preemptible_hcall_end(void)__this_cpu_write (xen_in_preemptible_hcall, false); } -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ #endif /* INCLUDE_XEN_OPS_H */
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 23/34 fs: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the i_size() and part_nr_sects_…() code over to use CONFIG_PREEMPTION. Update the comment for fsstack_copy_inode_size() also to refer to CONFIG_PREEMPTION.
--- fs/stack.c | 6 +++--- include/linux/fs.h | 4 ++-- include/linux/genhd.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-)
fs/stack.c +3 -3
@@ -23,7 +23,7 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src)/* * But on 32-bit, we ought to make an effort to keep the two halves of -* i_blocks in sync despite SMP or PREEMPT - though stat's +* i_blocks in sync despite SMP or PREEMPTION - though stat's * generic_fillattr() doesn't bother, and we won't be applying quotas * (where i_blocks does become important) at the upper level. *
@@ -38,14 +38,14 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src)spin_unlock (&src->i_lock);/* -* If CONFIG_SMP or CONFIG_PREEMPT on 32-bit, it's vital for +* If CONFIG_SMP or CONFIG_PREEMPTION on 32-bit, it's vital for * fsstack_copy_inode_size() to hold some lock around * i_size_write(), otherwise i_size_read() may spin forever (see * include/linux/fs.h). We don't necessarily hold i_mutex when this * is called, so take i_lock for that case. * * And if on 32-bit, continue our effort to keep the two halves of -* i_blocks in sync despite SMP or PREEMPT: use i_lock for that case +* i_blocks in sync despite SMP or PREEMPTION: use i_lock for that case * too, and do both at once by combining the tests. * * There is none of this locking overhead in the 64-bit case.
include/linux/fs.h +2 -2
@@ -855,7 +855,7 @@ static inline loff_t i_size_read(const struct inode *inode) i_size = inode->i_size; }while (read_seqcount_retry (&inode->i_size_seqcount, seq));return i_size; -#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT) +#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPTION)loff_t i_size;preempt_disable ();
@@ -880,7 +880,7 @@ static inline void i_size_write(struct inode *inode, loff_t i_size) inode->i_size = i_size;write_seqcount_end (&inode->i_size_seqcount);preempt_enable (); -#elif BITS_PER_LONG ==32 && defined(CONFIG_PREEMPT ) +#elif BITS_PER_LONG ==32 && defined(CONFIG_PREEMPTION )preempt_disable (); inode->i_size = i_size;preempt_enable ();
include/linux/genhd.h +3 -3
@@ -717,7 +717,7 @@ static inline void hd_free_part(struct hd_struct *part)* accessor function. * * Code written along the lines of i_size_read() and i_size_write(). -* CONFIG_PREEMPT case optimizes the case of UP kernel with preemption +* CONFIG_PREEMPTION case optimizes the case of UP kernel with preemption * on. */ static inline sector_t part_nr_sects_read (struct hd_struct *part)
@@ -730,7 +730,7 @@ static inline sector_t part_nr_sects_read(struct hd_struct *part) nr_sects = part->nr_sects; }while (read_seqcount_retry (&part->nr_sects_seq, seq));return nr_sects; -#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT) +#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPTION)sector_t nr_sects;preempt_disable ();
@@ -753,7 +753,7 @@ static inline void part_nr_sects_write(struct hd_struct *part, sector_t size)write_seqcount_begin (&part->nr_sects_seq); part->nr_sects = size;write_seqcount_end (&part->nr_sects_seq); -#elif BITS_PER_LONG ==32 && defined(CONFIG_PREEMPT ) +#elif BITS_PER_LONG ==32 && defined(CONFIG_PREEMPTION )preempt_disable (); part->nr_sects = size;preempt_enable ();
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, fs: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 2496396fcb44404ead24b578c583d5286886e857 Gitweb: https://git.kernel.org/tip/2496396fcb44404ead24b578c583d5286886e857 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:10 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:36 +01:00
sched/rt, fs: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the i_size() and part_nr_sects_…() code over to use CONFIG_PREEMPTION. Update the comment for fsstack_copy_inode_size() also to refer to CONFIG_PREEMPTION.
[bigeasy: +PREEMPT comments]
--- fs/stack.c | 6 +++--- include/linux/fs.h | 4 ++-- include/linux/genhd.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-)
fs/stack.c +3 -3
@@ -23,7 +23,7 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src)/* * But on 32-bit, we ought to make an effort to keep the two halves of -* i_blocks in sync despite SMP or PREEMPT - though stat's +* i_blocks in sync despite SMP or PREEMPTION - though stat's * generic_fillattr() doesn't bother, and we won't be applying quotas * (where i_blocks does become important) at the upper level. *
@@ -38,14 +38,14 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src)spin_unlock (&src->i_lock);/* -* If CONFIG_SMP or CONFIG_PREEMPT on 32-bit, it's vital for +* If CONFIG_SMP or CONFIG_PREEMPTION on 32-bit, it's vital for * fsstack_copy_inode_size() to hold some lock around * i_size_write(), otherwise i_size_read() may spin forever (see * include/linux/fs.h). We don't necessarily hold i_mutex when this * is called, so take i_lock for that case. * * And if on 32-bit, continue our effort to keep the two halves of -* i_blocks in sync despite SMP or PREEMPT: use i_lock for that case +* i_blocks in sync despite SMP or PREEMPTION: use i_lock for that case * too, and do both at once by combining the tests. * * There is none of this locking overhead in the 64-bit case.
include/linux/fs.h +2 -2
@@ -855,7 +855,7 @@ static inline loff_t i_size_read(const struct inode *inode) i_size = inode->i_size; }while (read_seqcount_retry (&inode->i_size_seqcount, seq));return i_size; -#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT) +#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPTION)loff_t i_size;preempt_disable ();
@@ -880,7 +880,7 @@ static inline void i_size_write(struct inode *inode, loff_t i_size) inode->i_size = i_size;write_seqcount_end (&inode->i_size_seqcount);preempt_enable (); -#elif BITS_PER_LONG ==32 && defined(CONFIG_PREEMPT ) +#elif BITS_PER_LONG ==32 && defined(CONFIG_PREEMPTION )preempt_disable (); inode->i_size = i_size;preempt_enable ();
include/linux/genhd.h +3 -3
@@ -718,7 +718,7 @@ static inline void hd_free_part(struct hd_struct *part)* accessor function. * * Code written along the lines of i_size_read() and i_size_write(). -* CONFIG_PREEMPT case optimizes the case of UP kernel with preemption +* CONFIG_PREEMPTION case optimizes the case of UP kernel with preemption * on. */ static inline sector_t part_nr_sects_read (struct hd_struct *part)
@@ -731,7 +731,7 @@ static inline sector_t part_nr_sects_read(struct hd_struct *part) nr_sects = part->nr_sects; }while (read_seqcount_retry (&part->nr_sects_seq, seq));return nr_sects; -#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT) +#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPTION)sector_t nr_sects;preempt_disable ();
@@ -754,7 +754,7 @@ static inline void part_nr_sects_write(struct hd_struct *part, sector_t size)write_seqcount_begin (&part->nr_sects_seq); part->nr_sects = size;write_seqcount_end (&part->nr_sects_seq); -#elif BITS_PER_LONG ==32 && defined(CONFIG_PREEMPT ) +#elif BITS_PER_LONG ==32 && defined(CONFIG_PREEMPTION )preempt_disable (); part->nr_sects = size;preempt_enable ();
PATCH 24/34 btrfs: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the btrfs_device_set_…() macro over to use CONFIG_PREEMPTION.
--- fs/btrfs/volumes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/volumes.h +1 -1
@@ -179,7 +179,7 @@ btrfs_device_set_##name(struct btrfs_device *dev, u64 size) \write_seqcount_end (&dev->data_seqcount); \ preempt_enable(); \ } -#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT) +#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPTION)#define BTRFS_DEVICE_GETSET_FUNCS (name) \ static inline u64 \ btrfs_device_get_##name(const struct btrfs_device *dev) \
Signature · 1 line
2.23.0
Re: [PATCH 24/34] btrfs: Use CONFIG_PREEMPTION
Quoted 11 lines · Sebastian Andrzej Siewior
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Switch the btrfs_device_set_…() macro over to use
CONFIG_PREEMPTION.Cc Chris Mason <[email protected]>Cc Josef Bacik <[email protected]>Cc David Sterba <[email protected]>
[tip: sched/urgent] sched/rt, btrfs: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorThe following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 94545870b14b5eb6d8a887fab845d1918f4f62ac Gitweb: https://git.kernel.org/tip/94545870b14b5eb6d8a887fab845d1918f4f62ac Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:11 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:36 +01:00
sched/rt, btrfs: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the btrfs_device_set_…() macro over to use CONFIG_PREEMPTION.
--- fs/btrfs/volumes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/volumes.h +1 -1
@@ -168,7 +168,7 @@ btrfs_device_set_##name(struct btrfs_device *dev, u64 size) \write_seqcount_end (&dev->data_seqcount); \ preempt_enable(); \ } -#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT) +#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPTION)#define BTRFS_DEVICE_GETSET_FUNCS (name) \ static inline u64 \ btrfs_device_get_##name(const struct btrfs_device *dev) \
PATCH 25/34 mm: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the pte_unmap_same() and SLUB code over to use CONFIG_PREEMPTION.
--- mm/memory.c | 2 +- mm/slub.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
mm/memory.c +1 -1
@@ -2133,7 +2133,7 @@ static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd, pte_t *page_table, pte_t orig_pte) { int same = 1; -#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT) +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPTION) if (sizeof(pte_t) > sizeof(unsigned long)) { spinlock_t *ptl = pte_lockptr(mm, pmd); spin_lock(ptl);
mm/slub.c +6 -6
@@ -1984,7 +1984,7 @@ static void *get_partial(struct kmem_cache *s, gfp_t flags, int node,return get_any_partial (s, flags, c); } -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* * Calculate the next globally unique transaction for disambiguiation * during cmpxchg. The transactions start with the cpu number and are then
@@ -2029,7 +2029,7 @@ static inline void note_cmpxchg_failure(const char *n,pr_info ("%s %s: cmpxchg redo " , n, s->name); -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION if (tid_to_cpu (tid) !=tid_to_cpu (actual_tid))pr_warn ("due to cpu change %d -> %d\n" ,tid_to_cpu (tid),tid_to_cpu (actual_tid));
@@ -2657,7 +2657,7 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,unsigned long flags;local_irq_save (flags); -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* * We may have been preempted and rescheduled on a different * cpu before disabling interrupts. Need to reload cpu area
@@ -2700,13 +2700,13 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s,* as we end up on the original cpu again when doing the cmpxchg. * * We should guarantee that tid and kmem_cache are retrieved on -* the same cpu. It could be different if CONFIG_PREEMPT so we need +* the same cpu. It could be different if CONFIG_PREEMPTION so we need * to check if it is matched or not. */ do { tid =this_cpu_read (s->cpu_slab->tid); c =raw_cpu_ptr (s->cpu_slab); - }while (IS_ENABLED (CONFIG_PREEMPT ) && + }while (IS_ENABLED (CONFIG_PREEMPTION ) &&unlikely (tid !=READ_ONCE (c->tid)));/*
@@ -2984,7 +2984,7 @@ static __always_inline void do_slab_free(struct kmem_cache *s,do { tid =this_cpu_read (s->cpu_slab->tid); c =raw_cpu_ptr (s->cpu_slab); - }while (IS_ENABLED (CONFIG_PREEMPT ) && + }while (IS_ENABLED (CONFIG_PREEMPTION ) &&unlikely (tid !=READ_ONCE (c->tid)));/* Same with comment on barrier() in slab_alloc_node() */
Signature · 1 line
2.23.0
Re: [PATCH 25/34] mm: Use CONFIG_PREEMPTION
[tip: sched/urgent] sched/rt, mm: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorThe following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 923717cbab900fb23b31f16fb31b1d86b09bf702 Gitweb: https://git.kernel.org/tip/923717cbab900fb23b31f16fb31b1d86b09bf702 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:12 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:36 +01:00
sched/rt, mm: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the pte_unmap_same() and SLUB code over to use CONFIG_PREEMPTION.
--- mm/memory.c | 2 +- mm/slub.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
mm/memory.c +1 -1
@@ -2151,7 +2151,7 @@ static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd, pte_t *page_table, pte_t orig_pte) { int same = 1; -#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT) +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPTION) if (sizeof(pte_t) > sizeof(unsigned long)) { spinlock_t *ptl = pte_lockptr(mm, pmd); spin_lock(ptl);
mm/slub.c +6 -6
@@ -1964,7 +1964,7 @@ static void *get_partial(struct kmem_cache *s, gfp_t flags, int node,return get_any_partial (s, flags, c); } -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* * Calculate the next globally unique transaction for disambiguiation * during cmpxchg. The transactions start with the cpu number and are then
@@ -2009,7 +2009,7 @@ static inline void note_cmpxchg_failure(const char *n,pr_info ("%s %s: cmpxchg redo " , n, s->name); -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION if (tid_to_cpu (tid) !=tid_to_cpu (actual_tid))pr_warn ("due to cpu change %d -> %d\n" ,tid_to_cpu (tid),tid_to_cpu (actual_tid));
@@ -2637,7 +2637,7 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,unsigned long flags;local_irq_save (flags); -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION /* * We may have been preempted and rescheduled on a different * cpu before disabling interrupts. Need to reload cpu area
@@ -2691,13 +2691,13 @@ redo:* as we end up on the original cpu again when doing the cmpxchg. * * We should guarantee that tid and kmem_cache are retrieved on -* the same cpu. It could be different if CONFIG_PREEMPT so we need +* the same cpu. It could be different if CONFIG_PREEMPTION so we need * to check if it is matched or not. */ do { tid =this_cpu_read (s->cpu_slab->tid); c =raw_cpu_ptr (s->cpu_slab); - }while (IS_ENABLED (CONFIG_PREEMPT ) && + }while (IS_ENABLED (CONFIG_PREEMPTION ) &&unlikely (tid !=READ_ONCE (c->tid)));/*
@@ -2971,7 +2971,7 @@ redo:do { tid =this_cpu_read (s->cpu_slab->tid); c =raw_cpu_ptr (s->cpu_slab); - }while (IS_ENABLED (CONFIG_PREEMPT ) && + }while (IS_ENABLED (CONFIG_PREEMPTION ) &&unlikely (tid !=READ_ONCE (c->tid)));/* Same with comment on barrier() in slab_alloc_node() */
PATCH 26/34 Documentation/RCU: Use CONFIG_PREEMPTION where appropriate
In reply to Sebastian Andrzej SiewiorThe config option CONFIG_PREEMPT' is used for the preemption model "Low-Latency Desktop". The config option CONFIG_PREEMPTION' is enabled when kernel preemption is enabled which is true for the CONFIG_PREEMPT' and CONFIG_PREEMPT_RT' preemption models.
Use CONFIG_PREEMPTION' if it applies to both preemption models and not just to CONFIG_PREEMPT'.
--- .../Expedited-Grace-Periods.html | 8 +++---- .../RCU/Design/Requirements/Requirements.html | 24 +++++++++---------- Documentation/RCU/checklist.txt | 4 ++-- Documentation/RCU/rcubarrier.txt | 8 +++---- Documentation/RCU/stallwarn.txt | 4 ++-- Documentation/RCU/whatisRCU.txt | 7 +++--- 6 files changed, 28 insertions(+), 27 deletions(-)
Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html +4 -4
@@ -56,8 +56,8 @@ sections. RCU-preempt Expedited Grace Periods</a></h2> <p> -<tt>CONFIG_PREEMPT=y</tt> kernels implement RCU-preempt. -The overall flow of the handling of a given CPU by an RCU-preempt +<tt>CONFIG_PREEMPT=y</tt> and <tt>CONFIG_PREEMPT_RT=y</tt> kernels implement +RCU-preempt. The overall flow of the handling of a given CPU by an RCU-preempt expedited grace period is shown in the following diagram: <p><img src="ExpRCUFlow.svg" alt="ExpRCUFlow.svg" width="55%">
@@ -140,8 +140,8 @@ or offline, among other things. RCU-sched Expedited Grace Periods</a></h2> <p> -<tt>CONFIG_PREEMPT=n</tt> kernels implement RCU-sched. -The overall flow of the handling of a given CPU by an RCU-sched +<tt>CONFIG_PREEMPT=n</tt> and <tt>CONFIG_PREEMPT_RT=n</tt> kernels implement +RCU-sched. The overall flow of the handling of a given CPU by an RCU-sched expedited grace period is shown in the following diagram: <p><img src="ExpSchedFlow.svg" alt="ExpSchedFlow.svg" width="55%">
Documentation/RCU/Design/Requirements/Requirements.html +12 -12
@@ -106,7 +106,7 @@ big RCU read-side critical section. Production-quality implementations of <tt>rcu_read_lock()</tt> and <tt>rcu_read_unlock()</tt> are extremely lightweight, and in fact have exactly zero overhead in Linux kernels built for production -use with <tt>CONFIG_PREEMPT=n</tt>. +use with <tt>CONFIG_PREEMPTION=n</tt>. <p> This guarantee allows ordering to be enforced with extremely low
@@ -1499,7 +1499,7 @@ costs have plummeted. However, as I learned from Matt Mackall's <a href="http://elinux.org/Linux_Tiny-FAQ">bloatwatch</a> efforts, memory footprint is critically important on single-CPU systems with -non-preemptible (<tt>CONFIG_PREEMPT=n</tt>) kernels, and thus +non-preemptible (<tt>CONFIG_PREEMPTION=n</tt>) kernels, and thus <a href="https://lkml.kernel.org/g/[email protected]">tiny RCU</a> was born. Josh Triplett has since taken over the small-memory banner with his
@@ -1887,7 +1887,7 @@ constructs, there are limitations. <p> Implementations of RCU for which <tt>rcu_read_lock()</tt> and <tt>rcu_read_unlock()</tt> generate no code, such as -Linux-kernel RCU when <tt>CONFIG_PREEMPT=n</tt>, can be +Linux-kernel RCU when <tt>CONFIG_PREEMPTION=n</tt>, can be nested arbitrarily deeply. After all, there is no overhead. Except that if all these instances of <tt>rcu_read_lock()</tt>
@@ -2229,7 +2229,7 @@ be a no-op. <p> However, once the scheduler has spawned its first kthread, this early boot trick fails for <tt>synchronize_rcu()</tt> (as well as for -<tt>synchronize_rcu_expedited()</tt>) in <tt>CONFIG_PREEMPT=y</tt> +<tt>synchronize_rcu_expedited()</tt>) in <tt>CONFIG_PREEMPTION=y</tt> kernels. The reason is that an RCU read-side critical section might be preempted, which means that a subsequent <tt>synchronize_rcu()</tt> really does have
@@ -2568,7 +2568,7 @@ The compiler must not be permitted to transform this source code into <p> If the compiler did make this transformation in a -<tt>CONFIG_PREEMPT=n</tt> kernel build, and if <tt>get_user()</tt> did +<tt>CONFIG_PREEMPTION=n</tt> kernel build, and if <tt>get_user()</tt> did page fault, the result would be a quiescent state in the middle of an RCU read-side critical section. This misplaced quiescent state could result in line 4 being
@@ -2906,7 +2906,7 @@ in conjunction with the The real-time-latency response requirements are such that the traditional approach of disabling preemption across RCU read-side critical sections is inappropriate. -Kernels built with <tt>CONFIG_PREEMPT=y</tt> therefore +Kernels built with <tt>CONFIG_PREEMPTION=y</tt> therefore use an RCU implementation that allows RCU read-side critical sections to be preempted. This requirement made its presence known after users made it
@@ -3064,7 +3064,7 @@ includes <tt>rcu_barrier_bh()</tt>, and <tt>rcu_read_lock_bh_held()</tt>. However, the update-side APIs are now simple wrappers for other RCU -flavors, namely RCU-sched in CONFIG_PREEMPT=n kernels and RCU-preempt +flavors, namely RCU-sched in CONFIG_PREEMPTION=n kernels and RCU-preempt otherwise. <h3><a name="Sched Flavor">Sched Flavor (Historical)</a></h3>
@@ -3088,12 +3088,12 @@ of an RCU read-side critical section can be a quiescent state. Therefore, <i>RCU-sched</i> was created, which follows “classic” RCU in that an RCU-sched grace period waits for for pre-existing interrupt and NMI handlers. -In kernels built with <tt>CONFIG_PREEMPT=n</tt>, the RCU and RCU-sched +In kernels built with <tt>CONFIG_PREEMPTION=n</tt>, the RCU and RCU-sched APIs have identical implementations, while kernels built with -<tt>CONFIG_PREEMPT=y</tt> provide a separate implementation for each. +<tt>CONFIG_PREEMPTION=y</tt> provide a separate implementation for each. <p> -Note well that in <tt>CONFIG_PREEMPT=y</tt> kernels, +Note well that in <tt>CONFIG_PREEMPTION=y</tt> kernels, <tt>rcu_read_lock_sched()</tt> and <tt>rcu_read_unlock_sched()</tt> disable and re-enable preemption, respectively. This means that if there was a preemption attempt during the
@@ -3302,12 +3302,12 @@ The tasks-RCU API is quite compact, consisting only of <tt>call_rcu_tasks()</tt>, <tt>synchronize_rcu_tasks()</tt>, and <tt>rcu_barrier_tasks()</tt>. -In <tt>CONFIG_PREEMPT=n</tt> kernels, trampolines cannot be preempted, +In <tt>CONFIG_PREEMPTION=n</tt> kernels, trampolines cannot be preempted, so these APIs map to <tt>call_rcu()</tt>, <tt>synchronize_rcu()</tt>, and <tt>rcu_barrier()</tt>, respectively. -In <tt>CONFIG_PREEMPT=y</tt> kernels, trampolines can be preempted, +In <tt>CONFIG_PREEMPTION=y</tt> kernels, trampolines can be preempted, and these three APIs are therefore implemented by separate functions that check for voluntary context switches.
Documentation/RCU/checklist.txt +2 -2
@@ -210,8 +210,8 @@ over a rather long period of time, but improvements are always welcome! the rest of the system. 7. As of v4.20, a given kernel implements only one RCU flavor, - which is RCU-sched for PREEMPT=n and RCU-preempt for PREEMPT=y. - If the updater uses call_rcu() or synchronize_rcu(), + which is RCU-sched for PREEMPTION=n and RCU-preempt for + PREEMPTION=y. If the updater uses call_rcu() or synchronize_rcu(), then the corresponding readers my use rcu_read_lock() and rcu_read_unlock(), rcu_read_lock_bh() and rcu_read_unlock_bh(), or any pair of primitives that disables and re-enables preemption,
Documentation/RCU/rcubarrier.txt +4 -4
@@ -6,8 +6,8 @@ RCU (read-copy update) is a synchronization mechanism that can be thought of as a replacement for read-writer locking (among other things), but with very low-overhead readers that are immune to deadlock, priority inversion, and unbounded latency. RCU read-side critical sections are delimited -by rcu_read_lock() and rcu_read_unlock(), which, in non-CONFIG_PREEMPT -kernels, generate no code whatsoever. +by rcu_read_lock() and rcu_read_unlock(), which, in +non-CONFIG_PREEMPTION kernels, generate no code whatsoever. This means that RCU writers are unaware of the presence of concurrent readers, so that RCU updates to shared data must be undertaken quite
@@ -303,10 +303,10 @@ Answer: This cannot happen. The reason is that on_each_cpu() has its last to smp_call_function() and further to smp_call_function_on_cpu(), causing this latter to spin until the cross-CPU invocation of rcu_barrier_func() has completed. This by itself would prevent - a grace period from completing on non-CONFIG_PREEMPT kernels, + a grace period from completing on non-CONFIG_PREEMPTION kernels, since each CPU must undergo a context switch (or other quiescent state) before the grace period can complete. However, this is - of no use in CONFIG_PREEMPT kernels. + of no use in CONFIG_PREEMPTION kernels. Therefore, on_each_cpu() disables preemption across its call to smp_call_function() and also across the local call to
Documentation/RCU/stallwarn.txt +2 -2
@@ -20,7 +20,7 @@ o A CPU looping with preemption disabled. o A CPU looping with bottom halves disabled. -o For !CONFIG_PREEMPT kernels, a CPU looping anywhere in the kernel +o For !CONFIG_PREEMPTION kernels, a CPU looping anywhere in the kernel without invoking schedule(). If the looping in the kernel is really expected and desirable behavior, you might need to add some calls to cond_resched().
@@ -39,7 +39,7 @@ o Anything that prevents RCU's grace-period kthreads from running. result in the "rcu_.*kthread starved for" console-log message, which will include additional debugging information. -o A CPU-bound real-time task in a CONFIG_PREEMPT kernel, which might +o A CPU-bound real-time task in a CONFIG_PREEMPTION kernel, which might happen to preempt a low-priority task in the middle of an RCU read-side critical section. This is especially damaging if that low-priority task is not permitted to run on any other CPU,
Documentation/RCU/whatisRCU.txt +4 -3
@@ -648,9 +648,10 @@ Quick Quiz #1: Why is this argument naive? How could a deadlock This section presents a "toy" RCU implementation that is based on "classic RCU". It is also short on performance (but only for updates) and -on features such as hotplug CPU and the ability to run in CONFIG_PREEMPT -kernels. The definitions of rcu_dereference() and rcu_assign_pointer() -are the same as those shown in the preceding section, so they are omitted. +on features such as hotplug CPU and the ability to run in +CONFIG_PREEMPTION kernels. The definitions of rcu_dereference() and +rcu_assign_pointer() are the same as those shown in the preceding +section, so they are omitted. void rcu_read_lock(void) { }
Signature · 1 line
2.23.0
Paul E. McKenney
maintainerRe: [PATCH 26/34] Documentation/RCU: Use CONFIG_PREEMPTION where appropriate
Quoted 8 lines · Sebastian Andrzej Siewior
The config option
CONFIG_PREEMPT' is used for the preemption model "Low-Latency Desktop". The config optionCONFIG_PREEMPTION' is enabled when kernel preemption is enabled which is true for theCONFIG_PREEMPT' andCONFIG_PREEMPT_RT' preemption models.Use
CONFIG_PREEMPTION' if it applies to both preemption models and not just toCONFIG_PREEMPT'.
Quoted 8 lines
Cc "Paul E. McKenney" <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Sadly, this one ran afoul of the .txt-to-.rst migration. Even applying it against linus/master and cherry-picking it does not help. I will defer it for the moment -- perhaps Mauro or Joel have some advice.
Thanx, Paul
Quoted 219 lines
--- .../Expedited-Grace-Periods.html | 8 +++---- .../RCU/Design/Requirements/Requirements.html | 24 +++++++++---------- Documentation/RCU/checklist.txt | 4 ++-- Documentation/RCU/rcubarrier.txt | 8 +++---- Documentation/RCU/stallwarn.txt | 4 ++-- Documentation/RCU/whatisRCU.txt | 7 +++--- 6 files changed, 28 insertions(+), 27 deletions(-)Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html +4
-4@@ -56,8 +56,8 @@ sections. RCU-preempt Expedited Grace Periods</a></h2> <p> -<tt>CONFIG_PREEMPT=y</tt> kernels implement RCU-preempt. -The overall flow of the handling of a given CPU by an RCU-preempt +<tt>CONFIG_PREEMPT=y</tt> and <tt>CONFIG_PREEMPT_RT=y</tt> kernels implement +RCU-preempt. The overall flow of the handling of a given CPU by an RCU-preempt expedited grace period is shown in the following diagram: <p><img src="ExpRCUFlow.svg" alt="ExpRCUFlow.svg" width="55%">@@ -140,8 +140,8 @@ or offline, among other things. RCU-sched Expedited Grace Periods</a></h2> <p> -<tt>CONFIG_PREEMPT=n</tt> kernels implement RCU-sched. -The overall flow of the handling of a given CPU by an RCU-sched +<tt>CONFIG_PREEMPT=n</tt> and <tt>CONFIG_PREEMPT_RT=n</tt> kernels implement +RCU-sched. The overall flow of the handling of a given CPU by an RCU-sched expedited grace period is shown in the following diagram: <p><img src="ExpSchedFlow.svg" alt="ExpSchedFlow.svg" width="55%">Documentation/RCU/Design/Requirements/Requirements.html +12
-12@@ -106,7 +106,7 @@ big RCU read-side critical section. Production-quality implementations of <tt>rcu_read_lock()</tt> and <tt>rcu_read_unlock()</tt> are extremely lightweight, and in fact have exactly zero overhead in Linux kernels built for production -use with <tt>CONFIG_PREEMPT=n</tt>. +use with <tt>CONFIG_PREEMPTION=n</tt>. <p> This guarantee allows ordering to be enforced with extremely low@@ -1499,7 +1499,7 @@ costs have plummeted. However, as I learned from Matt Mackall's <a href="http://elinux.org/Linux_Tiny-FAQ">bloatwatch</a> efforts, memory footprint is critically important on single-CPU systems with -non-preemptible (<tt>CONFIG_PREEMPT=n</tt>) kernels, and thus +non-preemptible (<tt>CONFIG_PREEMPTION=n</tt>) kernels, and thus <a href="https://lkml.kernel.org/g/[email protected]">tiny RCU</a> was born. Josh Triplett has since taken over the small-memory banner with his@@ -1887,7 +1887,7 @@ constructs, there are limitations. <p> Implementations of RCU for which <tt>rcu_read_lock()</tt> and <tt>rcu_read_unlock()</tt> generate no code, such as -Linux-kernel RCU when <tt>CONFIG_PREEMPT=n</tt>, can be +Linux-kernel RCU when <tt>CONFIG_PREEMPTION=n</tt>, can be nested arbitrarily deeply. After all, there is no overhead. Except that if all these instances of <tt>rcu_read_lock()</tt>@@ -2229,7 +2229,7 @@ be a no-op. <p> However, once the scheduler has spawned its first kthread, this early boot trick fails for <tt>synchronize_rcu()</tt> (as well as for -<tt>synchronize_rcu_expedited()</tt>) in <tt>CONFIG_PREEMPT=y</tt> +<tt>synchronize_rcu_expedited()</tt>) in <tt>CONFIG_PREEMPTION=y</tt> kernels. The reason is that an RCU read-side critical section might be preempted, which means that a subsequent <tt>synchronize_rcu()</tt> really does have@@ -2568,7 +2568,7 @@ The compiler must not be permitted to transform this source code into <p> If the compiler did make this transformation in a -<tt>CONFIG_PREEMPT=n</tt> kernel build, and if <tt>get_user()</tt> did +<tt>CONFIG_PREEMPTION=n</tt> kernel build, and if <tt>get_user()</tt> did page fault, the result would be a quiescent state in the middle of an RCU read-side critical section. This misplaced quiescent state could result in line 4 being@@ -2906,7 +2906,7 @@ in conjunction with the The real-time-latency response requirements are such that the traditional approach of disabling preemption across RCU read-side critical sections is inappropriate. -Kernels built with <tt>CONFIG_PREEMPT=y</tt> therefore +Kernels built with <tt>CONFIG_PREEMPTION=y</tt> therefore use an RCU implementation that allows RCU read-side critical sections to be preempted. This requirement made its presence known after users made it@@ -3064,7 +3064,7 @@ includes <tt>rcu_barrier_bh()</tt>, and <tt>rcu_read_lock_bh_held()</tt>. However, the update-side APIs are now simple wrappers for other RCU -flavors, namely RCU-sched in CONFIG_PREEMPT=n kernels and RCU-preempt +flavors, namely RCU-sched in CONFIG_PREEMPTION=n kernels and RCU-preempt otherwise. <h3><a name="Sched Flavor">Sched Flavor (Historical)</a></h3>@@ -3088,12 +3088,12 @@ of an RCU read-side critical section can be a quiescent state. Therefore, <i>RCU-sched</i> was created, which follows “classic” RCU in that an RCU-sched grace period waits for for pre-existing interrupt and NMI handlers. -In kernels built with <tt>CONFIG_PREEMPT=n</tt>, the RCU and RCU-sched +In kernels built with <tt>CONFIG_PREEMPTION=n</tt>, the RCU and RCU-sched APIs have identical implementations, while kernels built with -<tt>CONFIG_PREEMPT=y</tt> provide a separate implementation for each. +<tt>CONFIG_PREEMPTION=y</tt> provide a separate implementation for each. <p> -Note well that in <tt>CONFIG_PREEMPT=y</tt> kernels, +Note well that in <tt>CONFIG_PREEMPTION=y</tt> kernels, <tt>rcu_read_lock_sched()</tt> and <tt>rcu_read_unlock_sched()</tt> disable and re-enable preemption, respectively. This means that if there was a preemption attempt during the@@ -3302,12 +3302,12 @@ The tasks-RCU API is quite compact, consisting only of <tt>call_rcu_tasks()</tt>, <tt>synchronize_rcu_tasks()</tt>, and <tt>rcu_barrier_tasks()</tt>. -In <tt>CONFIG_PREEMPT=n</tt> kernels, trampolines cannot be preempted, +In <tt>CONFIG_PREEMPTION=n</tt> kernels, trampolines cannot be preempted, so these APIs map to <tt>call_rcu()</tt>, <tt>synchronize_rcu()</tt>, and <tt>rcu_barrier()</tt>, respectively. -In <tt>CONFIG_PREEMPT=y</tt> kernels, trampolines can be preempted, +In <tt>CONFIG_PREEMPTION=y</tt> kernels, trampolines can be preempted, and these three APIs are therefore implemented by separate functions that check for voluntary context switches.Documentation/RCU/checklist.txt +2
-2@@ -210,8 +210,8 @@ over a rather long period of time, but improvements are always welcome! the rest of the system. 7. As of v4.20, a given kernel implements only one RCU flavor, - which is RCU-sched for PREEMPT=n and RCU-preempt for PREEMPT=y. - If the updater uses call_rcu() or synchronize_rcu(), + which is RCU-sched for PREEMPTION=n and RCU-preempt for + PREEMPTION=y. If the updater uses call_rcu() or synchronize_rcu(), then the corresponding readers my use rcu_read_lock() and rcu_read_unlock(), rcu_read_lock_bh() and rcu_read_unlock_bh(), or any pair of primitives that disables and re-enables preemption,Documentation/RCU/rcubarrier.txt +4
-4@@ -6,8 +6,8 @@ RCU (read-copy update) is a synchronization mechanism that can be thought of as a replacement for read-writer locking (among other things), but with very low-overhead readers that are immune to deadlock, priority inversion, and unbounded latency. RCU read-side critical sections are delimited -by rcu_read_lock() and rcu_read_unlock(), which, in non-CONFIG_PREEMPT -kernels, generate no code whatsoever. +by rcu_read_lock() and rcu_read_unlock(), which, in +non-CONFIG_PREEMPTION kernels, generate no code whatsoever. This means that RCU writers are unaware of the presence of concurrent readers, so that RCU updates to shared data must be undertaken quite@@ -303,10 +303,10 @@ Answer: This cannot happen. The reason is that on_each_cpu() has its last to smp_call_function() and further to smp_call_function_on_cpu(), causing this latter to spin until the cross-CPU invocation of rcu_barrier_func() has completed. This by itself would prevent - a grace period from completing on non-CONFIG_PREEMPT kernels, + a grace period from completing on non-CONFIG_PREEMPTION kernels, since each CPU must undergo a context switch (or other quiescent state) before the grace period can complete. However, this is - of no use in CONFIG_PREEMPT kernels. + of no use in CONFIG_PREEMPTION kernels. Therefore, on_each_cpu() disables preemption across its call to smp_call_function() and also across the local call toDocumentation/RCU/stallwarn.txt +2
-2@@ -20,7 +20,7 @@ o A CPU looping with preemption disabled. o A CPU looping with bottom halves disabled. -o For !CONFIG_PREEMPT kernels, a CPU looping anywhere in the kernel +o For !CONFIG_PREEMPTION kernels, a CPU looping anywhere in the kernel without invoking schedule(). If the looping in the kernel is really expected and desirable behavior, you might need to add some calls to cond_resched().@@ -39,7 +39,7 @@ o Anything that prevents RCU's grace-period kthreads from running. result in the "rcu_.*kthread starved for" console-log message, which will include additional debugging information. -o A CPU-bound real-time task in a CONFIG_PREEMPT kernel, which might +o A CPU-bound real-time task in a CONFIG_PREEMPTION kernel, which might happen to preempt a low-priority task in the middle of an RCU read-side critical section. This is especially damaging if that low-priority task is not permitted to run on any other CPU,Documentation/RCU/whatisRCU.txt +4
-3@@ -648,9 +648,10 @@ Quick Quiz #1: Why is this argument naive? How could a deadlock This section presents a "toy" RCU implementation that is based on "classic RCU". It is also short on performance (but only for updates) and -on features such as hotplug CPU and the ability to run in CONFIG_PREEMPT -kernels. The definitions of rcu_dereference() and rcu_assign_pointer() -are the same as those shown in the preceding section, so they are omitted. +on features such as hotplug CPU and the ability to run in +CONFIG_PREEMPTION kernels. The definitions of rcu_dereference() and +rcu_assign_pointer() are the same as those shown in the preceding +section, so they are omitted. void rcu_read_lock(void) { }Signature · 1 line
2.23.0
Re: [PATCH 26/34] Documentation/RCU: Use CONFIG_PREEMPTION where appropriate
Quoted 3 lines · Paul E. McKenney
Sadly, this one ran afoul of the
.txt-to-.rstmigration. Even applying it against linus/master and cherry-picking it does not help. I will defer it for the moment -- perhaps Mauro or Joel have some advice.
Don't worry about it then. Just point me to the tree once it is done.
Quoted 1 line
Thanx, Paul
Sebastian
Paul E. McKenney
maintainerRe: [PATCH 26/34] Documentation/RCU: Use CONFIG_PREEMPTION where appropriate
Quoted 6 lines · Sebastian Andrzej Siewior
Quoted 3 lines · Paul E. McKenney
Sadly, this one ran afoul of the
.txt-to-.rstmigration. Even applying it against linus/master and cherry-picking it does not help. I will defer it for the moment -- perhaps Mauro or Joel have some advice.Don't worry about it then. Just point me to the tree once it is done.
Thank you very much and will do!
Thanx, Paul
PATCH 27/34 rcu: Use CONFIG_PREEMPTION where appropriate
In reply to Sebastian Andrzej SiewiorThe config option CONFIG_PREEMPT' is used for the preemption model "Low-Latency Desktop". The config option CONFIG_PREEMPTION' is enabled when kernel preemption is enabled which is true for the preemption model CONFIG_PREEMPT' and CONFIG_PREEMPT_RT'.
Use CONFIG_PREEMPTION' if it applies to both preemption models and not just to CONFIG_PREEMPT'.
--- include/linux/rcupdate.h | 4 ++-- kernel/rcu/Kconfig | 4 ++-- kernel/rcu/rcutorture.c | 2 +- kernel/rcu/srcutiny.c | 2 +- kernel/rcu/tree.c | 4 ++-- kernel/rcu/tree_exp.h | 2 +- kernel/rcu/tree_plugin.h | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-)
include/linux/rcupdate.h +2 -2
@@ -154,7 +154,7 @@ static inline void exit_tasks_rcu_finish(void) { }* * This macro resembles cond_resched(), except that it is defined to * report potential quiescent states to RCU-tasks even if the cond_resched() -* machinery were to be shut off, as some advocate for PREEMPT kernels. +* machinery were to be shut off, as some advocate for PREEMPTION kernels. */ #define cond_resched_tasks_rcu_qs () \ do { \
@@ -580,7 +580,7 @@ do { \* * You can avoid reading and understanding the next paragraph by * following this rule: don't put anything in an rcu_read_lock() RCU -* read-side critical section that would block in a !PREEMPT kernel. +* read-side critical section that would block in a !PREEMPTION kernel. * But if you want the full story, read on! * * In non-preemptible RCU implementations (TREE_RCU and TINY_RCU),
kernel/rcu/Kconfig +2 -2
@@ -200,8 +200,8 @@ config RCU_NOCB_CPU specified at boot time by the rcu_nocbs parameter. For each such CPU, a kthread ("rcuox/N") will be created to invoke callbacks, where the "N" is the CPU being offloaded, and where - the "p" for RCU-preempt (PREEMPT kernels) and "s" for RCU-sched - (!PREEMPT kernels). Nothing prevents this kthread from running + the "p" for RCU-preempt (PREEMPTION kernels) and "s" for RCU-sched + (!PREEMPTION kernels). Nothing prevents this kthread from running on the specified CPUs, but (1) the kthreads may be preempted between each callback, and (2) affinity or cgroups can be used to force the kthreads to run on whatever set of CPUs is desired.
kernel/rcu/rcutorture.c +1 -1
@@ -1725,7 +1725,7 @@ static void rcu_torture_fwd_cb_cr(struct rcu_head *rhp)// Give the scheduler a chance, even on nohz_full CPUs. static void rcu_torture_fwd_prog_cond_resched (unsigned long iter) { -if (IS_ENABLED (CONFIG_PREEMPT ) &&IS_ENABLED (CONFIG_NO_HZ_FULL )) { +if (IS_ENABLED (CONFIG_PREEMPTION ) &&IS_ENABLED (CONFIG_NO_HZ_FULL )) {// Real call_rcu() floods hit userspace, so emulate that. if (need_resched () || (iter &0xfff ))schedule ();
kernel/rcu/srcutiny.c +1 -1
@@ -103,7 +103,7 @@ EXPORT_SYMBOL_GPL(__srcu_read_unlock);/* * Workqueue handler to drive one grace period and invoke any callbacks -* that become ready as a result. Single-CPU and !PREEMPT operation +* that become ready as a result. Single-CPU and !PREEMPTION operation * means that we get away with murder on synchronization. ;-) */ void srcu_drive_gp (struct work_struct *wp)
kernel/rcu/tree.c +2 -2
@@ -2667,9 +2667,9 @@ EXPORT_SYMBOL_GPL(kfree_call_rcu);/* * During early boot, any blocking grace-period wait automatically -* implies a grace period. Later on, this is never the case for PREEMPT. +* implies a grace period. Later on, this is never the case for PREEMPTION. * -* Howevr, because a context switch is a grace period for !PREEMPT, any +* Howevr, because a context switch is a grace period for !PREEMPTION, any * blocking grace-period wait automatically implies a grace period if * there is only one CPU online at any point time during execution of * either synchronize_rcu() or synchronize_rcu_expedited(). It is OK to
kernel/rcu/tree_exp.h +1 -1
@@ -670,7 +670,7 @@ static void rcu_exp_handler(void *unused) } } -/* PREEMPT=y, so no PREEMPT=n expedited grace period to clean up after. */ +/* PREEMPTION=y, so no PREEMPTION=n expedited grace period to clean up after. */ static void sync_sched_exp_online_cleanup (int cpu) { }
kernel/rcu/tree_plugin.h +2 -2
@@ -788,7 +788,7 @@ static void __init rcu_bootup_announce(void) }/* -* Note a quiescent state for PREEMPT=n. Because we do not need to know +* Note a quiescent state for PREEMPTION=n. Because we do not need to know * how many quiescent states passed, just if there was at least one since * the start of the grace period, this just sets a flag. The caller must * have disabled preemption.
@@ -838,7 +838,7 @@ void rcu_all_qs(void)EXPORT_SYMBOL_GPL (rcu_all_qs);/* -* Note a PREEMPT=n context switch. The caller must have disabled interrupts. +* Note a PREEMPTION=n context switch. The caller must have disabled interrupts. */ void rcu_note_context_switch (bool preempt) {
Signature · 1 line
2.23.0
Paul E. McKenney
maintainerRe: [PATCH 27/34] rcu: Use CONFIG_PREEMPTION where appropriate
Quoted 8 lines · Sebastian Andrzej Siewior
The config option
CONFIG_PREEMPT' is used for the preemption model "Low-Latency Desktop". The config optionCONFIG_PREEMPTION' is enabled when kernel preemption is enabled which is true for the preemption modelCONFIG_PREEMPT' andCONFIG_PREEMPT_RT'.Use
CONFIG_PREEMPTION' if it applies to both preemption models and not just toCONFIG_PREEMPT'.
Quoted 9 lines
Cc "Paul E. McKenney" <[email protected]>Cc Josh Triplett <[email protected]>Cc Steven Rostedt <[email protected]>Cc Mathieu Desnoyers <[email protected]>Cc Lai Jiangshan <[email protected]>Cc Joel Fernandes <[email protected]>Cc Davidlohr Bueso <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>
This one does apply, so I have queued it for review and testing, thank you!
Thanx, Paul
Quoted 127 lines
--- include/linux/rcupdate.h | 4 ++-- kernel/rcu/Kconfig | 4 ++-- kernel/rcu/rcutorture.c | 2 +- kernel/rcu/srcutiny.c | 2 +- kernel/rcu/tree.c | 4 ++-- kernel/rcu/tree_exp.h | 2 +- kernel/rcu/tree_plugin.h | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-)include/linux/rcupdate.h +2
-2@@ -154,7 +154,7 @@ static inline void exit_tasks_rcu_finish(void) { }* * This macro resembles cond_resched(), except that it is defined to * report potential quiescent states to RCU-tasks even if the cond_resched() -* machinery were to be shut off, as some advocate for PREEMPT kernels. +* machinery were to be shut off, as some advocate for PREEMPTION kernels. */ #define cond_resched_tasks_rcu_qs () \ do { \@@ -580,7 +580,7 @@ do { \* * You can avoid reading and understanding the next paragraph by * following this rule: don't put anything in an rcu_read_lock() RCU -* read-side critical section that would block in a !PREEMPT kernel. +* read-side critical section that would block in a !PREEMPTION kernel. * But if you want the full story, read on! * * In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), kernel/rcu/Kconfig +2
-2@@ -200,8 +200,8 @@ config RCU_NOCB_CPU specified at boot time by the rcu_nocbs parameter. For each such CPU, a kthread ("rcuox/N") will be created to invoke callbacks, where the "N" is the CPU being offloaded, and where - the "p" for RCU-preempt (PREEMPT kernels) and "s" for RCU-sched - (!PREEMPT kernels). Nothing prevents this kthread from running + the "p" for RCU-preempt (PREEMPTION kernels) and "s" for RCU-sched + (!PREEMPTION kernels). Nothing prevents this kthread from running on the specified CPUs, but (1) the kthreads may be preempted between each callback, and (2) affinity or cgroups can be used to force the kthreads to run on whatever set of CPUs is desired.kernel/rcu/rcutorture.c +1
-1@@ -1725,7 +1725,7 @@ static void rcu_torture_fwd_cb_cr(struct rcu_head *rhp)// Give the scheduler a chance, even on nohz_full CPUs. static void rcu_torture_fwd_prog_cond_resched (unsigned long iter) { -if (IS_ENABLED (CONFIG_PREEMPT ) &&IS_ENABLED (CONFIG_NO_HZ_FULL )) { +if (IS_ENABLED (CONFIG_PREEMPTION ) &&IS_ENABLED (CONFIG_NO_HZ_FULL )) {// Real call_rcu() floods hit userspace, so emulate that. if (need_resched () || (iter &0xfff ))schedule ();kernel/rcu/srcutiny.c +1
-1@@ -103,7 +103,7 @@ EXPORT_SYMBOL_GPL(__srcu_read_unlock);/* * Workqueue handler to drive one grace period and invoke any callbacks -* that become ready as a result. Single-CPU and !PREEMPT operation +* that become ready as a result. Single-CPU and !PREEMPTION operation * means that we get away with murder on synchronization. ;-) */ void srcu_drive_gp (struct work_struct *wp)kernel/rcu/tree.c +2
-2@@ -2667,9 +2667,9 @@ EXPORT_SYMBOL_GPL(kfree_call_rcu);/* * During early boot, any blocking grace-period wait automatically -* implies a grace period. Later on, this is never the case for PREEMPT. +* implies a grace period. Later on, this is never the case for PREEMPTION. * -* Howevr, because a context switch is a grace period for !PREEMPT, any +* Howevr, because a context switch is a grace period for !PREEMPTION, any * blocking grace-period wait automatically implies a grace period if * there is only one CPU online at any point time during execution of * either synchronize_rcu() or synchronize_rcu_expedited(). It is OK to kernel/rcu/tree_exp.h +1
-1@@ -670,7 +670,7 @@ static void rcu_exp_handler(void *unused) } } -/* PREEMPT=y, so no PREEMPT=n expedited grace period to clean up after. */ +/* PREEMPTION=y, so no PREEMPTION=n expedited grace period to clean up after. */ static void sync_sched_exp_online_cleanup (int cpu) { }kernel/rcu/tree_plugin.h +2
-2@@ -788,7 +788,7 @@ static void __init rcu_bootup_announce(void) }/* -* Note a quiescent state for PREEMPT=n. Because we do not need to know +* Note a quiescent state for PREEMPTION=n. Because we do not need to know * how many quiescent states passed, just if there was at least one since * the start of the grace period, this just sets a flag. The caller must * have disabled preemption. @@ -838,7 +838,7 @@ void rcu_all_qs(void)EXPORT_SYMBOL_GPL (rcu_all_qs);/* -* Note a PREEMPT=n context switch. The caller must have disabled interrupts. +* Note a PREEMPTION=n context switch. The caller must have disabled interrupts. */ void rcu_note_context_switch (bool preempt) {Signature · 1 line
2.23.0
PATCH 28/34 drm/i810: Refer to `PREEMPTION' in comment
In reply to Sebastian Andrzej SiewiorThe dependency has been changed from PREEMPT' to PREEMPTION'. Reflect this change in the comment.
Use `PREEMPTION' in the comment.
--- drivers/gpu/drm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/Kconfig +1 -1
@@ -397,7 +397,7 @@ config DRM_R128 config DRM_I810 tristate "Intel I810" - # !PREEMPT because of missing ioctl locking + # !PREEMPTION because of missing ioctl locking depends on DRM && AGP && AGP_INTEL && (!PREEMPTION || BROKEN) help Choose this option if you have an Intel I810 graphics card. If M is
Signature · 1 line
2.23.0
Daniel Vetter
AppliedRe: [PATCH 28/34] drm/i810: Refer to `PREEMPTION' in comment
Quoted 5 lines · Sebastian Andrzej Siewior
The dependency has been changed from
PREEMPT' toPREEMPTION'. Reflect this change in the comment.Use `PREEMPTION' in the comment.
Quoted 7 lines
Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Sean Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Queued for 5.5 in drm-misc, thanks for your patch. -Daniel
Quoted 20 lines
--- drivers/gpu/drm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/Kconfig +1
-1@@ -397,7 +397,7 @@ config DRM_R128 config DRM_I810 tristate "Intel I810" - # !PREEMPT because of missing ioctl locking + # !PREEMPTION because of missing ioctl locking depends on DRM && AGP && AGP_INTEL && (!PREEMPTION || BROKEN) help Choose this option if you have an Intel I810 graphics card. If M isSignature · 1 line
2.23.0
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
PATCH 29/34 backlight/jornada720: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorFrom: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the Kconfig dependency to CONFIG_PREEMPTION.
--- drivers/video/backlight/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/Kconfig +2 -2
@@ -99,7 +99,7 @@ config LCD_TOSA config LCD_HP700 tristate "HP Jornada 700 series LCD Driver" - depends on SA1100_JORNADA720_SSP && !PREEMPT + depends on SA1100_JORNADA720_SSP && !PREEMPTION default y help If you have an HP Jornada 700 series handheld (710/720/728)
@@ -228,7 +228,7 @@ config BACKLIGHT_HP680 config BACKLIGHT_HP700 tristate "HP Jornada 700 series Backlight Driver" - depends on SA1100_JORNADA720_SSP && !PREEMPT + depends on SA1100_JORNADA720_SSP && !PREEMPTION default y help If you have an HP Jornada 700 series,
Signature · 1 line
2.23.0
Re: [PATCH 29/34] backlight/jornada720: Use CONFIG_PREEMPTION
Quoted 8 lines · Sebastian Andrzej Siewior
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Switch the
Kconfigdependency toCONFIG_PREEMPTION.
Quoted 9 lines
Cc Lee Jones <[email protected]>Cc Daniel Thompson <[email protected]>Cc Jingoo Han <[email protected]>Cc Bartlomiej Zolnierkiewicz <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>[bigeasy: +LCD_HP700]Signed-off-by Sebastian Andrzej Siewior <[email protected]>
(I know... the review for this particular patch is trivial but an Acked-by from a maintainer means something specific and it is Lee Jones who coordinates landing cross sub-system patch sets for backlight).
Daniel.
Quoted 29 lines
--- drivers/video/backlight/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/video/backlight/Kconfig +2
-2@@ -99,7 +99,7 @@ config LCD_TOSA config LCD_HP700 tristate "HP Jornada 700 series LCD Driver" - depends on SA1100_JORNADA720_SSP && !PREEMPT + depends on SA1100_JORNADA720_SSP && !PREEMPTION default y help If you have an HP Jornada 700 series handheld (710/720/728)@@ -228,7 +228,7 @@ config BACKLIGHT_HP680 config BACKLIGHT_HP700 tristate "HP Jornada 700 series Backlight Driver" - depends on SA1100_JORNADA720_SSP && !PREEMPT + depends on SA1100_JORNADA720_SSP && !PREEMPTION default y help If you have an HP Jornada 700 series,Signature · 1 line
2.23.0
Re: [PATCH 29/34] backlight/jornada720: Use CONFIG_PREEMPTION
Quoted 19 lines · Daniel Thompson
Quoted 8 lines · Sebastian Andrzej Siewior
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Switch the
Kconfigdependency toCONFIG_PREEMPTION.Quoted 9 lines
Cc Lee Jones <[email protected]>Cc Daniel Thompson <[email protected]>Cc Jingoo Han <[email protected]>Cc Bartlomiej Zolnierkiewicz <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>[bigeasy: +LCD_HP700]Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Quoted 6 lines
Reviewed-by Daniel Thompson <[email protected]>(I know... the review for this particular patch is trivial but an Acked-by from a maintainer means something specific and it is Lee Jones who coordinates landing cross sub-system patch sets for backlight).
Right. Thanks Dan.
So what are the OP's expectations in that regard? I see this is a large set and I am only privy to this patch, thus lack wider visibility. Does this patch depend on others, or is it independent? I'm happy to take it, but wish to avoid bisectability issues in the next release kernel.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 29/34] backlight/jornada720: Use CONFIG_PREEMPTION
Quoted 5 lines · Lee Jones
So what are the OP's expectations in that regard? I see this is a large set and I am only privy to this patch, thus lack wider visibility. Does this patch depend on others, or is it independent? I'm happy to take it, but wish to avoid bisectability issues in the next release kernel.
It is independent, you can apply it to your -next branch. All dependencies are merged.
Sebastian
Re: [PATCH 29/34] backlight/jornada720: Use CONFIG_PREEMPTION
Quoted 11 lines · Sebastian Andrzej Siewior
Quoted 5 lines · Lee Jones
So what are the OP's expectations in that regard? I see this is a large set and I am only privy to this patch, thus lack wider visibility. Does this patch depend on others, or is it independent? I'm happy to take it, but wish to avoid bisectability issues in the next release kernel.
It is independent, you can apply it to your -next branch. All dependencies are merged.
Sebastian
Wonderful. Thanks for the info.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Lee Jones
AppliedRe: [PATCH 29/34] backlight/jornada720: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorQuoted 17 lines · Sebastian Andrzej Siewior
From: Thomas Gleixner <[email protected]>
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Switch the
Kconfigdependency toCONFIG_PREEMPTION.Cc Lee Jones <[email protected]>Cc Daniel Thompson <[email protected]>Cc Jingoo Han <[email protected]>Cc Bartlomiej Zolnierkiewicz <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>[bigeasy: +LCD_HP700]Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Quoted 3 lines
--- drivers/video/backlight/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 30/34 media: cec-gpio: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorCONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the Kconfig dependency to CONFIG_PREEMPTION.
--- drivers/media/platform/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/Kconfig +1 -1
@@ -585,7 +585,7 @@ config VIDEO_MESON_G12A_AO_CEC config CEC_GPIO tristate "Generic GPIO-based CEC driver" - depends on PREEMPT || COMPILE_TEST + depends on PREEMPTION || COMPILE_TEST select CEC_CORE select CEC_PIN select GPIOLIB
Signature · 1 line
2.23.0
Re: [PATCH 30/34] media: cec-gpio: Use CONFIG_PREEMPTION
Quoted 9 lines · Sebastian Andrzej Siewior
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Switch the
Kconfigdependency toCONFIG_PREEMPTION.Cc Mauro Carvalho Chehab <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Thanks!
Hans
Quoted 18 lines
--- drivers/media/platform/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/media/platform/Kconfig +1
-1@@ -585,7 +585,7 @@ config VIDEO_MESON_G12A_AO_CEC config CEC_GPIO tristate "Generic GPIO-based CEC driver" - depends on PREEMPT || COMPILE_TEST + depends on PREEMPTION || COMPILE_TEST select CEC_CORE select CEC_PIN select GPIOLIB
Re: [PATCH 30/34] media: cec-gpio: Use CONFIG_PREEMPTION
Quoted 5 lines · Hans Verkuil
Quoted 4 lines · Sebastian Andrzej Siewior
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.
Quoted 7 lines
Quoted 5 lines
Switch the
Kconfigdependency toCONFIG_PREEMPTION.Cc Mauro Carvalho Chehab <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>Acked-by Hans Verkuil <[email protected]>
Do you want me to take this patch? Just checking.
Regards,
Hans
Quoted 24 lines
Thanks!
Hans
Quoted 18 lines
--- drivers/media/platform/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/media/platform/Kconfig +1
-1@@ -585,7 +585,7 @@ config VIDEO_MESON_G12A_AO_CEC config CEC_GPIO tristate "Generic GPIO-based CEC driver" - depends on PREEMPT || COMPILE_TEST + depends on PREEMPTION || COMPILE_TEST select CEC_CORE select CEC_PIN select GPIOLIB
Re: [PATCH 30/34] media: cec-gpio: Use CONFIG_PREEMPTION
Quoted 1 line · Hans Verkuil
Do you want me to take this patch? Just checking.
It is up to you. You have all the dependencies so you can either add it to your -next branch or leave it and we will pick it up for you.
Quoted 3 lines
Regards,
Hans
Sebastian
Re: [PATCH 30/34] media: cec-gpio: Use CONFIG_PREEMPTION
Quoted 5 lines · Sebastian Andrzej Siewior
Quoted 1 line · Hans Verkuil
Do you want me to take this patch? Just checking.
It is up to you. You have all the dependencies so you can either add it to your -next branch or leave it and we will pick it up for you.
I'll take it. I'm preparing a pull request anyway.
Regards,
Hans
Quoted 7 lines
Quoted 4 lines
Regards,
Hans
Sebastian
PATCH 31/34 locking: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorCONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the Kconfig dependency to use CONFIG_PREEMPTION.
--- kernel/Kconfig.locks | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/Kconfig.locks +6 -6
@@ -101,7 +101,7 @@ config UNINLINE_SPIN_UNLOCK # unlock and unlock_irq functions are inlined when: # - DEBUG_SPINLOCK=n and ARCH_INLINE_*LOCK=y # or -# - DEBUG_SPINLOCK=n and PREEMPT=n +# - DEBUG_SPINLOCK=n and PREEMPTION=n # # unlock_bh and unlock_irqrestore functions are inlined when: # - DEBUG_SPINLOCK=n and ARCH_INLINE_*LOCK=y
@@ -139,7 +139,7 @@ config INLINE_SPIN_UNLOCK_BH config INLINE_SPIN_UNLOCK_IRQ def_bool y - depends on !PREEMPT || ARCH_INLINE_SPIN_UNLOCK_IRQ + depends on !PREEMPTION || ARCH_INLINE_SPIN_UNLOCK_IRQ config INLINE_SPIN_UNLOCK_IRQRESTORE def_bool y
@@ -168,7 +168,7 @@ config INLINE_READ_LOCK_IRQSAVE config INLINE_READ_UNLOCK def_bool y - depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK + depends on !PREEMPTION || ARCH_INLINE_READ_UNLOCK config INLINE_READ_UNLOCK_BH def_bool y
@@ -176,7 +176,7 @@ config INLINE_READ_UNLOCK_BH config INLINE_READ_UNLOCK_IRQ def_bool y - depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_IRQ + depends on !PREEMPTION || ARCH_INLINE_READ_UNLOCK_IRQ config INLINE_READ_UNLOCK_IRQRESTORE def_bool y
@@ -205,7 +205,7 @@ config INLINE_WRITE_LOCK_IRQSAVE config INLINE_WRITE_UNLOCK def_bool y - depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK + depends on !PREEMPTION || ARCH_INLINE_WRITE_UNLOCK config INLINE_WRITE_UNLOCK_BH def_bool y
@@ -213,7 +213,7 @@ config INLINE_WRITE_UNLOCK_BH config INLINE_WRITE_UNLOCK_IRQ def_bool y - depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK_IRQ + depends on !PREEMPTION || ARCH_INLINE_WRITE_UNLOCK_IRQ config INLINE_WRITE_UNLOCK_IRQRESTORE def_bool y
Signature · 1 line
2.23.0
Re: [PATCH 31/34] locking: Use CONFIG_PREEMPTION
Quoted 10 lines · Sebastian Andrzej Siewior
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Switch the
Kconfigdependency to useCONFIG_PREEMPTION.Cc "Peter Zijlstra (Intel)" <[email protected]>Cc Ingo Molnar <[email protected]>Cc Will Deacon <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>
Assuming this is part of a larger series and you'll get it merged elsewhere:
[tip: sched/urgent] sched/rt, locking: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorThe following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 1b40cd56f3bcffcfedb43bc30bd431b52240fb3b Gitweb: https://git.kernel.org/tip/1b40cd56f3bcffcfedb43bc30bd431b52240fb3b Author: Sebastian Andrzej Siewior <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:18 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:36 +01:00
sched/rt, locking: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Switch the Kconfig dependency to use CONFIG_PREEMPTION.
--- kernel/Kconfig.locks | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/Kconfig.locks +6 -6
@@ -101,7 +101,7 @@ config UNINLINE_SPIN_UNLOCK # unlock and unlock_irq functions are inlined when: # - DEBUG_SPINLOCK=n and ARCH_INLINE_*LOCK=y # or -# - DEBUG_SPINLOCK=n and PREEMPT=n +# - DEBUG_SPINLOCK=n and PREEMPTION=n # # unlock_bh and unlock_irqrestore functions are inlined when: # - DEBUG_SPINLOCK=n and ARCH_INLINE_*LOCK=y
@@ -139,7 +139,7 @@ config INLINE_SPIN_UNLOCK_BH config INLINE_SPIN_UNLOCK_IRQ def_bool y - depends on !PREEMPT || ARCH_INLINE_SPIN_UNLOCK_IRQ + depends on !PREEMPTION || ARCH_INLINE_SPIN_UNLOCK_IRQ config INLINE_SPIN_UNLOCK_IRQRESTORE def_bool y
@@ -168,7 +168,7 @@ config INLINE_READ_LOCK_IRQSAVE config INLINE_READ_UNLOCK def_bool y - depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK + depends on !PREEMPTION || ARCH_INLINE_READ_UNLOCK config INLINE_READ_UNLOCK_BH def_bool y
@@ -176,7 +176,7 @@ config INLINE_READ_UNLOCK_BH config INLINE_READ_UNLOCK_IRQ def_bool y - depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_IRQ + depends on !PREEMPTION || ARCH_INLINE_READ_UNLOCK_IRQ config INLINE_READ_UNLOCK_IRQRESTORE def_bool y
@@ -205,7 +205,7 @@ config INLINE_WRITE_LOCK_IRQSAVE config INLINE_WRITE_UNLOCK def_bool y - depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK + depends on !PREEMPTION || ARCH_INLINE_WRITE_UNLOCK config INLINE_WRITE_UNLOCK_BH def_bool y
@@ -213,7 +213,7 @@ config INLINE_WRITE_UNLOCK_BH config INLINE_WRITE_UNLOCK_IRQ def_bool y - depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK_IRQ + depends on !PREEMPTION || ARCH_INLINE_WRITE_UNLOCK_IRQ config INLINE_WRITE_UNLOCK_IRQRESTORE def_bool y
PATCH 32/34 lib: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorCONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Let DEBUG_PREEMPT depend on CONFIG_PREEMPTION.
--- lib/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/Kconfig.debug +1 -1
@@ -1053,7 +1053,7 @@ config DEBUG_TIMEKEEPING config DEBUG_PREEMPT bool "Debug preemptible kernel" - depends on DEBUG_KERNEL && PREEMPT && TRACE_IRQFLAGS_SUPPORT + depends on DEBUG_KERNEL && PREEMPTION && TRACE_IRQFLAGS_SUPPORT default y help If you say Y here then the kernel will use a debug variant of the
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/core: Use CONFIG_PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 9f47286924f2f868760a528c14596370e32d86b4 Gitweb: https://git.kernel.org/tip/9f47286924f2f868760a528c14596370e32d86b4 Author: Sebastian Andrzej Siewior <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:19 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:37 +01:00
sched/core: Use CONFIG_PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Let DEBUG_PREEMPT depend on CONFIG_PREEMPTION.
--- lib/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/Kconfig.debug +1 -1
@@ -1051,7 +1051,7 @@ config DEBUG_TIMEKEEPING config DEBUG_PREEMPT bool "Debug preemptible kernel" - depends on DEBUG_KERNEL && PREEMPT && TRACE_IRQFLAGS_SUPPORT + depends on DEBUG_KERNEL && PREEMPTION && TRACE_IRQFLAGS_SUPPORT default y help If you say Y here then the kernel will use a debug variant of the
PATCH 33/34 tracing: Use CONFIG_PREEMPTION
In reply to Sebastian Andrzej SiewiorCONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Add additional header output for PREEMPT_RT.
--- Documentation/trace/ftrace-uses.rst | 2 +- kernel/trace/trace.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
Documentation/trace/ftrace-uses.rst +1 -1
@@ -146,7 +146,7 @@ FTRACE_OPS_FL_RECURSION_SAFE itself or any nested functions that those functions call. If this flag is set, it is possible that the callback will also - be called with preemption enabled (when CONFIG_PREEMPT is set), + be called with preemption enabled (when CONFIG_PREEMPTION is set), but this is not guaranteed. FTRACE_OPS_FL_IPMODIFY
kernel/trace/trace.c +2 -0
@@ -3654,6 +3654,8 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter) "desktop",#elif defined(CONFIG_PREEMPT ) "preempt", +#elif defined(CONFIG_PREEMPT_RT ) + "preempt_rt", #else "unknown",#endif
Signature · 1 line
2.23.0
Re: [PATCH 33/34] tracing: Use CONFIG_PREEMPTION
Quoted 5 lines · On Tue, 15 Oct 2019 21:18:20 +0200 Sebastian Andrzej Siewior…
CONFIG_PREEMPTIONis selected byCONFIG_PREEMPTand byCONFIG_PREEMPT_RT. Both PREEMPT andPREEMPT_RTrequire the same functionality which today depends onCONFIG_PREEMPT.Add additional header output for
PREEMPT_RT.
-- Steve
Quoted 9 lines
Cc Steven Rostedt <[email protected]>Cc Ingo Molnar <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>--- Documentation/trace/ftrace-uses.rst | 2 +- kernel/trace/trace.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
PATCH 34/34 workqueue: Use PREEMPTION
In reply to Sebastian Andrzej SiewiorCONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Update the comment to use PREEMPTION because it is true for both preemption models.
--- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/workqueue.c +1 -1
@@ -2285,7 +2285,7 @@ __acquires(&pool->lock) }/* -* The following prevents a kworker from hogging CPU on !PREEMPT +* The following prevents a kworker from hogging CPU on !PREEMPTION * kernels, where a requeueing work item waiting for something to * happen could deadlock with stop_machine as such work item could * indefinitely requeue itself while all other CPUs are trapped in
Signature · 1 line
2.23.0
[tip: sched/urgent] sched/rt, workqueue: Use PREEMPTION
The following commit has been merged into the sched/urgent branch of tip:
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 025f50f3866486a5278afa91f0d3b6b780141050 Gitweb: https://git.kernel.org/tip/025f50f3866486a5278afa91f0d3b6b780141050 Author: Sebastian Andrzej Siewior <[email protected]> AuthorDate: Tue, 15 Oct 2019 21:18:21 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 08 Dec 2019 14:37:37 +01:00
sched/rt, workqueue: Use PREEMPTION
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Update the comment to use PREEMPTION because it is true for both preemption models.
--- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/workqueue.c +1 -1
@@ -2280,7 +2280,7 @@ __acquires(&pool->lock) }/* -* The following prevents a kworker from hogging CPU on !PREEMPT +* The following prevents a kworker from hogging CPU on !PREEMPTION * kernels, where a requeueing work item waiting for something to * happen could deadlock with stop_machine as such work item could * indefinitely requeue itself while all other CPUs are trapped in