Torture-test updates for v6.2
Subsystems (2)
Paul E. McKenney
maintainercover Torture-test updates for v6.2
Hello!
This series contains torture-test updates:
1. Verify NUM_ACTIVE_RCU_POLL_FULL_OLDSTATE.
2. Verify NUM_ACTIVE_RCU_POLL_OLDSTATE.
Thanx, Paul
------------------------------------------------------------------------
b/kernel/rcu/rcutorture.c | 23 +++++++++++++++++++++-- kernel/rcu/rcutorture.c | 22 ++++++++++++++++++++-- 2 files changed, 41 insertions(+), 4 deletions(-)
Paul E. McKenney
maintainerPATCH v3 1/2 rcutorture: Verify NUM_ACTIVE_RCU_POLL_FULL_OLDSTATE
This commit adds code to the RTWS_POLL_GET_FULL case of rcu_torture_writer() to verify that the value of NUM_ACTIVE_RCU_POLL_FULL_OLDSTATE is sufficiently large.
[ paulmck: Fix whitespace issue located by checkpatch.pl. ]
--- kernel/rcu/rcutorture.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
kernel/rcu/rcutorture.c +21 -2
@@ -357,6 +357,8 @@ struct rcu_torture_ops {bool (*poll_gp_state_exp)(unsigned long oldstate);void (*cond_sync_exp)(unsigned long oldstate);void (*cond_sync_exp_full)(struct rcu_gp_oldstate *rgosp); +void (*get_comp_state_full)(struct rcu_gp_oldstate *rgosp); +bool (*same_gp_state_full)(struct rcu_gp_oldstate *rgosp1,struct rcu_gp_oldstate *rgosp2);unsigned long (*get_gp_state)(void );void (*get_gp_state_full)(struct rcu_gp_oldstate *rgosp);unsigned long (*get_gp_completed)(void );
@@ -535,6 +537,8 @@ static struct rcu_torture_ops rcu_ops = { .deferred_free = rcu_torture_deferred_free, .sync = synchronize_rcu, .exp_sync = synchronize_rcu_expedited, + .same_gp_state_full = same_state_synchronize_rcu_full, + .get_comp_state_full = get_completed_synchronize_rcu_full, .get_gp_state = get_state_synchronize_rcu, .get_gp_state_full = get_state_synchronize_rcu_full, .get_gp_completed = get_completed_synchronize_rcu,
@@ -1264,7 +1268,8 @@ static void rcu_torture_write_types(void) }else if (gp_poll && (!cur_ops->start_gp_poll || !cur_ops->poll_gp_state)) {pr_alert ("%s: gp_poll without primitives.\n" , __func__); } -if (gp_poll_full1 && cur_ops->start_gp_poll_full && cur_ops->poll_gp_state_full) { +if (gp_poll_full1 && cur_ops->get_comp_state_full && cur_ops->same_gp_state_full + && cur_ops->start_gp_poll_full && cur_ops->poll_gp_state_full) { synctype[nsynctypes++] =RTWS_POLL_GET_FULL ;pr_info ("%s: Testing polling full-state GPs.\n" , __func__); }else if (gp_poll_full && (!cur_ops->start_gp_poll_full || !cur_ops->poll_gp_state_full)) {
@@ -1340,9 +1345,11 @@ rcu_torture_writer(void *arg)int expediting =0 ;unsigned long gp_snap;struct rcu_gp_oldstate gp_snap_full; +struct rcu_gp_oldstate gp_snap1_full;int i;int idx;int oldnice =task_nice (current); +struct rcu_gp_oldstate rgo[NUM_ACTIVE_RCU_POLL_FULL_OLDSTATE ];struct rcu_torture *rp;struct rcu_torture *old_rp;static DEFINE_TORTURE_RANDOM (rand);
@@ -1472,11 +1479,23 @@ rcu_torture_writer(void *arg)break ;case RTWS_POLL_GET_FULL : rcu_torture_writer_state =RTWS_POLL_GET_FULL ; +for (i =0 ; i <ARRAY_SIZE (rgo); i++) + cur_ops->get_comp_state_full (&rgo[i]); cur_ops->start_gp_poll_full (&gp_snap_full); rcu_torture_writer_state =RTWS_POLL_WAIT_FULL ; -while (!cur_ops->poll_gp_state_full (&gp_snap_full)) +while (!cur_ops->poll_gp_state_full (&gp_snap_full)) { + cur_ops->get_gp_state_full (&gp_snap1_full); +for (i =0 ; i <ARRAY_SIZE (rgo); i++) +if (cur_ops->poll_gp_state_full (&rgo[i]) || + cur_ops->same_gp_state_full (&rgo[i], + &gp_snap1_full)) { + rgo[i] = gp_snap1_full; +break ; + } +WARN_ON_ONCE (i >=ARRAY_SIZE (rgo));torture_hrtimeout_jiffies (torture_random (&rand) %16 , &rand); + }rcu_torture_pipe_update (old_rp);break ;case RTWS_POLL_GET_EXP :
Signature · 1 line
2.31.1.189.g2e36527f23
Paul E. McKenney
maintainerPATCH v3 2/2 rcutorture: Verify NUM_ACTIVE_RCU_POLL_OLDSTATE
In reply to Paul E. McKenneyThis commit adds code to the RTWS_POLL_GET case of rcu_torture_writer() to verify that the value of NUM_ACTIVE_RCU_POLL_OLDSTATE is sufficiently large
--- kernel/rcu/rcutorture.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
kernel/rcu/rcutorture.c +20 -2
@@ -357,7 +357,9 @@ struct rcu_torture_ops {bool (*poll_gp_state_exp)(unsigned long oldstate);void (*cond_sync_exp)(unsigned long oldstate);void (*cond_sync_exp_full)(struct rcu_gp_oldstate *rgosp); +unsigned long (*get_comp_state)(void );void (*get_comp_state_full)(struct rcu_gp_oldstate *rgosp); +bool (*same_gp_state)(unsigned long oldstate1,unsigned long oldstate2);bool (*same_gp_state_full)(struct rcu_gp_oldstate *rgosp1,struct rcu_gp_oldstate *rgosp2);unsigned long (*get_gp_state)(void );void (*get_gp_state_full)(struct rcu_gp_oldstate *rgosp);
@@ -537,7 +539,9 @@ static struct rcu_torture_ops rcu_ops = { .deferred_free = rcu_torture_deferred_free, .sync = synchronize_rcu, .exp_sync = synchronize_rcu_expedited, + .same_gp_state = same_state_synchronize_rcu, .same_gp_state_full = same_state_synchronize_rcu_full, + .get_comp_state = get_completed_synchronize_rcu, .get_comp_state_full = get_completed_synchronize_rcu_full, .get_gp_state = get_state_synchronize_rcu, .get_gp_state_full = get_state_synchronize_rcu_full,
@@ -1262,7 +1266,8 @@ static void rcu_torture_write_types(void) }else if (gp_normal && !cur_ops->deferred_free) {pr_alert ("%s: gp_normal without primitives.\n" , __func__); } -if (gp_poll1 && cur_ops->start_gp_poll && cur_ops->poll_gp_state) { +if (gp_poll1 && cur_ops->get_comp_state && cur_ops->same_gp_state && + cur_ops->start_gp_poll && cur_ops->poll_gp_state) { synctype[nsynctypes++] =RTWS_POLL_GET ;pr_info ("%s: Testing polling GPs.\n" , __func__); }else if (gp_poll && (!cur_ops->start_gp_poll || !cur_ops->poll_gp_state)) {
@@ -1344,6 +1349,7 @@ rcu_torture_writer(void *arg)struct rcu_gp_oldstate cookie_full;int expediting =0 ;unsigned long gp_snap; +unsigned long gp_snap1;struct rcu_gp_oldstate gp_snap_full;struct rcu_gp_oldstate gp_snap1_full;int i;
@@ -1354,6 +1360,7 @@ rcu_torture_writer(void *arg)struct rcu_torture *old_rp;static DEFINE_TORTURE_RANDOM (rand);bool stutter_waited; +unsigned long ulo[NUM_ACTIVE_RCU_POLL_OLDSTATE ];VERBOSE_TOROUT_STRING ("rcu_torture_writer task started" );if (!can_expedite)
@@ -1470,11 +1477,22 @@ rcu_torture_writer(void *arg)break ;case RTWS_POLL_GET : rcu_torture_writer_state =RTWS_POLL_GET ; +for (i =0 ; i <ARRAY_SIZE (ulo); i++) + ulo[i] = cur_ops->get_comp_state (); gp_snap = cur_ops->start_gp_poll (); rcu_torture_writer_state =RTWS_POLL_WAIT ; -while (!cur_ops->poll_gp_state (gp_snap)) +while (!cur_ops->poll_gp_state (gp_snap)) { + gp_snap1 = cur_ops->get_gp_state (); +for (i =0 ; i <ARRAY_SIZE (ulo); i++) +if (cur_ops->poll_gp_state (ulo[i]) || + cur_ops->same_gp_state (ulo[i], gp_snap1)) { + ulo[i] = gp_snap1; +break ; + } +WARN_ON_ONCE (i >=ARRAY_SIZE (ulo));torture_hrtimeout_jiffies (torture_random (&rand) %16 , &rand); + }rcu_torture_pipe_update (old_rp);break ;case RTWS_POLL_GET_FULL :
Signature · 1 line
2.31.1.189.g2e36527f23