enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/x86/include/asm/preempt.h
..
..
@@ -8,6 +8,9 @@
8
8
 
9
9
 DECLARE_PER_CPU(int, __preempt_count);
10
10
 
11
+/* We use the MSB mostly because its available */
12
+#define PREEMPT_NEED_RESCHED	0x80000000
13
+
11
14
 /*
12
15
  * We use the PREEMPT_NEED_RESCHED bit as an inverted NEED_RESCHED such
13
16
  * that a decrement hitting 0 means we can and should reschedule.
..
..
@@ -40,7 +43,7 @@
40
43
 #define init_task_preempt_count(p) do { } while (0)
41
44
 
42
45
 #define init_idle_preempt_count(p, cpu) do { \
43
-	per_cpu(__preempt_count, (cpu)) = PREEMPT_ENABLED; \
46
+	per_cpu(__preempt_count, (cpu)) = PREEMPT_DISABLED; \
44
47
 } while (0)
45
48
 
46
49
 /*
..
..
@@ -88,7 +91,7 @@
88
91
  */
89
92
 static __always_inline bool ____preempt_count_dec_and_test(void)
90
93
 {
91
-	GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), e);
94
+	return GEN_UNARY_RMWcc("decl", __preempt_count, e, __percpu_arg([var]));
92
95
 }
93
96
 
94
97
 static __always_inline bool __preempt_count_dec_and_test(void)
..
..
@@ -113,7 +116,6 @@
113
116
 {
114
117
 #ifdef CONFIG_PREEMPT_LAZY
115
118
 	u32 tmp;
116
-
117
119
 	tmp = raw_cpu_read_4(__preempt_count);
118
120
 	if (tmp == preempt_offset)
119
121
 		return true;
..
..
@@ -122,6 +124,7 @@
122
124
 	tmp &= ~PREEMPT_NEED_RESCHED;
123
125
 	if (tmp != preempt_offset)
124
126
 		return false;
127
+	/* XXX PREEMPT_LOCK_OFFSET */
125
128
 	if (current_thread_info()->preempt_lazy_count)
126
129
 		return false;
127
130
 	return test_thread_flag(TIF_NEED_RESCHED_LAZY);
..
..
@@ -130,15 +133,18 @@
130
133
 #endif
131
134
 }
132
135
 
133
-#ifdef CONFIG_PREEMPT
134
-  extern asmlinkage void ___preempt_schedule(void);
136
+#ifdef CONFIG_PREEMPTION
137
+#ifdef CONFIG_PREEMPT_RT
138
+  extern void preempt_schedule_lock(void);
139
+#endif
140
+  extern asmlinkage void preempt_schedule_thunk(void);
135
141
 # define __preempt_schedule() \
136
-	asm volatile ("call ___preempt_schedule" : ASM_CALL_CONSTRAINT)
142
+	asm volatile ("call preempt_schedule_thunk" : ASM_CALL_CONSTRAINT)
137
143
 
138
144
   extern asmlinkage void preempt_schedule(void);
139
-  extern asmlinkage void ___preempt_schedule_notrace(void);
145
+  extern asmlinkage void preempt_schedule_notrace_thunk(void);
140
146
 # define __preempt_schedule_notrace() \
141
-	asm volatile ("call ___preempt_schedule_notrace" : ASM_CALL_CONSTRAINT)
147
+	asm volatile ("call preempt_schedule_notrace_thunk" : ASM_CALL_CONSTRAINT)
142
148
 
143
149
   extern asmlinkage void preempt_schedule_notrace(void);
144
150
 #endif