Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8a29b3b authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Paul E. McKenney
Browse files

rcu: Define tracepoint strings only if CONFIG_TRACING is set 



Commit f7f7bac9 ("rcu: Have the RCU tracepoints use the tracepoint_string
infrastructure") unconditionally populates the __tracepoint_str input section,
but this section is not assigned an output section if CONFIG_TRACING is not set.
This results in the __tracepoint_str turning up in unexpected places, i.e.,
after _edata.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 85b39d30

kernel/rcu/tree.c

+12 −3
Original line number Original line Diff line number Diff line
@@ -79,9 +79,18 @@ static struct lock_class_key rcu_fqs_class[RCU_NUM_LVLS]; 
 * the tracing userspace tools to be able to decipher the string

 * the tracing userspace tools to be able to decipher the string

 * address to the matching string.

 * address to the matching string.

 */

 */

#define RCU_STATE_INITIALIZER(sname, sabbr, cr) \

#ifdef CONFIG_TRACING

# define DEFINE_RCU_TPS(sname) \

static char sname##_varname[] = #sname; \

static char sname##_varname[] = #sname; \

static const char *tp_##sname##_varname __used __tracepoint_string = sname##_varname; \

static const char *tp_##sname##_varname __used __tracepoint_string = sname##_varname;

# define RCU_STATE_NAME(sname) sname##_varname

#else

# define DEFINE_RCU_TPS(sname)

# define RCU_STATE_NAME(sname) __stringify(sname)

#endif



#define RCU_STATE_INITIALIZER(sname, sabbr, cr) \

DEFINE_RCU_TPS(sname) \

struct rcu_state sname##_state = { \

struct rcu_state sname##_state = { \

	.level = { &sname##_state.node[0] }, \

	.level = { &sname##_state.node[0] }, \

	.call = cr, \

	.call = cr, \
@@ -93,7 +102,7 @@ struct rcu_state sname##_state = { \ 
	.orphan_donetail = &sname##_state.orphan_donelist, \

	.orphan_donetail = &sname##_state.orphan_donelist, \

	.barrier_mutex = __MUTEX_INITIALIZER(sname##_state.barrier_mutex), \

	.barrier_mutex = __MUTEX_INITIALIZER(sname##_state.barrier_mutex), \

	.onoff_mutex = __MUTEX_INITIALIZER(sname##_state.onoff_mutex), \

	.onoff_mutex = __MUTEX_INITIALIZER(sname##_state.onoff_mutex), \

	.name = sname##_varname, \

	.name = RCU_STATE_NAME(sname), \

	.abbr = sabbr, \

	.abbr = sabbr, \

}; \

}; \

DEFINE_PER_CPU(struct rcu_data, sname##_data)

DEFINE_PER_CPU(struct rcu_data, sname##_data)