Skip to content
Snippets Groups Projects
Commit d3ca7877 authored by Zhouyi Zhou's avatar Zhouyi Zhou Committed by Greg Kroah-Hartman
Browse files

rcu: Fix macro name CONFIG_TASKS_RCU_TRACE


[ Upstream commit fed31a4d ]

This commit fixes several typos where CONFIG_TASKS_RCU_TRACE should
instead be CONFIG_TASKS_TRACE_RCU.  Among other things, these typos
could cause CONFIG_TASKS_TRACE_RCU_READ_MB=y kernels to suffer from
memory-ordering bugs that could result in false-positive quiescent
states and too-short grace periods.

Signed-off-by: default avatarZhouyi Zhou <zhouzhouyi@gmail.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 34609faa
No related branches found
No related tags found
1 merge request!15.10.61 -> 5.10.152 upgrade
...@@ -163,7 +163,7 @@ void synchronize_rcu_tasks(void); ...@@ -163,7 +163,7 @@ void synchronize_rcu_tasks(void);
# define synchronize_rcu_tasks synchronize_rcu # define synchronize_rcu_tasks synchronize_rcu
# endif # endif
# ifdef CONFIG_TASKS_RCU_TRACE # ifdef CONFIG_TASKS_TRACE_RCU
# define rcu_tasks_trace_qs(t) \ # define rcu_tasks_trace_qs(t) \
do { \ do { \
if (!likely(READ_ONCE((t)->trc_reader_checked)) && \ if (!likely(READ_ONCE((t)->trc_reader_checked)) && \
......
...@@ -2591,17 +2591,17 @@ static void noinstr rcu_dynticks_task_exit(void) ...@@ -2591,17 +2591,17 @@ static void noinstr rcu_dynticks_task_exit(void)
/* Turn on heavyweight RCU tasks trace readers on idle/user entry. */ /* Turn on heavyweight RCU tasks trace readers on idle/user entry. */
static void rcu_dynticks_task_trace_enter(void) static void rcu_dynticks_task_trace_enter(void)
{ {
#ifdef CONFIG_TASKS_RCU_TRACE #ifdef CONFIG_TASKS_TRACE_RCU
if (IS_ENABLED(CONFIG_TASKS_TRACE_RCU_READ_MB)) if (IS_ENABLED(CONFIG_TASKS_TRACE_RCU_READ_MB))
current->trc_reader_special.b.need_mb = true; current->trc_reader_special.b.need_mb = true;
#endif /* #ifdef CONFIG_TASKS_RCU_TRACE */ #endif /* #ifdef CONFIG_TASKS_TRACE_RCU */
} }
/* Turn off heavyweight RCU tasks trace readers on idle/user exit. */ /* Turn off heavyweight RCU tasks trace readers on idle/user exit. */
static void rcu_dynticks_task_trace_exit(void) static void rcu_dynticks_task_trace_exit(void)
{ {
#ifdef CONFIG_TASKS_RCU_TRACE #ifdef CONFIG_TASKS_TRACE_RCU
if (IS_ENABLED(CONFIG_TASKS_TRACE_RCU_READ_MB)) if (IS_ENABLED(CONFIG_TASKS_TRACE_RCU_READ_MB))
current->trc_reader_special.b.need_mb = false; current->trc_reader_special.b.need_mb = false;
#endif /* #ifdef CONFIG_TASKS_RCU_TRACE */ #endif /* #ifdef CONFIG_TASKS_TRACE_RCU */
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment