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

Commit 6b50e119 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcutorture: Print symbolic name for ->gp_state 



Currently, ->gp_state is printed as an integer, which slows debugging.
This commit therefore prints a symbolic name in addition to the integer.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
[ paulmck: Updated to fix relational operator called out by Dan Carpenter. ]
[ paulmck: More "const", as suggested by Josh Triplett. ]
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 18aff33e

kernel/rcu/tree.c

+13 −2
Original line number Diff line number Diff line
@@ -1186,6 +1186,16 @@ static void record_gp_stall_check_time(struct rcu_state *rsp) 
	rsp->n_force_qs_gpstart = READ_ONCE(rsp->n_force_qs);

}



/*

 * Convert a ->gp_state value to a character string.

 */

static const char *gp_state_getname(short gs)

{

	if (gs < 0 || gs >= ARRAY_SIZE(gp_state_names))

		return "???";

	return gp_state_names[gs];

}



/*

 * Complain about starvation of grace-period kthread.

 */
@@ -1197,10 +1207,11 @@ static void rcu_check_gp_kthread_starvation(struct rcu_state *rsp) 
	j = jiffies;

	gpa = READ_ONCE(rsp->gp_activity);

	if (j - gpa > 2 * HZ) {

		pr_err("%s kthread starved for %ld jiffies! g%lu c%lu f%#x s%d ->state=%#lx\n",

		pr_err("%s kthread starved for %ld jiffies! g%lu c%lu f%#x %s(%d) ->state=%#lx\n",

		       rsp->name, j - gpa,

		       rsp->gpnum, rsp->completed,

		       rsp->gp_flags, rsp->gp_state,

		       rsp->gp_flags,

		       gp_state_getname(rsp->gp_state), rsp->gp_state,

		       rsp->gp_kthread ? rsp->gp_kthread->state : ~0);

		if (rsp->gp_kthread)

			sched_show_task(rsp->gp_kthread);

kernel/rcu/tree.h

+12 −0
Original line number Diff line number Diff line
@@ -545,6 +545,18 @@ struct rcu_state { 
#define RCU_GP_CLEANUP   5	/* Grace-period cleanup started. */

#define RCU_GP_CLEANED   6	/* Grace-period cleanup complete. */



#ifndef RCU_TREE_NONCORE

static const char * const gp_state_names[] = {

	"RCU_GP_IDLE",

	"RCU_GP_WAIT_GPS",

	"RCU_GP_DONE_GPS",

	"RCU_GP_WAIT_FQS",

	"RCU_GP_DOING_FQS",

	"RCU_GP_CLEANUP",

	"RCU_GP_CLEANED",

};

#endif /* #ifndef RCU_TREE_NONCORE */



extern struct list_head rcu_struct_flavors;



/* Sequence through rcu_state structures for each RCU flavor. */