Commit 74611ecb authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Add online/offline info to expedited stall warning message 



This commit makes the RCU CPU stall warning message print online/offline
indications immediately after the CPU number.  A "O" indicates global
offline, a "." global online, and a "o" indicates RCU believes that the
CPU is offline for the current grace period and "." otherwise, and an
"N" indicates that RCU believes that the CPU will be offline for the
next grace period, and "." otherwise, all right after the CPU number.
So for CPU 10, you would normally see "10-...:" indicating that everything
believes that the CPU is online.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent dcdb8807

kernel/rcu/tree.c

+8 −1
Original line number Diff line number Diff line
@@ -3737,11 +3737,18 @@ static void synchronize_sched_expedited_wait(struct rcu_state *rsp) 
		pr_err("INFO: %s detected expedited stalls on CPUs: {",

		       rsp->name);

		rcu_for_each_leaf_node(rsp, rnp) {

			(void)rcu_print_task_exp_stall(rnp);

			mask = 1;

			for (cpu = rnp->grplo; cpu <= rnp->grphi; cpu++, mask <<= 1) {

				struct rcu_data *rdp;



				if (!(rnp->expmask & mask))

					continue;

				pr_cont(" %d", cpu);

				rdp = per_cpu_ptr(rsp->rda, cpu);

				pr_cont(" %d-%c%c%c", cpu,

					"O."[cpu_online(cpu)],

					"o."[!!(rdp->grpmask & rnp->expmaskinit)],

					"N."[!!(rdp->grpmask & rnp->expmaskinitnext)]);

			}

			mask <<= 1;

		}

kernel/rcu/tree.h

+1 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ static bool rcu_preempt_has_tasks(struct rcu_node *rnp); 
#endif /* #ifdef CONFIG_HOTPLUG_CPU */

static void rcu_print_detail_task_stall(struct rcu_state *rsp);

static int rcu_print_task_stall(struct rcu_node *rnp);

static int rcu_print_task_exp_stall(struct rcu_node *rnp);

static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp);

static void rcu_preempt_check_callbacks(void);

void call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu));

kernel/rcu/tree_plugin.h

+31 −0
Original line number Diff line number Diff line
@@ -585,6 +585,27 @@ static int rcu_print_task_stall(struct rcu_node *rnp) 
	return ndetected;

}



/*

 * Scan the current list of tasks blocked within RCU read-side critical

 * sections, printing out the tid of each that is blocking the current

 * expedited grace period.

 */

static int rcu_print_task_exp_stall(struct rcu_node *rnp)

{

	struct task_struct *t;

	int ndetected = 0;



	if (!rnp->exp_tasks)

		return 0;

	t = list_entry(rnp->exp_tasks->prev,

		       struct task_struct, rcu_node_entry);

	list_for_each_entry_continue(t, &rnp->blkd_tasks, rcu_node_entry) {

		pr_cont(" P%d", t->pid);

		ndetected++;

	}

	return ndetected;

}



/*

 * Check that the list of blocked tasks for the newly completed grace

 * period is in fact empty.  It is a serious bug to complete a grace
@@ -845,6 +866,16 @@ static int rcu_print_task_stall(struct rcu_node *rnp) 
	return 0;

}



/*

 * Because preemptible RCU does not exist, we never have to check for

 * tasks blocked within RCU read-side critical sections that are

 * blocking the current expedited grace period.

 */

static int rcu_print_task_exp_stall(struct rcu_node *rnp)

{

	return 0;

}



/*

 * Because there is no preemptible RCU, there can be no readers blocked,

 * so there is no need to check for blocked tasks.  So check only for

CRA Git | Maintained and supported by SUSTech CRA and CCSE