[PATCH tip/core/rcu 3/8] rcu: Rename note_new_gpnum() to note_gp_changes()

2013-05-20 Thread Paul E. McKenney 
From: "Paul E. McKenney" 

Because note_new_gpnum() now also checks for the ends of old grace periods,
this commit changes its name to note_gp_changes().  Later commits will merge
rcu_process_gp_end() into note_gp_changes().

Signed-off-by: Paul E. McKenney 
Reviewed-by: Josh Triplett 
---
 kernel/rcutree.c | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index 46f3062..2f40b4d 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -1307,7 +1307,7 @@ __rcu_process_gp_end(struct rcu_state *rsp, struct 
rcu_node *rnp, struct rcu_dat
  * ->lock of the leaf rcu_node structure corresponding to the current CPU,
  *  and must have irqs disabled.
  */
-static void __note_new_gpnum(struct rcu_state *rsp, struct rcu_node *rnp, 
struct rcu_data *rdp)
+static void __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp, 
struct rcu_data *rdp)
 {
/* Handle the ends of any preceding grace periods first. */
__rcu_process_gp_end(rsp, rnp, rdp);
@@ -1326,19 +1326,20 @@ static void __note_new_gpnum(struct rcu_state *rsp, 
struct rcu_node *rnp, struct
}
 }
 
-static void note_new_gpnum(struct rcu_state *rsp, struct rcu_data *rdp)
+static void note_gp_changes(struct rcu_state *rsp, struct rcu_data *rdp)
 {
unsigned long flags;
struct rcu_node *rnp;
 
local_irq_save(flags);
rnp = rdp->mynode;
-   if (rdp->gpnum == ACCESS_ONCE(rnp->gpnum) || /* outside lock. */
+   if ((rdp->gpnum == ACCESS_ONCE(rnp->gpnum) &&
+rdp->completed == ACCESS_ONCE(rnp->completed)) || /* w/out lock. */
!raw_spin_trylock(>lock)) { /* irqs already off, so later. */
local_irq_restore(flags);
return;
}
-   __note_new_gpnum(rsp, rnp, rdp);
+   __note_gp_changes(rsp, rnp, rdp);
raw_spin_unlock_irqrestore(>lock, flags);
 }
 
@@ -1377,7 +1378,7 @@ check_for_new_grace_period(struct rcu_state *rsp, struct 
rcu_data *rdp)
 
local_irq_save(flags);
if (rdp->gpnum != rsp->gpnum) {
-   note_new_gpnum(rsp, rdp);
+   note_gp_changes(rsp, rdp);
ret = 1;
}
local_irq_restore(flags);
@@ -1396,7 +1397,7 @@ rcu_start_gp_per_cpu(struct rcu_state *rsp, struct 
rcu_node *rnp, struct rcu_dat
__rcu_process_gp_end(rsp, rnp, rdp);
 
/* Set state so that this CPU will detect the next quiescent state. */
-   __note_new_gpnum(rsp, rnp, rdp);
+   __note_gp_changes(rsp, rnp, rdp);
 }
 
 /*
-- 
1.8.1.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH tip/core/rcu 3/8] rcu: Rename note_new_gpnum() to note_gp_changes()

2013-05-20 Thread Paul E. McKenney 
From: Paul E. McKenney paul...@linux.vnet.ibm.com

Because note_new_gpnum() now also checks for the ends of old grace periods,
this commit changes its name to note_gp_changes().  Later commits will merge
rcu_process_gp_end() into note_gp_changes().

Signed-off-by: Paul E. McKenney paul...@linux.vnet.ibm.com
Reviewed-by: Josh Triplett j...@joshtriplett.org
---
 kernel/rcutree.c | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index 46f3062..2f40b4d 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -1307,7 +1307,7 @@ __rcu_process_gp_end(struct rcu_state *rsp, struct 
rcu_node *rnp, struct rcu_dat
  * -lock of the leaf rcu_node structure corresponding to the current CPU,
  *  and must have irqs disabled.
  */
-static void __note_new_gpnum(struct rcu_state *rsp, struct rcu_node *rnp, 
struct rcu_data *rdp)
+static void __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp, 
struct rcu_data *rdp)
 {
/* Handle the ends of any preceding grace periods first. */
__rcu_process_gp_end(rsp, rnp, rdp);
@@ -1326,19 +1326,20 @@ static void __note_new_gpnum(struct rcu_state *rsp, 
struct rcu_node *rnp, struct
}
 }
 
-static void note_new_gpnum(struct rcu_state *rsp, struct rcu_data *rdp)
+static void note_gp_changes(struct rcu_state *rsp, struct rcu_data *rdp)
 {
unsigned long flags;
struct rcu_node *rnp;
 
local_irq_save(flags);
rnp = rdp-mynode;
-   if (rdp-gpnum == ACCESS_ONCE(rnp-gpnum) || /* outside lock. */
+   if ((rdp-gpnum == ACCESS_ONCE(rnp-gpnum) 
+rdp-completed == ACCESS_ONCE(rnp-completed)) || /* w/out lock. */
!raw_spin_trylock(rnp-lock)) { /* irqs already off, so later. */
local_irq_restore(flags);
return;
}
-   __note_new_gpnum(rsp, rnp, rdp);
+   __note_gp_changes(rsp, rnp, rdp);
raw_spin_unlock_irqrestore(rnp-lock, flags);
 }
 
@@ -1377,7 +1378,7 @@ check_for_new_grace_period(struct rcu_state *rsp, struct 
rcu_data *rdp)
 
local_irq_save(flags);
if (rdp-gpnum != rsp-gpnum) {
-   note_new_gpnum(rsp, rdp);
+   note_gp_changes(rsp, rdp);
ret = 1;
}
local_irq_restore(flags);
@@ -1396,7 +1397,7 @@ rcu_start_gp_per_cpu(struct rcu_state *rsp, struct 
rcu_node *rnp, struct rcu_dat
__rcu_process_gp_end(rsp, rnp, rdp);
 
/* Set state so that this CPU will detect the next quiescent state. */
-   __note_new_gpnum(rsp, rnp, rdp);
+   __note_gp_changes(rsp, rnp, rdp);
 }
 
 /*
-- 
1.8.1.5

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH tip/core/rcu 3/8] rcu: Rename note_new_gpnum() to note_gp_changes()

2013-04-12 Thread Paul E. McKenney 
From: "Paul E. McKenney" 

Because note_new_gpnum() now also checks for the ends of old grace periods,
this commit changes its name to note_gp_changes().  Later commits will merge
rcu_process_gp_end() into note_gp_changes().

Signed-off-by: Paul E. McKenney 
---
 kernel/rcutree.c | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index a57bac3..dded193 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -1297,7 +1297,7 @@ __rcu_process_gp_end(struct rcu_state *rsp, struct 
rcu_node *rnp, struct rcu_dat
  * ->lock of the leaf rcu_node structure corresponding to the current CPU,
  *  and must have irqs disabled.
  */
-static void __note_new_gpnum(struct rcu_state *rsp, struct rcu_node *rnp, 
struct rcu_data *rdp)
+static void __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp, 
struct rcu_data *rdp)
 {
/* Handle the ends of any preceding grace periods first. */
__rcu_process_gp_end(rsp, rnp, rdp);
@@ -1316,19 +1316,20 @@ static void __note_new_gpnum(struct rcu_state *rsp, 
struct rcu_node *rnp, struct
}
 }
 
-static void note_new_gpnum(struct rcu_state *rsp, struct rcu_data *rdp)
+static void note_gp_changes(struct rcu_state *rsp, struct rcu_data *rdp)
 {
unsigned long flags;
struct rcu_node *rnp;
 
local_irq_save(flags);
rnp = rdp->mynode;
-   if (rdp->gpnum == ACCESS_ONCE(rnp->gpnum) || /* outside lock. */
+   if ((rdp->gpnum == ACCESS_ONCE(rnp->gpnum) &&
+rdp->completed == ACCESS_ONCE(rnp->completed)) || /* w/out lock. */
!raw_spin_trylock(>lock)) { /* irqs already off, so later. */
local_irq_restore(flags);
return;
}
-   __note_new_gpnum(rsp, rnp, rdp);
+   __note_gp_changes(rsp, rnp, rdp);
raw_spin_unlock_irqrestore(>lock, flags);
 }
 
@@ -1367,7 +1368,7 @@ check_for_new_grace_period(struct rcu_state *rsp, struct 
rcu_data *rdp)
 
local_irq_save(flags);
if (rdp->gpnum != rsp->gpnum) {
-   note_new_gpnum(rsp, rdp);
+   note_gp_changes(rsp, rdp);
ret = 1;
}
local_irq_restore(flags);
@@ -1386,7 +1387,7 @@ rcu_start_gp_per_cpu(struct rcu_state *rsp, struct 
rcu_node *rnp, struct rcu_dat
__rcu_process_gp_end(rsp, rnp, rdp);
 
/* Set state so that this CPU will detect the next quiescent state. */
-   __note_new_gpnum(rsp, rnp, rdp);
+   __note_gp_changes(rsp, rnp, rdp);
 }
 
 /*
-- 
1.8.1.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH tip/core/rcu 3/8] rcu: Rename note_new_gpnum() to note_gp_changes()

2013-04-12 Thread Paul E. McKenney 
From: Paul E. McKenney paul...@linux.vnet.ibm.com

Because note_new_gpnum() now also checks for the ends of old grace periods,
this commit changes its name to note_gp_changes().  Later commits will merge
rcu_process_gp_end() into note_gp_changes().

Signed-off-by: Paul E. McKenney paul...@linux.vnet.ibm.com
---
 kernel/rcutree.c | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index a57bac3..dded193 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -1297,7 +1297,7 @@ __rcu_process_gp_end(struct rcu_state *rsp, struct 
rcu_node *rnp, struct rcu_dat
  * -lock of the leaf rcu_node structure corresponding to the current CPU,
  *  and must have irqs disabled.
  */
-static void __note_new_gpnum(struct rcu_state *rsp, struct rcu_node *rnp, 
struct rcu_data *rdp)
+static void __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp, 
struct rcu_data *rdp)
 {
/* Handle the ends of any preceding grace periods first. */
__rcu_process_gp_end(rsp, rnp, rdp);
@@ -1316,19 +1316,20 @@ static void __note_new_gpnum(struct rcu_state *rsp, 
struct rcu_node *rnp, struct
}
 }
 
-static void note_new_gpnum(struct rcu_state *rsp, struct rcu_data *rdp)
+static void note_gp_changes(struct rcu_state *rsp, struct rcu_data *rdp)
 {
unsigned long flags;
struct rcu_node *rnp;
 
local_irq_save(flags);
rnp = rdp-mynode;
-   if (rdp-gpnum == ACCESS_ONCE(rnp-gpnum) || /* outside lock. */
+   if ((rdp-gpnum == ACCESS_ONCE(rnp-gpnum) 
+rdp-completed == ACCESS_ONCE(rnp-completed)) || /* w/out lock. */
!raw_spin_trylock(rnp-lock)) { /* irqs already off, so later. */
local_irq_restore(flags);
return;
}
-   __note_new_gpnum(rsp, rnp, rdp);
+   __note_gp_changes(rsp, rnp, rdp);
raw_spin_unlock_irqrestore(rnp-lock, flags);
 }
 
@@ -1367,7 +1368,7 @@ check_for_new_grace_period(struct rcu_state *rsp, struct 
rcu_data *rdp)
 
local_irq_save(flags);
if (rdp-gpnum != rsp-gpnum) {
-   note_new_gpnum(rsp, rdp);
+   note_gp_changes(rsp, rdp);
ret = 1;
}
local_irq_restore(flags);
@@ -1386,7 +1387,7 @@ rcu_start_gp_per_cpu(struct rcu_state *rsp, struct 
rcu_node *rnp, struct rcu_dat
__rcu_process_gp_end(rsp, rnp, rdp);
 
/* Set state so that this CPU will detect the next quiescent state. */
-   __note_new_gpnum(rsp, rnp, rdp);
+   __note_gp_changes(rsp, rnp, rdp);
 }
 
 /*
-- 
1.8.1.5

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/