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

Commit 42c3533e authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Fix tracing formatting 



The rcu_state structure's ->completed field is unsigned long, so this
commit adjusts show_one_rcugp()'s printf() format to suit.  Also add
the required ACCESS_ONCE() directives while we are in this function.

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

kernel/rcutree.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -68,8 +68,8 @@ static struct lock_class_key rcu_fqs_class[RCU_NUM_LVLS]; 
	.level = { &sname##_state.node[0] }, \

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

	.call = cr, \

	.call = cr, \

	.fqs_state = RCU_GP_IDLE, \

	.fqs_state = RCU_GP_IDLE, \

	.gpnum = -300, \

	.gpnum = 0UL - 300UL, \

	.completed = -300, \

	.completed = 0UL - 300UL, \

	.orphan_lock = __RAW_SPIN_LOCK_UNLOCKED(&sname##_state.orphan_lock), \

	.orphan_lock = __RAW_SPIN_LOCK_UNLOCKED(&sname##_state.orphan_lock), \

	.orphan_nxttail = &sname##_state.orphan_nxtlist, \

	.orphan_nxttail = &sname##_state.orphan_nxtlist, \

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

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

kernel/rcutree_trace.c

+12 −9
Original line number Original line Diff line number Diff line
@@ -46,6 +46,8 @@ 
#define RCU_TREE_NONCORE

#define RCU_TREE_NONCORE

#include "rcutree.h"

#include "rcutree.h"





#define ulong2long(a) (*(long *)(&(a)))



static int r_open(struct inode *inode, struct file *file,

static int r_open(struct inode *inode, struct file *file,

					const struct seq_operations *op)

					const struct seq_operations *op)

{

{
@@ -116,10 +118,10 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp) 
{

{

	if (!rdp->beenonline)

	if (!rdp->beenonline)

		return;

		return;

	seq_printf(m, "%3d%cc=%lu g=%lu pq=%d qp=%d",

	seq_printf(m, "%3d%cc=%ld g=%ld pq=%d qp=%d",

		   rdp->cpu,

		   rdp->cpu,

		   cpu_is_offline(rdp->cpu) ? '!' : ' ',

		   cpu_is_offline(rdp->cpu) ? '!' : ' ',

		   rdp->completed, rdp->gpnum,

		   ulong2long(rdp->completed), ulong2long(rdp->gpnum),

		   rdp->passed_quiesce, rdp->qs_pending);

		   rdp->passed_quiesce, rdp->qs_pending);

	seq_printf(m, " dt=%d/%llx/%d df=%lu",

	seq_printf(m, " dt=%d/%llx/%d df=%lu",

		   atomic_read(&rdp->dynticks->dynticks),

		   atomic_read(&rdp->dynticks->dynticks),
@@ -246,8 +248,9 @@ static void print_one_rcu_state(struct seq_file *m, struct rcu_state *rsp) 
	struct rcu_node *rnp;

	struct rcu_node *rnp;





	gpnum = rsp->gpnum;

	gpnum = rsp->gpnum;

	seq_printf(m, "%s: c=%lu g=%lu s=%d jfq=%ld j=%x ",

	seq_printf(m, "%s: c=%ld g=%ld s=%d jfq=%ld j=%x ",

		   rsp->name, rsp->completed, gpnum, rsp->fqs_state,

		   rsp->name, ulong2long(rsp->completed), ulong2long(gpnum),

		   rsp->fqs_state,

		   (long)(rsp->jiffies_force_qs - jiffies),

		   (long)(rsp->jiffies_force_qs - jiffies),

		   (int)(jiffies & 0xffff));

		   (int)(jiffies & 0xffff));

	seq_printf(m, "nfqs=%lu/nfqsng=%lu(%lu) fqlh=%lu oqlen=%ld/%ld\n",

	seq_printf(m, "nfqs=%lu/nfqsng=%lu(%lu) fqlh=%lu oqlen=%ld/%ld\n",
@@ -301,16 +304,16 @@ static void show_one_rcugp(struct seq_file *m, struct rcu_state *rsp) 
	struct rcu_node *rnp = &rsp->node[0];

	struct rcu_node *rnp = &rsp->node[0];





	raw_spin_lock_irqsave(&rnp->lock, flags);

	raw_spin_lock_irqsave(&rnp->lock, flags);

	completed = rsp->completed;

	completed = ACCESS_ONCE(rsp->completed);

	gpnum = rsp->gpnum;

	gpnum = ACCESS_ONCE(rsp->gpnum);

	if (rsp->completed == rsp->gpnum)

	if (completed == gpnum)

		gpage = 0;

		gpage = 0;

	else

	else

		gpage = jiffies - rsp->gp_start;

		gpage = jiffies - rsp->gp_start;

	gpmax = rsp->gp_max;

	gpmax = rsp->gp_max;

	raw_spin_unlock_irqrestore(&rnp->lock, flags);

	raw_spin_unlock_irqrestore(&rnp->lock, flags);

	seq_printf(m, "%s: completed=%ld  gpnum=%lu  age=%ld  max=%ld\n",

	seq_printf(m, "%s: completed=%ld  gpnum=%ld  age=%ld  max=%ld\n",

		   rsp->name, completed, gpnum, gpage, gpmax);

		   rsp->name, ulong2long(completed), ulong2long(gpnum), gpage, gpmax);

}

}





static int show_rcugp(struct seq_file *m, void *unused)

static int show_rcugp(struct seq_file *m, void *unused)