Skip to content

Commit 8aacd1e

Browse files
balbir-awsKAGA-KOKO
authored andcommitted
x86/process: Make room for TIF_SPEC_L1D_FLUSH
The upcoming support for paranoid L1D flush in switch_mm() requires that TIF_SPEC_IB and the new TIF_SPEC_L1D_FLUSH are two consecutive bits in thread_info::flags. Move TIF_SPEC_FORCE_UPDATE to a spare bit to make room for the new one. Suggested-by: Thomas Gleixner <[email protected]> Signed-off-by: Balbir Singh <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 58e106e commit 8aacd1e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/include/asm/thread_info.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ struct thread_info {
8181
#define TIF_SINGLESTEP 4 /* reenable singlestep on user return*/
8282
#define TIF_SSBD 5 /* Speculative store bypass disable */
8383
#define TIF_SPEC_IB 9 /* Indirect branch speculation mitigation */
84-
#define TIF_SPEC_FORCE_UPDATE 10 /* Force speculation MSR update in context switch */
8584
#define TIF_USER_RETURN_NOTIFY 11 /* notify kernel of userspace return */
8685
#define TIF_UPROBE 12 /* breakpointed or singlestepping */
8786
#define TIF_PATCH_PENDING 13 /* pending live patching update */
@@ -93,6 +92,7 @@ struct thread_info {
9392
#define TIF_MEMDIE 20 /* is terminating due to OOM killer */
9493
#define TIF_POLLING_NRFLAG 21 /* idle is polling for TIF_NEED_RESCHED */
9594
#define TIF_IO_BITMAP 22 /* uses I/O bitmap */
95+
#define TIF_SPEC_FORCE_UPDATE 23 /* Force speculation MSR update in context switch */
9696
#define TIF_FORCED_TF 24 /* true if TF in eflags artificially */
9797
#define TIF_BLOCKSTEP 25 /* set when we want DEBUGCTLMSR_BTF */
9898
#define TIF_LAZY_MMU_UPDATES 27 /* task is updating the mmu lazily */
@@ -104,7 +104,6 @@ struct thread_info {
104104
#define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP)
105105
#define _TIF_SSBD (1 << TIF_SSBD)
106106
#define _TIF_SPEC_IB (1 << TIF_SPEC_IB)
107-
#define _TIF_SPEC_FORCE_UPDATE (1 << TIF_SPEC_FORCE_UPDATE)
108107
#define _TIF_USER_RETURN_NOTIFY (1 << TIF_USER_RETURN_NOTIFY)
109108
#define _TIF_UPROBE (1 << TIF_UPROBE)
110109
#define _TIF_PATCH_PENDING (1 << TIF_PATCH_PENDING)
@@ -115,6 +114,7 @@ struct thread_info {
115114
#define _TIF_SLD (1 << TIF_SLD)
116115
#define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG)
117116
#define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP)
117+
#define _TIF_SPEC_FORCE_UPDATE (1 << TIF_SPEC_FORCE_UPDATE)
118118
#define _TIF_FORCED_TF (1 << TIF_FORCED_TF)
119119
#define _TIF_BLOCKSTEP (1 << TIF_BLOCKSTEP)
120120
#define _TIF_LAZY_MMU_UPDATES (1 << TIF_LAZY_MMU_UPDATES)

0 commit comments

Comments
 (0)