Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'core_urgent_for_v6.3_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Borislav Petkov:
- Do the delayed RCU wakeup for kthreads in the proper order so that
former doesn't get ignored
- A noinstr warning fix
* tag 'core_urgent_for_v6.3_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
entry/rcu: Check TIF_RESCHED _after_ delayed RCU wake-up
entry: Fix noinstr warning in __enter_from_user_mode()
+6
-2
+1
include/linux/context_tracking.h
+1
include/linux/context_tracking.h
···
96
96
static inline int exception_enter(void) { return 0; }
97
97
static inline void exception_exit(enum ctx_state prev_ctx) { }
98
98
static inline int ct_state(void) { return -1; }
99
+
static inline int __ct_state(void) { return -1; }
99
100
static __always_inline bool context_tracking_guest_enter(void) { return false; }
100
101
static inline void context_tracking_guest_exit(void) { }
101
102
#define CT_WARN_ON(cond) do { } while (0)
+2
include/linux/context_tracking_state.h
+2
include/linux/context_tracking_state.h
···
46
46
47
47
#ifdef CONFIG_CONTEXT_TRACKING
48
48
DECLARE_PER_CPU(struct context_tracking, context_tracking);
49
+
#endif
49
50
51
+
#ifdef CONFIG_CONTEXT_TRACKING_USER
50
52
static __always_inline int __ct_state(void)
51
53
{
52
54
return arch_atomic_read(this_cpu_ptr(&context_tracking.state)) & CT_STATE_MASK;
+3
-2
kernel/entry/common.c
+3
-2
kernel/entry/common.c
···
21
21
arch_enter_from_user_mode(regs);
22
22
lockdep_hardirqs_off(CALLER_ADDR0);
23
23
24
-
CT_WARN_ON(ct_state() != CONTEXT_USER);
24
+
CT_WARN_ON(__ct_state() != CONTEXT_USER);
25
25
user_exit_irqoff();
26
26
27
27
instrumentation_begin();
···
192
192
193
193
static void exit_to_user_mode_prepare(struct pt_regs *regs)
194
194
{
195
-
unsigned long ti_work = read_thread_flags();
195
+
unsigned long ti_work;
196
196
197
197
lockdep_assert_irqs_disabled();
198
198
199
199
/* Flush pending rcuog wakeup before the last need_resched() check */
200
200
tick_nohz_user_enter_prepare();
201
201
202
+
ti_work = read_thread_flags();
202
203
if (unlikely(ti_work & EXIT_TO_USER_MODE_WORK))
203
204
ti_work = exit_to_user_mode_loop(regs, ti_work);
204
205