Commit 8344496e authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu-tasks: Conditionally compile show_rcu_tasks_gp_kthreads() 



The show_rcu_tasks_gp_kthreads() function is not invoked by Tiny RCU,
but is nevertheless defined in Tiny RCU builds that enable Tasks Trace
RCU.  This commit therefore conditionally compiles this function so
that it is defined only in builds that actually use it.

Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 5b3cc99b

kernel/rcu/tasks.h

+14 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ module_param(rcu_task_stall_timeout, int, 0644); 
#define RTGS_WAIT_READERS	 9

#define RTGS_INVOKE_CBS		10

#define RTGS_WAIT_CBS		11

#ifndef CONFIG_TINY_RCU

static const char * const rcu_tasks_gp_state_names[] = {

	"RTGS_INIT",

	"RTGS_WAIT_WAIT_CBS",
@@ -117,6 +118,7 @@ static const char * const rcu_tasks_gp_state_names[] = { 
	"RTGS_INVOKE_CBS",

	"RTGS_WAIT_CBS",

};

#endif /* #ifndef CONFIG_TINY_RCU */



////////////////////////////////////////////////////////////////////////

//
@@ -129,6 +131,7 @@ static void set_tasks_gp_state(struct rcu_tasks *rtp, int newstate) 
	rtp->gp_jiffies = jiffies;

}



#ifndef CONFIG_TINY_RCU

/* Return state name. */

static const char *tasks_gp_state_getname(struct rcu_tasks *rtp)

{
@@ -139,6 +142,7 @@ static const char *tasks_gp_state_getname(struct rcu_tasks *rtp) 
		return "???";

	return rcu_tasks_gp_state_names[j];

}

#endif /* #ifndef CONFIG_TINY_RCU */



// Enqueue a callback for the specified flavor of Tasks RCU.

static void call_rcu_tasks_generic(struct rcu_head *rhp, rcu_callback_t func,
@@ -268,6 +272,7 @@ static void __init rcu_tasks_bootup_oddness(void) 


#endif /* #ifndef CONFIG_TINY_RCU */



#ifndef CONFIG_TINY_RCU

/* Dump out rcutorture-relevant state common to all RCU-tasks flavors. */

static void show_rcu_tasks_generic_gp_kthread(struct rcu_tasks *rtp, char *s)

{
@@ -281,6 +286,7 @@ static void show_rcu_tasks_generic_gp_kthread(struct rcu_tasks *rtp, char *s) 
		".C"[!!data_race(rtp->cbs_head)],

		s);

}

#endif /* #ifndef CONFIG_TINY_RCU */



static void exit_tasks_rcu_finish_trace(struct task_struct *t);
@@ -557,10 +563,12 @@ static int __init rcu_spawn_tasks_kthread(void) 
}

core_initcall(rcu_spawn_tasks_kthread);



#ifndef CONFIG_TINY_RCU

static void show_rcu_tasks_classic_gp_kthread(void)

{

	show_rcu_tasks_generic_gp_kthread(&rcu_tasks, "");

}

#endif /* #ifndef CONFIG_TINY_RCU */



/* Do the srcu_read_lock() for the above synchronize_srcu().  */

void exit_tasks_rcu_start(void) __acquires(&tasks_rcu_exit_srcu)
@@ -682,10 +690,12 @@ static int __init rcu_spawn_tasks_rude_kthread(void) 
}

core_initcall(rcu_spawn_tasks_rude_kthread);



#ifndef CONFIG_TINY_RCU

static void show_rcu_tasks_rude_gp_kthread(void)

{

	show_rcu_tasks_generic_gp_kthread(&rcu_tasks_rude, "");

}

#endif /* #ifndef CONFIG_TINY_RCU */



#else /* #ifdef CONFIG_TASKS_RUDE_RCU */

static void show_rcu_tasks_rude_gp_kthread(void) {}
@@ -1164,6 +1174,7 @@ static int __init rcu_spawn_tasks_trace_kthread(void) 
}

core_initcall(rcu_spawn_tasks_trace_kthread);



#ifndef CONFIG_TINY_RCU

static void show_rcu_tasks_trace_gp_kthread(void)

{

	char buf[64];
@@ -1174,18 +1185,21 @@ static void show_rcu_tasks_trace_gp_kthread(void) 
		data_race(n_heavy_reader_attempts));

	show_rcu_tasks_generic_gp_kthread(&rcu_tasks_trace, buf);

}

#endif /* #ifndef CONFIG_TINY_RCU */



#else /* #ifdef CONFIG_TASKS_TRACE_RCU */

static void exit_tasks_rcu_finish_trace(struct task_struct *t) { }

static inline void show_rcu_tasks_trace_gp_kthread(void) {}

#endif /* #else #ifdef CONFIG_TASKS_TRACE_RCU */



#ifndef CONFIG_TINY_RCU

void show_rcu_tasks_gp_kthreads(void)

{

	show_rcu_tasks_classic_gp_kthread();

	show_rcu_tasks_rude_gp_kthread();

	show_rcu_tasks_trace_gp_kthread();

}

#endif /* #ifndef CONFIG_TINY_RCU */



#else /* #ifdef CONFIG_TASKS_RCU_GENERIC */

static inline void rcu_tasks_bootup_oddness(void) {}

CRA Git | Maintained and supported by SUSTech CRA and CCSE