Linux 4.19.37-rt20-rc1
Subsystems (5)
Steven Rostedt
reviewercover Linux 4.19.37-rt20-rc1
Dear RT Folks,
This is the RT stable review cycle of patch 4.19.37-rt20-rc1.
Please scream at me if I messed something up. Please test the patches too.
The -rc release will be uploaded to kernel.org and will be deleted when the final release is out. This is just a review release (or release candidate).
The pre-releases will not be pushed to the git repository, only the final release is.
If all goes well, this patch will be converted to the next main release on 5/28/2019.
Enjoy,
-- Steve
To build 4.19.37-rt20-rc1 directly, the following patches should be applied:
http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.37.xz
http://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.37-rt20-rc1.patch.xz
You can also build from 4.19.37-rt19 by applying the incremental patch:
http://www.kernel.org/pub/linux/kernel/projects/rt/4.19/incr/patch-4.19.37-rt19-rt20-rc1.patch.xz
Changes from 4.19.37-rt19:
---
Corey Minyard (1):
sched/completion: Fix a lockup in wait_for_completion()
Julien Grall (1):
tty/sysrq: Convert show_lock to raw_spinlock_t
Sebastian Andrzej Siewior (3):
powerpc/pseries/iommu: Use a locallock instead local_irq_save()
powerpc: reshuffle TIF bits
drm/i915: Don't disable interrupts independently of the lock
Steven Rostedt (VMware) (1):
Linux 4.19.37-rt20-rc1
----
arch/powerpc/include/asm/thread_info.h | 11 +++++++---- arch/powerpc/kernel/entry_32.S | 12 +++++++----- arch/powerpc/kernel/entry_64.S | 12 +++++++----- arch/powerpc/platforms/pseries/iommu.c | 16 ++++++++++------ drivers/gpu/drm/i915/i915_request.c | 8 ++------ drivers/tty/sysrq.c | 6 +++--- kernel/sched/completion.c | 2 +- localversion-rt | 2 +- 8 files changed, 38 insertions(+), 31 deletions(-)
Steven Rostedt
reviewerPATCH 1/6 powerpc/pseries/iommu: Use a locallock instead local_irq_save()
4.19.37-rt20-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
The locallock protects the per-CPU variable tce_page. The function attempts to allocate memory while tce_page is protected (by disabling interrupts).
Use local_irq_save() instead of local_irq_disable().
--- arch/powerpc/platforms/pseries/iommu.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/powerpc/platforms/pseries/iommu.c +10 -6
@@ -38,6 +38,7 @@#include <linux/of.h> #include <linux/iommu.h> #include <linux/rculist.h> +#include <linux/locallock.h> #include <asm/io.h> #include <asm/prom.h> #include <asm/rtas.h>
@@ -212,6 +213,7 @@ static int tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum, } static DEFINE_PER_CPU(__be64 *, tce_page); +static DEFINE_LOCAL_IRQ_LOCK (tcp_page_lock); static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum, long npages, unsigned long uaddr,
@@ -232,7 +234,8 @@ static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum, direction, attrs); } -local_irq_save (flags);/* to protect tcep and the page behind it */ +/* to protect tcep and the page behind it */ +local_lock_irqsave (tcp_page_lock, flags); tcep =__this_cpu_read (tce_page);
@@ -243,7 +246,7 @@ static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum, tcep = (__be64 *)__get_free_page (GFP_ATOMIC );/* If allocation fails, fall back to the loop implementation */ if (!tcep) { -local_irq_restore (flags); +local_unlock_irqrestore (tcp_page_lock, flags);return tce_build_pSeriesLP (tbl, tcenum, npages, uaddr, direction, attrs); }
@@ -277,7 +280,7 @@ static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum, tcenum += limit; }while (npages >0 && !rc); -local_irq_restore (flags); +local_unlock_irqrestore (tcp_page_lock, flags);if (unlikely (rc ==H_NOT_ENOUGH_RESOURCES )) { ret = (int )rc;
@@ -435,13 +438,14 @@ static int tce_setrange_multi_pSeriesLP(unsigned long start_pfn,u64 rc =0 ;long l, limit; -local_irq_disable ();/* to protect tcep and the page behind it */ +/* to protect tcep and the page behind it */ +local_lock_irq (tcp_page_lock); tcep =__this_cpu_read (tce_page);if (!tcep) { tcep = (__be64 *)__get_free_page (GFP_ATOMIC );if (!tcep) { -local_irq_enable (); +local_unlock_irq (tcp_page_lock);return -ENOMEM ; }__this_cpu_write (tce_page, tcep);
@@ -487,7 +491,7 @@ static int tce_setrange_multi_pSeriesLP(unsigned long start_pfn,/* error cleanup: caller will clear whole range */ -local_irq_enable (); +local_unlock_irq (tcp_page_lock);return rc; }
Signature · 1 line
2.20.1
Steven Rostedt
reviewerPATCH 2/6 powerpc: reshuffle TIF bits
In reply to Steven Rostedt4.19.37-rt20-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
Powerpc32/64 does not compile because TIF_SYSCALL_TRACE's bit is higher than 15 and the assembly instructions don't expect that.
Move TIF_RESTOREALL, TIF_NOERROR to the higher bits and keep TIF_NEED_RESCHED_LAZY in the lower range. As a result one split load is needed and otherwise we can use immediates.
--- arch/powerpc/include/asm/thread_info.h | 11 +++++++---- arch/powerpc/kernel/entry_32.S | 12 +++++++----- arch/powerpc/kernel/entry_64.S | 12 +++++++----- 3 files changed, 21 insertions(+), 14 deletions(-)
arch/powerpc/include/asm/thread_info.h +7 -4
@@ -83,18 +83,18 @@ extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src#define TIF_SIGPENDING 1/* signal pending */ #define TIF_NEED_RESCHED 2/* rescheduling necessary */ #define TIF_FSCHECK 3/* Check FS is USER_DS on return */ -#define TIF_NEED_RESCHED_LAZY 4/* lazy rescheduling necessary */ #define TIF_RESTORE_TM 5/* need to restore TM FP/VEC/VSX */ #define TIF_PATCH_PENDING 6/* pending live patching update */ #define TIF_SYSCALL_AUDIT 7/* syscall auditing active */ #define TIF_SINGLESTEP 8/* singlestepping active */ #define TIF_NOHZ 9/* in adaptive nohz mode */ #define TIF_SECCOMP 10/* secure computing */ -#define TIF_RESTOREALL 11/* Restore all regs (implies NOERROR) */ -#define TIF_NOERROR 12/* Force successful syscall return */ + +#define TIF_NEED_RESCHED_LAZY 11/* lazy rescheduling necessary */ +#define TIF_SYSCALL_TRACEPOINT 12/* syscall tracepoint instrumentation */ +#define TIF_NOTIFY_RESUME 13/* callback before returning to user */ #define TIF_UPROBE 14/* breakpointed or single-stepping */ -#define TIF_SYSCALL_TRACEPOINT 15/* syscall tracepoint instrumentation */ #define TIF_EMULATE_STACK_STORE 16/* Is an instruction emulation for stack store? */ #define TIF_MEMDIE 17/* is terminating due to OOM killer */
@@ -103,6 +103,9 @@ extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src#endif #define TIF_POLLING_NRFLAG 19/* true if poll_idle() is polling TIF_NEED_RESCHED */ #define TIF_32BIT 20/* 32 bit binary */ +#define TIF_RESTOREALL 21/* Restore all regs (implies NOERROR) */ +#define TIF_NOERROR 22/* Force successful syscall return */ +/* as above, but as bit values */ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
arch/powerpc/kernel/entry_32.S +7 -5
@@ -393,7 +393,9 @@ ret_from_syscall: MTMSRD(r10) lwz r9,TI_FLAGS(r12) li r8,-MAX_ERRNO - andi. r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK) + lis r0,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)@h + ori r0,r0, (_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)@l + and. r0,r9,r0 bne- syscall_exit_work cmplw 0,r3,r8 blt+ syscall_exit_cont
@@ -511,13 +513,13 @@ syscall_dotrace: b syscall_dotrace_cont syscall_exit_work: - andi. r0,r9,_TIF_RESTOREALL + andis. r0,r9,_TIF_RESTOREALL@h beq+ 0f REST_NVGPRS(r1) b 2f 0: cmplw 0,r3,r8 blt+ 1f - andi. r0,r9,_TIF_NOERROR + andis. r0,r9,_TIF_NOERROR@h bne- 1f lwz r11,_CCR(r1) /* Load CR */ neg r3,r3
@@ -526,12 +528,12 @@ syscall_exit_work: 1: stw r6,RESULT(r1) /* Save result */ stw r3,GPR3(r1) /* Update return value */ -2: andi. r0,r9,(_TIF_PERSYSCALL_MASK) +2: andis. r0,r9,(_TIF_PERSYSCALL_MASK)@h beq 4f /* Clear per-syscall TIF flags if any are set. */ - li r11,_TIF_PERSYSCALL_MASK + lis r11,_TIF_PERSYSCALL_MASK@h addi r12,r12,TI_FLAGS 3: lwarx r8,0,r12 andc r8,r8,r11
arch/powerpc/kernel/entry_64.S +7 -5
@@ -250,7 +250,9 @@ system_call_exit: ld r9,TI_FLAGS(r12) li r11,-MAX_ERRNO - andi. r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK) + lis r0,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)@h + ori r0,r0,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)@l + and. r0,r9,r0 bne- .Lsyscall_exit_work andi. r0,r8,MSR_FP
@@ -363,25 +365,25 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR) /* If TIF_RESTOREALL is set, don't scribble on either r3 or ccr. If TIF_NOERROR is set, just save r3 as it is. */ - andi. r0,r9,_TIF_RESTOREALL + andis. r0,r9,_TIF_RESTOREALL@h beq+ 0f REST_NVGPRS(r1) b 2f 0: cmpld r3,r11 /* r11 is -MAX_ERRNO */ blt+ 1f - andi. r0,r9,_TIF_NOERROR + andis. r0,r9,_TIF_NOERROR@h bne- 1f ld r5,_CCR(r1) neg r3,r3 oris r5,r5,0x1000 /* Set SO bit in CR */ std r5,_CCR(r1) 1: std r3,GPR3(r1) -2: andi. r0,r9,(_TIF_PERSYSCALL_MASK) +2: andis. r0,r9,(_TIF_PERSYSCALL_MASK)@h beq 4f /* Clear per-syscall TIF flags if any are set. */ - li r11,_TIF_PERSYSCALL_MASK + lis r11,(_TIF_PERSYSCALL_MASK)@h addi r12,r12,TI_FLAGS 3: ldarx r10,0,r12 andc r10,r10,r11
Signature · 1 line
2.20.1
Steven Rostedt
reviewerPATCH 3/6 tty/sysrq: Convert show_lock to raw_spinlock_t
In reply to Steven Rostedt4.19.37-rt20-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Julien Grall <[email protected]>
Systems which don't provide arch_trigger_cpumask_backtrace() will invoke showacpu() from a smp_call_function() function which is invoked with disabled interrupts even on -RT systems.
The function acquires the show_lock lock which only purpose is to ensure that the CPUs don't print simultaneously. Otherwise the output would clash and it would be hard to tell the output from CPUx apart from CPUy.
On -RT the spin_lock() can not be acquired from this context. A raw_spin_lock() is required. It will introduce the system's latency by performing the sysrq request and other CPUs will block on the lock until the request is done. This is okay because the user asked for a backtrace of all active CPUs and under "normal circumstances in production" this path should not be triggered.
--- drivers/tty/sysrq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/tty/sysrq.c +3 -3
@@ -215,7 +215,7 @@ static struct sysrq_key_op sysrq_showlocks_op = {#endif #ifdef CONFIG_SMP -static DEFINE_SPINLOCK (show_lock); +static DEFINE_RAW_SPINLOCK (show_lock);static void showacpu (void *dummy) {
@@ -225,10 +225,10 @@ static void showacpu(void *dummy)if (idle_cpu (smp_processor_id ()))return ; -spin_lock_irqsave (&show_lock, flags); +raw_spin_lock_irqsave (&show_lock, flags);pr_info ("CPU%d:\n" ,smp_processor_id ());show_stack (NULL ,NULL ); -spin_unlock_irqrestore (&show_lock, flags); +raw_spin_unlock_irqrestore (&show_lock, flags); }static void sysrq_showregs_othercpus (struct work_struct *dummy)
Signature · 1 line
2.20.1
Steven Rostedt
reviewerPATCH 4/6 drm/i915: Dont disable interrupts independently of the lock
In reply to Steven Rostedt4.19.37-rt20-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
The locks (timeline->lock and rq->lock) need to be taken with disabled interrupts. This is done in __retire_engine_request() by disabling the interrupts independently of the locks itself.
While local_irq_disable()+spin_lock() equals spin_lock_irq() on vanilla it does not on RT. Also, it is not obvious if there is a special reason to why the interrupts are disabled independently of the lock.
Enable/disable interrupts as part of the locking instruction.
--- drivers/gpu/drm/i915/i915_request.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_request.c +2 -6
@@ -356,9 +356,7 @@ static void __retire_engine_request(struct intel_engine_cs *engine,GEM_BUG_ON (!i915_request_completed (rq)); -local_irq_disable (); - -spin_lock (&engine->timeline.lock); +spin_lock_irq (&engine->timeline.lock);GEM_BUG_ON (!list_is_first (&rq->link, &engine->timeline.requests));list_del_init (&rq->link);spin_unlock (&engine->timeline.lock);
@@ -372,9 +370,7 @@ static void __retire_engine_request(struct intel_engine_cs *engine,GEM_BUG_ON (!atomic_read (&rq->i915->gt_pm.rps.num_waiters));atomic_dec (&rq->i915->gt_pm.rps.num_waiters); } -spin_unlock (&rq->lock); - -local_irq_enable (); +spin_unlock_irq (&rq->lock);/* * The backing object for the context is done after switching to the
Signature · 1 line
2.20.1
Steven Rostedt
reviewerPATCH 5/6 sched/completion: Fix a lockup in wait_for_completion()
In reply to Steven Rostedt4.19.37-rt20-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Corey Minyard <[email protected]>
Consider following race:
T0 T1 T2
wait_for_completion()
do_wait_for_common()
__prepare_to_swait()
schedule()
complete()
x->done++ (0 -> 1)
raw_spin_lock_irqsave()
swake_up_locked() wait_for_completion()
wake_up_process(T0)
list_del_init()
raw_spin_unlock_irqrestore()
raw_spin_lock_irq(&x->wait.lock)
raw_spin_lock_irq(&x->wait.lock) x->done != UINT_MAX, 1 -> 0
raw_spin_unlock_irq(&x->wait.lock)
return 1 while (!x->done && timeout),
continue loop, not enqueued
on &x->wait
Basically, the problem is that the original wait queues used in completions did not remove the item from the queue in the wakeup function, but swake_up_locked() does.
Fix it by adding the thread to the wait queue inside the do loop. The design of swait detects if it is already in the list and doesn't do the list add again.
--- kernel/sched/completion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/completion.c +1 -1
@@ -72,12 +72,12 @@ do_wait_for_common(struct completion *x,if (!x->done) {DECLARE_SWAITQUEUE (wait); -__prepare_to_swait (&x->wait, &wait); do { if (signal_pending_state(state, current)) { timeout = -ERESTARTSYS; break; } + __prepare_to_swait(&x->wait, &wait); __set_current_state(state); raw_spin_unlock_irq(&x->wait.lock); timeout = action(timeout);
Signature · 1 line
2.20.1
Steven Rostedt
reviewerPATCH 6/6 Linux 4.19.37-rt20-rc1
In reply to Steven Rostedt4.19.37-rt20-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (VMware)" <[email protected]>
--- localversion-rt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
localversion-rt +1 -1
@@ -1 +1 @@ --rt19 +-rt20-rc1
Signature · 1 line
2.20.1