forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390 
 kernel/arch/x86/include/asm/thread_info.h
....@@ -88,10 +88,12 @@
8888 #define TIF_USER_RETURN_NOTIFY	11	/* notify kernel of userspace return */
8989 #define TIF_UPROBE		12	/* breakpointed or singlestepping */
9090 #define TIF_PATCH_PENDING	13	/* pending live patching update */
91
+#define TIF_NEED_FPU_LOAD	14	/* load FPU on return to userspace */
9192 #define TIF_NOCPUID		15	/* CPUID is not accessible in userland */
9293 #define TIF_NOTSC		16	/* TSC is not accessible in userland */
9394 #define TIF_IA32		17	/* IA32 compatibility process */
94
-#define TIF_NOHZ		19	/* in adaptive nohz mode */
95
+#define TIF_SLD			18	/* Restore split lock detection on context switch */
96
+#define TIF_NOTIFY_SIGNAL	19	/* signal notifications exist */
9597 #define TIF_MEMDIE		20	/* is terminating due to OOM killer */
9698 #define TIF_POLLING_NRFLAG	21	/* idle is polling for TIF_NEED_RESCHED */
9799 #define TIF_IO_BITMAP		22	/* uses I/O bitmap */
....@@ -101,7 +103,6 @@
101103 #define TIF_SYSCALL_TRACEPOINT	28	/* syscall tracepoint instrumentation */
102104 #define TIF_ADDR32		29	/* 32-bit address space on 64 bits */
103105 #define TIF_X32			30	/* 32-bit native x86-64 binary */
104
-#define TIF_FSCHECK		31	/* Check FS is USER_DS on return */
105106 
106107 #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
107108 #define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
....@@ -117,10 +118,12 @@
117118 #define _TIF_USER_RETURN_NOTIFY	(1 << TIF_USER_RETURN_NOTIFY)
118119 #define _TIF_UPROBE		(1 << TIF_UPROBE)
119120 #define _TIF_PATCH_PENDING	(1 << TIF_PATCH_PENDING)
121
+#define _TIF_NEED_FPU_LOAD	(1 << TIF_NEED_FPU_LOAD)
120122 #define _TIF_NOCPUID		(1 << TIF_NOCPUID)
121123 #define _TIF_NOTSC		(1 << TIF_NOTSC)
122124 #define _TIF_IA32		(1 << TIF_IA32)
123
-#define _TIF_NOHZ		(1 << TIF_NOHZ)
125
+#define _TIF_NOTIFY_SIGNAL	(1 << TIF_NOTIFY_SIGNAL)
126
+#define _TIF_SLD		(1 << TIF_SLD)
124127 #define _TIF_POLLING_NRFLAG	(1 << TIF_POLLING_NRFLAG)
125128 #define _TIF_IO_BITMAP		(1 << TIF_IO_BITMAP)
126129 #define _TIF_FORCED_TF		(1 << TIF_FORCED_TF)
....@@ -129,29 +132,11 @@
129132 #define _TIF_SYSCALL_TRACEPOINT	(1 << TIF_SYSCALL_TRACEPOINT)
130133 #define _TIF_ADDR32		(1 << TIF_ADDR32)
131134 #define _TIF_X32		(1 << TIF_X32)
132
-#define _TIF_FSCHECK		(1 << TIF_FSCHECK)
133
-
134
-/*
135
- * work to do in syscall_trace_enter().  Also includes TIF_NOHZ for
136
- * enter_from_user_mode()
137
- */
138
-#define _TIF_WORK_SYSCALL_ENTRY	\
139
-	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT |	\
140
-	 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT |	\
141
-	 _TIF_NOHZ)
142
-
143
-/* work to do on any return to user space */
144
-#define _TIF_ALLWORK_MASK						\
145
-	(_TIF_SYSCALL_TRACE | _TIF_NOTIFY_RESUME | _TIF_SIGPENDING |	\
146
-	 _TIF_NEED_RESCHED | _TIF_SINGLESTEP | _TIF_SYSCALL_EMU |	\
147
-	 _TIF_SYSCALL_AUDIT | _TIF_USER_RETURN_NOTIFY | _TIF_UPROBE |	\
148
-	 _TIF_PATCH_PENDING | _TIF_NOHZ | _TIF_SYSCALL_TRACEPOINT |	\
149
-	 _TIF_FSCHECK)
150135 
151136 /* flags to check in __switch_to() */
152
-#define _TIF_WORK_CTXSW_BASE						\
153
-	(_TIF_IO_BITMAP|_TIF_NOCPUID|_TIF_NOTSC|_TIF_BLOCKSTEP|		\
154
-	 _TIF_SSBD | _TIF_SPEC_FORCE_UPDATE)
137
+#define _TIF_WORK_CTXSW_BASE					\
138
+	(_TIF_NOCPUID | _TIF_NOTSC | _TIF_BLOCKSTEP |		\
139
+	 _TIF_SSBD | _TIF_SPEC_FORCE_UPDATE | _TIF_SLD)
155140 
156141 /*
157142  * Avoid calls to __switch_to_xtra() on UP as STIBP is not evaluated.
....@@ -162,8 +147,14 @@
162147 # define _TIF_WORK_CTXSW	(_TIF_WORK_CTXSW_BASE)
163148 #endif
164149 
165
-#define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
166
-#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
150
+#ifdef CONFIG_X86_IOPL_IOPERM
151
+# define _TIF_WORK_CTXSW_PREV	(_TIF_WORK_CTXSW| _TIF_USER_RETURN_NOTIFY | \
152
+				 _TIF_IO_BITMAP)
153
+#else
154
+# define _TIF_WORK_CTXSW_PREV	(_TIF_WORK_CTXSW| _TIF_USER_RETURN_NOTIFY)
155
+#endif
156
+
157
+#define _TIF_WORK_CTXSW_NEXT	(_TIF_WORK_CTXSW)
167158 
168159 #define STACK_WARN		(THREAD_SIZE/8)
169160 
....@@ -259,15 +250,6 @@
259250 #define in_ia32_syscall() (IS_ENABLED(CONFIG_IA32_EMULATION) && \
260251 			   current_thread_info()->status & TS_COMPAT)
261252 #endif
262
-
263
-/*
264
- * Force syscall return via IRET by making it look as if there was
265
- * some work pending. IRET is our most capable (but slowest) syscall
266
- * return path, which is able to restore modified SS, CS and certain
267
- * EFLAGS values that other (fast) syscall return instructions
268
- * are not able to restore properly.
269
- */
270
-#define force_iret() set_thread_flag(TIF_NOTIFY_RESUME)
271253 
272254 extern void arch_task_cache_init(void);
273255 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);