blob: 430b7295c32d6f2ee89e3b265e9f0fc931005f25 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From 6f0e27cbe8c66801cdad07e48be779eff3301cc1 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Tue, 26 Feb 2019 14:53:49 +0100
Subject: [PATCH 241/347] x86: lazy-preempt: use proper return label on
32bit-x86
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz
The lazy-preempt uses the wrong return label in case preemption isn't
possible. This results crash while returning to the kernel.
Use the correct return label if preemption isn' possible.
Reported-by: Andri Yngvason <andri@yngvason.is>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
arch/x86/entry/entry_32.S | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index 324b7539eaab..d8b40085c2b8 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -759,15 +759,15 @@ ENTRY(resume_kernel)
# atleast preempt count == 0 ?
cmpl $_PREEMPT_ENABLED,PER_CPU_VAR(__preempt_count)
- jne restore_all
+ jne restore_all_kernel
movl PER_CPU_VAR(current_task), %ebp
cmpl $0,TASK_TI_preempt_lazy_count(%ebp) # non-zero preempt_lazy_count ?
- jnz restore_all
+ jnz restore_all_kernel
testl $_TIF_NEED_RESCHED_LAZY, TASK_TI_flags(%ebp)
- jz restore_all
- test_int_off:
+ jz restore_all_kernel
+test_int_off:
#endif
testl $X86_EFLAGS_IF, PT_EFLAGS(%esp) # interrupts off (exception path) ?
jz restore_all_kernel
--
2.36.1
|
