Skip to contentSkip to conversation

parisc: fixes for CONFIG_PREEMPT

PATCH Superseded Sven Schnelle 2 participants 7 messages Oct 8, 2021 – Oct 9, 2021 PA-RISC architecture

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover parisc: fixes for CONFIG_PREEMPT

Out of curiosity i enabled CONFIG_PREEMPT on my c8000. The kernel didn't even compile. After fixing compilation i noticed a lot of segmentation faults - usually a few processes crashed already at boot, with sshd the most notable one. Most of the time the processes where crashing with a DTLB or ITLB miss.

With these fixes, i was able to compile a linux kernel on the c8000 with preemption enabled without crashes.

Sven Schnelle (4):
parisc: disable preemption during local tlb flush
parisc: fix preempt_count() check in entry.S
parisc: disable preemption in send_IPI_allbutself()
parisc: fix warning in flush_tlb_all

 arch/parisc/kernel/cache.c | 3 +++
 arch/parisc/kernel/entry.S | 5 +++--
 arch/parisc/kernel/smp.c   | 3 ++-
 arch/parisc/mm/init.c      | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)
Signature · 1 line
2.33.0
#1 lore raw

PATCH 1/4 parisc: disable preemption during local tlb flush

flush_cache_mm() fetches %sr3 via mtsp(3). If it matches mm->context, it flushes caches and the TLB. However, the TLB is cpu-local, so if the code gets preempted shortly after the mtsp(), and later resumed on another CPU, the wrong TLB is flushed.

---
 arch/parisc/kernel/cache.c | 3 +++
 1 file changed, 3 insertions(+)
arch/parisc/kernel/cache.c +3 -0
index 39e02227e231..90656c49bc07 100644
@@ -558,6 +558,7 @@ void flush_cache_mm(struct mm_struct *mm)
 		return;
 	}
 
+	preempt_disable();
 	if (mm->context == mfsp(3)) {
 		for (vma = mm->mmap; vma; vma = vma->vm_next) {
 			flush_user_dcache_range_asm(vma->vm_start, vma->vm_end);
@@ -565,8 +566,10 @@ void flush_cache_mm(struct mm_struct *mm)
 				flush_user_icache_range_asm(vma->vm_start, vma->vm_end);
 			flush_tlb_range(vma, vma->vm_start, vma->vm_end);
 		}
+		preempt_enable();
 		return;
 	}
+	preempt_enable();
 
 	pgd = mm->pgd;
 	for (vma = mm->mmap; vma; vma = vma->vm_next) {
Signature · 1 line
2.33.0
#2 lore raw

Re: [PATCH 1/4] parisc: disable preemption during local tlb flush

Quoted 23 lines · Sven Schnelle

flush_cache_mm() fetches %sr3 via mtsp(3). If it matches mm->context, it flushes caches and the TLB. However, the TLB is cpu-local, so if the code gets preempted shortly after the mtsp(), and later resumed on another CPU, the wrong TLB is flushed.

---
 arch/parisc/kernel/cache.c | 3 +++
 1 file changed, 3 insertions(+)
arch/parisc/kernel/cache.c +1 -0
index 39e02227e231..90656c49bc07 100644
@@ -558,6 +558,7 @@ void flush_cache_mm(struct mm_struct *mm)
 		return;
 	}
 
+	preempt_disable();
 	if (mm->context == mfsp(3)) {
 		for (vma = mm->mmap; vma; vma = vma->vm_next) {
 			flush_user_dcache_range_asm(vma->vm_start, vma->vm_end);

arch/parisc/kernel/cache.c void flush_cache_mm(struct mm_struct *mm) · line 575

Quoted 10 lines
arch/parisc/kernel/cache.c +2 -0
@@ -565,8 +566,10 @@ void flush_cache_mm(struct mm_struct *mm)
 				flush_user_icache_range_asm(vma->vm_start, vma->vm_end);
 			flush_tlb_range(vma, vma->vm_start, vma->vm_end);
 		}
+		preempt_enable();
 		return;
 	}
+	preempt_enable();
 
 	pgd = mm->pgd;
 	for (vma = mm->mmap; vma; vma = vma->vm_next) {

I noticed that flush_cache_range() has the same problem. Helge, let me know whether i should send a v2 with an additional patch, or a single follow up patch. Both functions also look very similar, so i think best would be to combine the code of these two functions.

maintainer
#3 lore raw

Re: [PATCH 1/4] parisc: disable preemption during local tlb flush

Quoted 33 lines · Sven Schnelle
Quoted 31 lines · Sven Schnelle

flush_cache_mm() fetches %sr3 via mtsp(3). If it matches mm->context, it flushes caches and the TLB. However, the TLB is cpu-local, so if the code gets preempted shortly after the mtsp(), and later resumed on another CPU, the wrong TLB is flushed.

---
 arch/parisc/kernel/cache.c | 3 +++
 1 file changed, 3 insertions(+)
arch/parisc/kernel/cache.c +3 -0
index 39e02227e231..90656c49bc07 100644
@@ -558,6 +558,7 @@ void flush_cache_mm(struct mm_struct *mm)
 		return;
 	}
 
+	preempt_disable();
 	if (mm->context == mfsp(3)) {
 		for (vma = mm->mmap; vma; vma = vma->vm_next) {
 			flush_user_dcache_range_asm(vma->vm_start, vma->vm_end);
@@ -565,8 +566,10 @@ void flush_cache_mm(struct mm_struct *mm)
 				flush_user_icache_range_asm(vma->vm_start, vma->vm_end);
 			flush_tlb_range(vma, vma->vm_start, vma->vm_end);
 		}
+		preempt_enable();
 		return;
 	}
+	preempt_enable();
 
Quoted 7 lines

arch/parisc/kernel/cache.c void flush_cache_mm(struct mm_struct *mm) · line 575

Quoted 2 lines
arch/parisc/kernel/cache.c +0 -0
 	pgd = mm->pgd;
 	for (vma = mm->mmap; vma; vma = vma->vm_next) {

I noticed that flush_cache_range() has the same problem. Helge, let me know whether i should send a v2 with an additional patch, or a single follow up patch. Both functions also look very similar, so i think best would be to combine the code of these two functions.

I'm fine with either option.

Thanks for your patches!
Helge

#4 lore raw

PATCH 2/4 parisc: fix preempt_count() check in entry.S

In reply to Sven Schnelle

preempt_count in struct thread_info is unsigned int, but the entry.S code used LDREG, which generates a 64 bit load when compiled for 64 bit. Fix this to use an ldw and also change the condition in the compare one line below to only compares 32 bits, although ldw zero extends, and that should work with a 64 bit compare.

---
 arch/parisc/kernel/entry.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/parisc/kernel/entry.S +2 -2
index 9f939afe6b88..e9e598c18cb0 100644
@@ -974,8 +974,8 @@ intr_do_preempt:
 
 	/* current_thread_info()->preempt_count */
 	mfctl	%cr30, %r1
-	LDREG	TI_PRE_COUNT(%r1), %r19
-	cmpib,COND(<>)	0, %r19, intr_restore	/* if preempt_count > 0 */
+	ldw	TI_PRE_COUNT(%r1), %r19
+	cmpib,<>	0, %r19, intr_restore	/* if preempt_count > 0 */
 	nop				/* prev insn branched backwards */
 
 	/* check if we interrupted a critical path */
Signature · 1 line
2.33.0
#5 lore raw

PATCH 3/4 parisc: disable preemption in send_IPI_allbutself()

In reply to Sven Schnelle

Otherwise we might not stop all other CPUs.

---
 arch/parisc/kernel/smp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/parisc/kernel/smp.c +3 -1
index 1405b603b91b..3413e6949c87 100644
@@ -219,11 +219,13 @@ static inline void
 send_IPI_allbutself(enum ipi_message_type op)
 {
 	int i;
-	
+
+	preempt_disable();
 	for_each_online_cpu(i) {
 		if (i != smp_processor_id())
 			send_IPI_single(i, op);
 	}
+	preempt_enable();
 }
 
 
Signature · 1 line
2.33.0
#6 lore raw

PATCH 4/4 parisc: fix warning in flush_tlb_all

In reply to Sven Schnelle

I've got the following splat after enabling preemption:

[    3.724721] BUG: using __this_cpu_add() in preemptible [00000000] code: swapper/0/1
[    3.734630] caller is __this_cpu_preempt_check+0x38/0x50
[    3.740635] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.15.0-rc4-64bit+ #324
[    3.744605] Hardware name: 9000/785/C8000
[    3.744605] Backtrace:
[    3.744605]  [<00000000401d9d58>] show_stack+0x74/0xb0
[    3.744605]  [<0000000040c27bd4>] dump_stack_lvl+0x10c/0x188
[    3.744605]  [<0000000040c27c84>] dump_stack+0x34/0x48
[    3.744605]  [<0000000040c33438>] check_preemption_disabled+0x178/0x1b0
[    3.744605]  [<0000000040c334f8>] __this_cpu_preempt_check+0x38/0x50
[    3.744605]  [<00000000401d632c>] flush_tlb_all+0x58/0x2e0
[    3.744605]  [<00000000401075c0>] 0x401075c0
[    3.744605]  [<000000004010b8fc>] 0x4010b8fc
[    3.744605]  [<00000000401080fc>] 0x401080fc
[    3.744605]  [<00000000401d5224>] do_one_initcall+0x128/0x378
[    3.744605]  [<0000000040102de8>] 0x40102de8
[    3.744605]  [<0000000040c33864>] kernel_init+0x60/0x3a8
[    3.744605]  [<00000000401d1020>] ret_from_kernel_thread+0x20/0x28
[    3.744605]

Fix this by moving the __inc_irq_stat() into the locked section.

---
 arch/parisc/mm/init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/parisc/mm/init.c +2 -2
index 3f7d6d5b56ac..65f50f072a87 100644
@@ -842,9 +842,9 @@ void flush_tlb_all(void)
 {
 	int do_recycle;
 
-	__inc_irq_stat(irq_tlb_count);
 	do_recycle = 0;
 	spin_lock(&sid_lock);
+	__inc_irq_stat(irq_tlb_count);
 	if (dirty_space_ids > RECYCLE_THRESHOLD) {
 	    BUG_ON(recycle_inuse);  /* FIXME: Use a semaphore/wait queue here */
 	    get_dirty_sids(&recycle_ndirty,recycle_dirty_array);
@@ -863,8 +863,8 @@ void flush_tlb_all(void)
 #else
 void flush_tlb_all(void)
 {
-	__inc_irq_stat(irq_tlb_count);
 	spin_lock(&sid_lock);
+	__inc_irq_stat(irq_tlb_count);
 	flush_tlb_all_local(NULL);
 	recycle_sids();
 	spin_unlock(&sid_lock);
Signature · 1 line
2.33.0