Subject: Re: linux-next: manual merge of the rcu tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 22 Jun 2021 15:04:07 +1000

Hi all,

On Tue, 22 Jun 2021 14:47:57 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> @@@ -732,23 -816,34 +816,34 @@@ void show_rcu_gp_kthreads(void
>   	struct task_struct *t = READ_ONCE(rcu_state.gp_kthread);
>   
>   	j = jiffies;
> - 	ja = j - data_race(rcu_state.gp_activity);
> - 	jr = j - data_race(rcu_state.gp_req_activity);
> - 	jw = j - data_race(rcu_state.gp_wake_time);
> - 	pr_info("%s: wait state: %s(%d) ->state: %#x delta ->gp_activity %lu ->gp_req_activity %lu ->gp_wake_time %lu ->gp_wake_seq %ld ->gp_seq %ld ->gp_seq_needed %ld ->gp_flags %#x\n",
> + 	ja = j - data_race(READ_ONCE(rcu_state.gp_activity));
> + 	jr = j - data_race(READ_ONCE(rcu_state.gp_req_activity));
> + 	js = j - data_race(READ_ONCE(rcu_state.gp_start));
> + 	jw = j - data_race(READ_ONCE(rcu_state.gp_wake_time));
>  -	pr_info("%s: wait state: %s(%d) ->state: %#lx ->rt_priority %u delta ->gp_start %lu ->gp_activity %lu ->gp_req_activity %lu ->gp_wake_time %lu ->gp_wake_seq %ld ->gp_seq %ld ->gp_seq_needed %ld ->gp_max %lu ->gp_flags %#x\n",
> ++	pr_info("%s: wait state: %s(%d) ->state: %#x ->rt_priority %u delta ->gp_start %lu ->gp_activity %lu ->gp_req_activity %lu ->gp_wake_time %lu ->gp_wake_seq %ld ->gp_seq %ld ->gp_seq_needed %ld ->gp_max %lu ->gp_flags %#x\n",
>   		rcu_state.name, gp_state_getname(rcu_state.gp_state),
> - 		rcu_state.gp_state, t ? t->__state : 0x1ffff,
> - 		ja, jr, jw, (long)data_race(rcu_state.gp_wake_seq),
> - 		(long)data_race(rcu_state.gp_seq),
> - 		(long)data_race(rcu_get_root()->gp_seq_needed),
> - 		data_race(rcu_state.gp_flags));
> + 		data_race(READ_ONCE(rcu_state.gp_state)),
>  -		t ? data_race(READ_ONCE(t->state)) : 0x1ffffL, t ? t->rt_priority : 0xffU,
> ++		t ? data_race(READ_ONCE(t->__state)) : 0x1ffffL, t ? t->rt_priority : 0xffU,
                                                              ^
I missed removing this 'L' the first time, but have fixed it up now.

-- 
Cheers,
Stephen Rothwell