@@ -1209,7 +1209,7 @@ static bool rcu_start_this_gp(struct rcu_node *rnp_start, struct rcu_data *rdp,
1209
1209
trace_rcu_this_gp (rnp , rdp , gp_seq_req , TPS ("NoGPkthread" ));
1210
1210
goto unlock_out ;
1211
1211
}
1212
- trace_rcu_grace_period (rcu_state .name , READ_ONCE ( rcu_state .gp_seq ) , TPS ("newreq" ));
1212
+ trace_rcu_grace_period (rcu_state .name , rcu_state .gp_seq , TPS ("newreq" ));
1213
1213
ret = true; /* Caller must wake GP kthread. */
1214
1214
unlock_out :
1215
1215
/* Push furthest requested GP to leaf node and rcu_data structure. */
@@ -1657,8 +1657,7 @@ static void rcu_gp_fqs_loop(void)
1657
1657
WRITE_ONCE (rcu_state .jiffies_kick_kthreads ,
1658
1658
jiffies + (j ? 3 * j : 2 ));
1659
1659
}
1660
- trace_rcu_grace_period (rcu_state .name ,
1661
- READ_ONCE (rcu_state .gp_seq ),
1660
+ trace_rcu_grace_period (rcu_state .name , rcu_state .gp_seq ,
1662
1661
TPS ("fqswait" ));
1663
1662
rcu_state .gp_state = RCU_GP_WAIT_FQS ;
1664
1663
ret = swait_event_idle_timeout_exclusive (
@@ -1672,13 +1671,11 @@ static void rcu_gp_fqs_loop(void)
1672
1671
/* If time for quiescent-state forcing, do it. */
1673
1672
if (ULONG_CMP_GE (jiffies , rcu_state .jiffies_force_qs ) ||
1674
1673
(gf & RCU_GP_FLAG_FQS )) {
1675
- trace_rcu_grace_period (rcu_state .name ,
1676
- READ_ONCE (rcu_state .gp_seq ),
1674
+ trace_rcu_grace_period (rcu_state .name , rcu_state .gp_seq ,
1677
1675
TPS ("fqsstart" ));
1678
1676
rcu_gp_fqs (first_gp_fqs );
1679
1677
first_gp_fqs = false;
1680
- trace_rcu_grace_period (rcu_state .name ,
1681
- READ_ONCE (rcu_state .gp_seq ),
1678
+ trace_rcu_grace_period (rcu_state .name , rcu_state .gp_seq ,
1682
1679
TPS ("fqsend" ));
1683
1680
cond_resched_tasks_rcu_qs ();
1684
1681
WRITE_ONCE (rcu_state .gp_activity , jiffies );
@@ -1689,8 +1686,7 @@ static void rcu_gp_fqs_loop(void)
1689
1686
cond_resched_tasks_rcu_qs ();
1690
1687
WRITE_ONCE (rcu_state .gp_activity , jiffies );
1691
1688
WARN_ON (signal_pending (current ));
1692
- trace_rcu_grace_period (rcu_state .name ,
1693
- READ_ONCE (rcu_state .gp_seq ),
1689
+ trace_rcu_grace_period (rcu_state .name , rcu_state .gp_seq ,
1694
1690
TPS ("fqswaitsig" ));
1695
1691
ret = 1 ; /* Keep old FQS timing. */
1696
1692
j = jiffies ;
@@ -1782,7 +1778,7 @@ static void rcu_gp_cleanup(void)
1782
1778
WRITE_ONCE (rcu_state .gp_flags , RCU_GP_FLAG_INIT );
1783
1779
WRITE_ONCE (rcu_state .gp_req_activity , jiffies );
1784
1780
trace_rcu_grace_period (rcu_state .name ,
1785
- READ_ONCE ( rcu_state .gp_seq ) ,
1781
+ rcu_state .gp_seq ,
1786
1782
TPS ("newreq" ));
1787
1783
} else {
1788
1784
WRITE_ONCE (rcu_state .gp_flags ,
@@ -1801,8 +1797,7 @@ static int __noreturn rcu_gp_kthread(void *unused)
1801
1797
1802
1798
/* Handle grace-period start. */
1803
1799
for (;;) {
1804
- trace_rcu_grace_period (rcu_state .name ,
1805
- READ_ONCE (rcu_state .gp_seq ),
1800
+ trace_rcu_grace_period (rcu_state .name , rcu_state .gp_seq ,
1806
1801
TPS ("reqwait" ));
1807
1802
rcu_state .gp_state = RCU_GP_WAIT_GPS ;
1808
1803
swait_event_idle_exclusive (rcu_state .gp_wq ,
@@ -1815,8 +1810,7 @@ static int __noreturn rcu_gp_kthread(void *unused)
1815
1810
cond_resched_tasks_rcu_qs ();
1816
1811
WRITE_ONCE (rcu_state .gp_activity , jiffies );
1817
1812
WARN_ON (signal_pending (current ));
1818
- trace_rcu_grace_period (rcu_state .name ,
1819
- READ_ONCE (rcu_state .gp_seq ),
1813
+ trace_rcu_grace_period (rcu_state .name , rcu_state .gp_seq ,
1820
1814
TPS ("reqwaitsig" ));
1821
1815
}
1822
1816
0 commit comments