Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18952651 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

Merge branches 'fixes1.2018.07.12b' and 'torture1.2018.07.12b' into HEAD 

fixes1.2018.07.12b: Post-gp_seq miscellaneous fixes
torture1.2018.07.12b: Post-gp_seq torture-test updates
parents c7cd161e bf5b6435

Documentation/admin-guide/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -3632,8 +3632,8 @@ 
			Set time (s) after boot for CPU-hotplug testing.



	rcutorture.onoff_interval= [KNL]

			Set time (s) between CPU-hotplug operations, or

			zero to disable CPU-hotplug testing.

			Set time (jiffies) between CPU-hotplug operations,

			or zero to disable CPU-hotplug testing.



	rcutorture.shuffle_interval= [KNL]

			Set task-shuffle interval (s).  Shuffling tasks

include/linux/torture.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ struct torture_random_state { 
	long trs_count;

};

#define DEFINE_TORTURE_RANDOM(name) struct torture_random_state name = { 0, 0 }

#define DEFINE_TORTURE_RANDOM_PERCPU(name) \

	DEFINE_PER_CPU(struct torture_random_state, name)

unsigned long torture_random(struct torture_random_state *trsp);



/* Task shuffler, which causes CPUs to occasionally go idle. */

kernel/rcu/rcu.h

+2 −4
Original line number Diff line number Diff line
@@ -467,7 +467,6 @@ enum rcutorture_type { 
#if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU)

void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags,

			    unsigned long *gp_seq);

void rcutorture_record_test_transition(void);

void rcutorture_record_progress(unsigned long vernum);

void do_trace_rcu_torture_read(const char *rcutorturename,

			       struct rcu_head *rhp,
@@ -481,7 +480,6 @@ static inline void rcutorture_get_gp_data(enum rcutorture_type test_type, 
	*flags = 0;

	*gp_seq = 0;

}

static inline void rcutorture_record_test_transition(void) { }

static inline void rcutorture_record_progress(unsigned long vernum) { }

#ifdef CONFIG_RCU_TRACE

void do_trace_rcu_torture_read(const char *rcutorturename,
@@ -527,9 +525,8 @@ static inline void rcu_force_quiescent_state(void) { } 
static inline void rcu_bh_force_quiescent_state(void) { }

static inline void rcu_sched_force_quiescent_state(void) { }

static inline void show_rcu_gp_kthreads(void) { }

static inline int rcu_get_gp_kthreads_prio(void) { return 0; }

#else /* #ifdef CONFIG_TINY_RCU */

extern unsigned long rcutorture_testseq;

extern unsigned long rcutorture_vernum;

unsigned long rcu_get_gp_seq(void);

unsigned long rcu_bh_get_gp_seq(void);

unsigned long rcu_sched_get_gp_seq(void);
@@ -537,6 +534,7 @@ unsigned long rcu_exp_batches_completed(void); 
unsigned long rcu_exp_batches_completed_sched(void);

unsigned long srcu_batches_completed(struct srcu_struct *sp);

void show_rcu_gp_kthreads(void);

int rcu_get_gp_kthreads_prio(void);

void rcu_force_quiescent_state(void);

void rcu_bh_force_quiescent_state(void);

void rcu_sched_force_quiescent_state(void);

kernel/rcu/rcuperf.c

+0 −5
Original line number Diff line number Diff line
@@ -369,11 +369,6 @@ static unsigned long rcuperf_seq_diff(unsigned long new, unsigned long old) 
	return cur_ops->gp_diff(new, old);

}



static bool __maybe_unused torturing_tasks(void)

{

	return cur_ops == &tasks_ops;

}



/*

 * If performance tests complete, wait for shutdown to commence.

 */

kernel/rcu/rcutorture.c

+288 −84

File changed.

Preview size limit exceeded, changes collapsed.