2020-06-12 02:10:37

by Wei Yang

[permalink] [raw]
Subject: [PATCH 4/4] rcu: use gp_seq instead of rcu_gp_seq for consistency

Commit de30ad512a66 ("rcu: Introduce grace-period sequence numbers")
introduce gp_seq in rcu_state/rcu_node/rcu_data. And this field in last
two structure track the one in first.

While the comment use rcu_gp_seq which is a little misleading for
audience. Let's use the exact name gp_seq for consistency.

Signed-off-by: Wei Yang <[email protected]>
---
kernel/rcu/tree.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
index 512829eed545..3356842bc185 100644
--- a/kernel/rcu/tree.h
+++ b/kernel/rcu/tree.h
@@ -41,7 +41,7 @@ struct rcu_node {
raw_spinlock_t __private lock; /* Root rcu_node's lock protects */
/* some rcu_state fields as well as */
/* following. */
- unsigned long gp_seq; /* Track rsp->rcu_gp_seq. */
+ unsigned long gp_seq; /* Track rsp->gp_seq. */
unsigned long gp_seq_needed; /* Track furthest future GP request. */
unsigned long completedqs; /* All QSes done for this node. */
unsigned long qsmask; /* CPUs or groups that need to switch in */
@@ -149,7 +149,7 @@ union rcu_noqs {
/* Per-CPU data for read-copy update. */
struct rcu_data {
/* 1) quiescent-state and grace-period handling : */
- unsigned long gp_seq; /* Track rsp->rcu_gp_seq counter. */
+ unsigned long gp_seq; /* Track rsp->gp_seq. */
unsigned long gp_seq_needed; /* Track furthest future GP request. */
union rcu_noqs cpu_no_qs; /* No QSes yet for this CPU. */
bool core_needs_qs; /* Core waits for quiesc state. */
--
2.20.1 (Apple Git-117)


2020-06-12 14:14:59

by Paul E. McKenney

[permalink] [raw]
Subject: Re: [PATCH 4/4] rcu: use gp_seq instead of rcu_gp_seq for consistency

On Fri, Jun 12, 2020 at 10:07:55AM +0800, Wei Yang wrote:
> Commit de30ad512a66 ("rcu: Introduce grace-period sequence numbers")
> introduce gp_seq in rcu_state/rcu_node/rcu_data. And this field in last
> two structure track the one in first.
>
> While the comment use rcu_gp_seq which is a little misleading for
> audience. Let's use the exact name gp_seq for consistency.
>
> Signed-off-by: Wei Yang <[email protected]>

I applied and pushed the others -- good eyes, and thank you!

This one does not apply. Could you please forward-port it to
the "dev" branch of -rcu?

git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git

Thanx, Paul

> ---
> kernel/rcu/tree.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
> index 512829eed545..3356842bc185 100644
> --- a/kernel/rcu/tree.h
> +++ b/kernel/rcu/tree.h
> @@ -41,7 +41,7 @@ struct rcu_node {
> raw_spinlock_t __private lock; /* Root rcu_node's lock protects */
> /* some rcu_state fields as well as */
> /* following. */
> - unsigned long gp_seq; /* Track rsp->rcu_gp_seq. */
> + unsigned long gp_seq; /* Track rsp->gp_seq. */
> unsigned long gp_seq_needed; /* Track furthest future GP request. */
> unsigned long completedqs; /* All QSes done for this node. */
> unsigned long qsmask; /* CPUs or groups that need to switch in */
> @@ -149,7 +149,7 @@ union rcu_noqs {
> /* Per-CPU data for read-copy update. */
> struct rcu_data {
> /* 1) quiescent-state and grace-period handling : */
> - unsigned long gp_seq; /* Track rsp->rcu_gp_seq counter. */
> + unsigned long gp_seq; /* Track rsp->gp_seq. */
> unsigned long gp_seq_needed; /* Track furthest future GP request. */
> union rcu_noqs cpu_no_qs; /* No QSes yet for this CPU. */
> bool core_needs_qs; /* Core waits for quiesc state. */
> --
> 2.20.1 (Apple Git-117)
>

2020-06-12 22:12:56

by Wei Yang

[permalink] [raw]
Subject: Re: [PATCH 4/4] rcu: use gp_seq instead of rcu_gp_seq for consistency

On Fri, Jun 12, 2020 at 07:12:48AM -0700, Paul E. McKenney wrote:
>On Fri, Jun 12, 2020 at 10:07:55AM +0800, Wei Yang wrote:
>> Commit de30ad512a66 ("rcu: Introduce grace-period sequence numbers")
>> introduce gp_seq in rcu_state/rcu_node/rcu_data. And this field in last
>> two structure track the one in first.
>>
>> While the comment use rcu_gp_seq which is a little misleading for
>> audience. Let's use the exact name gp_seq for consistency.
>>
>> Signed-off-by: Wei Yang <[email protected]>
>
>I applied and pushed the others -- good eyes, and thank you!
>
>This one does not apply. Could you please forward-port it to
>the "dev" branch of -rcu?
>

The reason is someone has already fixed this :-)

>git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
>
> Thanx, Paul
>
>> ---
>> kernel/rcu/tree.h | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
>> index 512829eed545..3356842bc185 100644
>> --- a/kernel/rcu/tree.h
>> +++ b/kernel/rcu/tree.h
>> @@ -41,7 +41,7 @@ struct rcu_node {
>> raw_spinlock_t __private lock; /* Root rcu_node's lock protects */
>> /* some rcu_state fields as well as */
>> /* following. */
>> - unsigned long gp_seq; /* Track rsp->rcu_gp_seq. */
>> + unsigned long gp_seq; /* Track rsp->gp_seq. */
>> unsigned long gp_seq_needed; /* Track furthest future GP request. */
>> unsigned long completedqs; /* All QSes done for this node. */
>> unsigned long qsmask; /* CPUs or groups that need to switch in */
>> @@ -149,7 +149,7 @@ union rcu_noqs {
>> /* Per-CPU data for read-copy update. */
>> struct rcu_data {
>> /* 1) quiescent-state and grace-period handling : */
>> - unsigned long gp_seq; /* Track rsp->rcu_gp_seq counter. */
>> + unsigned long gp_seq; /* Track rsp->gp_seq. */
>> unsigned long gp_seq_needed; /* Track furthest future GP request. */
>> union rcu_noqs cpu_no_qs; /* No QSes yet for this CPU. */
>> bool core_needs_qs; /* Core waits for quiesc state. */
>> --
>> 2.20.1 (Apple Git-117)
>>

--
Wei Yang
Help you, Help me

2020-06-12 23:19:54

by Paul E. McKenney

[permalink] [raw]
Subject: Re: [PATCH 4/4] rcu: use gp_seq instead of rcu_gp_seq for consistency

On Fri, Jun 12, 2020 at 10:10:25PM +0000, Wei Yang wrote:
> On Fri, Jun 12, 2020 at 07:12:48AM -0700, Paul E. McKenney wrote:
> >On Fri, Jun 12, 2020 at 10:07:55AM +0800, Wei Yang wrote:
> >> Commit de30ad512a66 ("rcu: Introduce grace-period sequence numbers")
> >> introduce gp_seq in rcu_state/rcu_node/rcu_data. And this field in last
> >> two structure track the one in first.
> >>
> >> While the comment use rcu_gp_seq which is a little misleading for
> >> audience. Let's use the exact name gp_seq for consistency.
> >>
> >> Signed-off-by: Wei Yang <[email protected]>
> >
> >I applied and pushed the others -- good eyes, and thank you!
> >
> >This one does not apply. Could you please forward-port it to
> >the "dev" branch of -rcu?
>
> The reason is someone has already fixed this :-)

That would explain it! ;-)

Thanx, Paul

> >git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
> >
> > Thanx, Paul
> >
> >> ---
> >> kernel/rcu/tree.h | 4 ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
> >> index 512829eed545..3356842bc185 100644
> >> --- a/kernel/rcu/tree.h
> >> +++ b/kernel/rcu/tree.h
> >> @@ -41,7 +41,7 @@ struct rcu_node {
> >> raw_spinlock_t __private lock; /* Root rcu_node's lock protects */
> >> /* some rcu_state fields as well as */
> >> /* following. */
> >> - unsigned long gp_seq; /* Track rsp->rcu_gp_seq. */
> >> + unsigned long gp_seq; /* Track rsp->gp_seq. */
> >> unsigned long gp_seq_needed; /* Track furthest future GP request. */
> >> unsigned long completedqs; /* All QSes done for this node. */
> >> unsigned long qsmask; /* CPUs or groups that need to switch in */
> >> @@ -149,7 +149,7 @@ union rcu_noqs {
> >> /* Per-CPU data for read-copy update. */
> >> struct rcu_data {
> >> /* 1) quiescent-state and grace-period handling : */
> >> - unsigned long gp_seq; /* Track rsp->rcu_gp_seq counter. */
> >> + unsigned long gp_seq; /* Track rsp->gp_seq. */
> >> unsigned long gp_seq_needed; /* Track furthest future GP request. */
> >> union rcu_noqs cpu_no_qs; /* No QSes yet for this CPU. */
> >> bool core_needs_qs; /* Core waits for quiesc state. */
> >> --
> >> 2.20.1 (Apple Git-117)
> >>
>
> --
> Wei Yang
> Help you, Help me