forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f 
 kernel/include/linux/preempt.h
....@@ -26,13 +26,13 @@
2626  *         PREEMPT_MASK:	0x000000ff
2727  *         SOFTIRQ_MASK:	0x0000ff00
2828  *         HARDIRQ_MASK:	0x000f0000
29
- *             NMI_MASK:	0x00100000
29
+ *             NMI_MASK:	0x00f00000
3030  * PREEMPT_NEED_RESCHED:	0x80000000
3131  */
3232 #define PREEMPT_BITS	8
3333 #define SOFTIRQ_BITS	8
3434 #define HARDIRQ_BITS	4
35
-#define NMI_BITS	1
35
+#define NMI_BITS	4
3636 
3737 #define PREEMPT_SHIFT	0
3838 #define SOFTIRQ_SHIFT	(PREEMPT_SHIFT + PREEMPT_BITS)
....@@ -51,14 +51,7 @@
5151 #define HARDIRQ_OFFSET	(1UL << HARDIRQ_SHIFT)
5252 #define NMI_OFFSET	(1UL << NMI_SHIFT)
5353 
54
-#ifndef CONFIG_PREEMPT_RT_FULL
55
-# define SOFTIRQ_DISABLE_OFFSET		(2 * SOFTIRQ_OFFSET)
56
-#else
57
-# define SOFTIRQ_DISABLE_OFFSET		(0)
58
-#endif
59
-
60
-/* We use the MSB mostly because its available */
61
-#define PREEMPT_NEED_RESCHED	0x80000000
54
+#define SOFTIRQ_DISABLE_OFFSET	(2 * SOFTIRQ_OFFSET)
6255 
6356 #define PREEMPT_DISABLED	(PREEMPT_DISABLE_OFFSET + PREEMPT_ENABLED)
6457 
....@@ -85,15 +78,9 @@
8578 #include <asm/preempt.h>
8679 
8780 #define hardirq_count()	(preempt_count() & HARDIRQ_MASK)
81
+#define softirq_count()	(preempt_count() & SOFTIRQ_MASK)
8882 #define irq_count()	(preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK \
8983 				 | NMI_MASK))
90
-#ifndef CONFIG_PREEMPT_RT_FULL
91
-# define softirq_count()	(preempt_count() & SOFTIRQ_MASK)
92
-# define in_serving_softirq()	(softirq_count() & SOFTIRQ_OFFSET)
93
-#else
94
-# define softirq_count()	((unsigned long)current->softirq_nestcnt)
95
-extern int in_serving_softirq(void);
96
-#endif
9784 
9885 /*
9986  * Are we doing bottom half or hardware interrupt processing?
....@@ -111,6 +98,7 @@
11198 #define in_irq()		(hardirq_count())
11299 #define in_softirq()		(softirq_count())
113100 #define in_interrupt()		(irq_count())
101
+#define in_serving_softirq()	(softirq_count() & SOFTIRQ_OFFSET)
114102 #define in_nmi()		(preempt_count() & NMI_MASK)
115103 #define in_task()		(!(preempt_count() & \
116104 				   (NMI_MASK | HARDIRQ_MASK | SOFTIRQ_OFFSET)))
....@@ -127,11 +115,7 @@
127115 /*
128116  * The preempt_count offset after spin_lock()
129117  */
130
-#if !defined(CONFIG_PREEMPT_RT_FULL)
131118 #define PREEMPT_LOCK_OFFSET	PREEMPT_DISABLE_OFFSET
132
-#else
133
-#define PREEMPT_LOCK_OFFSET	0
134
-#endif
135119 
136120 /*
137121  * The preempt_count offset needed for things like:
....@@ -180,31 +164,11 @@
180164 #define preempt_count_inc() preempt_count_add(1)
181165 #define preempt_count_dec() preempt_count_sub(1)
182166 
183
-#ifdef CONFIG_PREEMPT_LAZY
184
-#define add_preempt_lazy_count(val)	do { preempt_lazy_count() += (val); } while (0)
185
-#define sub_preempt_lazy_count(val)	do { preempt_lazy_count() -= (val); } while (0)
186
-#define inc_preempt_lazy_count()	add_preempt_lazy_count(1)
187
-#define dec_preempt_lazy_count()	sub_preempt_lazy_count(1)
188
-#define preempt_lazy_count()		(current_thread_info()->preempt_lazy_count)
189
-#else
190
-#define add_preempt_lazy_count(val)	do { } while (0)
191
-#define sub_preempt_lazy_count(val)	do { } while (0)
192
-#define inc_preempt_lazy_count()	do { } while (0)
193
-#define dec_preempt_lazy_count()	do { } while (0)
194
-#define preempt_lazy_count()		(0)
195
-#endif
196
-
197167 #ifdef CONFIG_PREEMPT_COUNT
198168 
199169 #define preempt_disable() \
200170 do { \
201171 	preempt_count_inc(); \
202
-	barrier(); \
203
-} while (0)
204
-
205
-#define preempt_lazy_disable() \
206
-do { \
207
-	inc_preempt_lazy_count(); \
208172 	barrier(); \
209173 } while (0)
210174 
....@@ -214,42 +178,11 @@
214178 	preempt_count_dec(); \
215179 } while (0)
216180 
217
-#ifdef CONFIG_PREEMPT_RT_BASE
218
-# define preempt_enable_no_resched() sched_preempt_enable_no_resched()
219
-# define preempt_check_resched_rt() preempt_check_resched()
220
-#else
221
-# define preempt_enable_no_resched() preempt_enable()
222
-# define preempt_check_resched_rt() barrier();
223
-#endif
181
+#define preempt_enable_no_resched() sched_preempt_enable_no_resched()
224182 
225183 #define preemptible()	(preempt_count() == 0 && !irqs_disabled())
226184 
227
-#if defined(CONFIG_SMP) && defined(CONFIG_PREEMPT_RT_BASE)
228
-
229
-extern void migrate_disable(void);
230
-extern void migrate_enable(void);
231
-
232
-int __migrate_disabled(struct task_struct *p);
233
-
234
-#elif !defined(CONFIG_SMP) && defined(CONFIG_PREEMPT_RT_BASE)
235
-
236
-extern void migrate_disable(void);
237
-extern void migrate_enable(void);
238
-static inline int __migrate_disabled(struct task_struct *p)
239
-{
240
-	return 0;
241
-}
242
-
243
-#else
244
-#define migrate_disable()		preempt_disable()
245
-#define migrate_enable()		preempt_enable()
246
-static inline int __migrate_disabled(struct task_struct *p)
247
-{
248
-	return 0;
249
-}
250
-#endif
251
-
252
-#ifdef CONFIG_PREEMPT
185
+#ifdef CONFIG_PREEMPTION
253186 #define preempt_enable() \
254187 do { \
255188 	barrier(); \
....@@ -270,24 +203,11 @@
270203 		__preempt_schedule(); \
271204 } while (0)
272205 
273
-#define preempt_lazy_enable() \
274
-do { \
275
-	dec_preempt_lazy_count(); \
276
-	barrier(); \
277
-	preempt_check_resched(); \
278
-} while (0)
279
-
280
-#else /* !CONFIG_PREEMPT */
206
+#else /* !CONFIG_PREEMPTION */
281207 #define preempt_enable() \
282208 do { \
283209 	barrier(); \
284210 	preempt_count_dec(); \
285
-} while (0)
286
-
287
-#define preempt_lazy_enable() \
288
-do { \
289
-	dec_preempt_lazy_count(); \
290
-	barrier(); \
291211 } while (0)
292212 
293213 #define preempt_enable_notrace() \
....@@ -297,7 +217,7 @@
297217 } while (0)
298218 
299219 #define preempt_check_resched() do { } while (0)
300
-#endif /* CONFIG_PREEMPT */
220
+#endif /* CONFIG_PREEMPTION */
301221 
302222 #define preempt_disable_notrace() \
303223 do { \
....@@ -328,16 +248,8 @@
328248 #define preempt_disable_notrace()		barrier()
329249 #define preempt_enable_no_resched_notrace()	barrier()
330250 #define preempt_enable_notrace()		barrier()
331
-#define preempt_check_resched_rt()		barrier()
332251 #define preemptible()				0
333252 
334
-#define migrate_disable()			barrier()
335
-#define migrate_enable()			barrier()
336
-
337
-static inline int __migrate_disabled(struct task_struct *p)
338
-{
339
-	return 0;
340
-}
341253 #endif /* CONFIG_PREEMPT_COUNT */
342254 
343255 #ifdef MODULE
....@@ -356,21 +268,9 @@
356268 } while (0)
357269 #define preempt_fold_need_resched() \
358270 do { \
359
-	if (tif_need_resched_now()) \
271
+	if (tif_need_resched()) \
360272 		set_preempt_need_resched(); \
361273 } while (0)
362
-
363
-#ifdef CONFIG_PREEMPT_RT_FULL
364
-# define preempt_disable_rt()		preempt_disable()
365
-# define preempt_enable_rt()		preempt_enable()
366
-# define preempt_disable_nort()		barrier()
367
-# define preempt_enable_nort()		barrier()
368
-#else
369
-# define preempt_disable_rt()		barrier()
370
-# define preempt_enable_rt()		barrier()
371
-# define preempt_disable_nort()		preempt_disable()
372
-# define preempt_enable_nort()		preempt_enable()
373
-#endif
374274 
375275 #ifdef CONFIG_PREEMPT_NOTIFIERS
376276 
....@@ -422,4 +322,34 @@
422322 
423323 #endif
424324 
325
+/**
326
+ * migrate_disable - Prevent migration of the current task
327
+ *
328
+ * Maps to preempt_disable() which also disables preemption. Use
329
+ * migrate_disable() to annotate that the intent is to prevent migration,
330
+ * but not necessarily preemption.
331
+ *
332
+ * Can be invoked nested like preempt_disable() and needs the corresponding
333
+ * number of migrate_enable() invocations.
334
+ */
335
+static __always_inline void migrate_disable(void)
336
+{
337
+	preempt_disable();
338
+}
339
+
340
+/**
341
+ * migrate_enable - Allow migration of the current task
342
+ *
343
+ * Counterpart to migrate_disable().
344
+ *
345
+ * As migrate_disable() can be invoked nested, only the outermost invocation
346
+ * reenables migration.
347
+ *
348
+ * Currently mapped to preempt_enable().
349
+ */
350
+static __always_inline void migrate_enable(void)
351
+{
352
+	preempt_enable();
353
+}
354
+
425355 #endif /* __LINUX_PREEMPT_H */