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

Merge branches 'fixes.2021.10.07a', 'scftorture.2021.09.16a',... 

Merge branches 'fixes.2021.10.07a', 'scftorture.2021.09.16a', 'tasks.2021.09.15a', 'torture.2021.09.13b' and 'torturescript.2021.09.16a' into HEAD

fixes.2021.10.07a: Miscellaneous fixes.
scftorture.2021.09.16a: smp_call_function torture-test updates.
tasks.2021.09.15a: Tasks-trace RCU updates.
torture.2021.09.13b: Other torture-test updates.
torturescript.2021.09.16a: Torture-test scripting updates.
parents 74aece72 f2bdf7dc 8af9e2c7 71921a96 faaaf2ac

include/linux/rcupdate_trace.h

+3 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static inline int rcu_read_lock_trace_held(void) 


#ifdef CONFIG_TASKS_TRACE_RCU



void rcu_read_unlock_trace_special(struct task_struct *t, int nesting);

void rcu_read_unlock_trace_special(struct task_struct *t);



/**

 * rcu_read_lock_trace - mark beginning of RCU-trace read-side critical section
@@ -80,7 +80,8 @@ static inline void rcu_read_unlock_trace(void) 
		WRITE_ONCE(t->trc_reader_nesting, nesting);

		return;  // We assume shallow reader nesting.

	}

	rcu_read_unlock_trace_special(t, nesting);

	WARN_ON_ONCE(nesting != 0);

	rcu_read_unlock_trace_special(t);

}



void call_rcu_tasks_trace(struct rcu_head *rhp, rcu_callback_t func);

include/linux/torture.h

+8 −0
Original line number Diff line number Diff line
@@ -47,6 +47,14 @@ do { \ 
} while (0)

void verbose_torout_sleep(void);



#define torture_init_error(firsterr)						\

({										\

	int ___firsterr = (firsterr);						\

										\

	WARN_ONCE(!IS_MODULE(CONFIG_RCU_TORTURE_TEST) && ___firsterr < 0, "Torture-test initialization failed with error code %d\n", ___firsterr); \

	___firsterr < 0;								\

})



/* Definitions for online/offline exerciser. */

#ifdef CONFIG_HOTPLUG_CPU

int torture_num_online_cpus(void);

kernel/locking/locktorture.c

+7 −7
Original line number Diff line number Diff line
@@ -1022,23 +1022,23 @@ static int __init lock_torture_init(void) 
	if (onoff_interval > 0) {

		firsterr = torture_onoff_init(onoff_holdoff * HZ,

					      onoff_interval * HZ, NULL);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	if (shuffle_interval > 0) {

		firsterr = torture_shuffle_init(shuffle_interval);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	if (shutdown_secs > 0) {

		firsterr = torture_shutdown_init(shutdown_secs,

						 lock_torture_cleanup);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	if (stutter > 0) {

		firsterr = torture_stutter_init(stutter, stutter);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}
@@ -1082,7 +1082,7 @@ static int __init lock_torture_init(void) 
		/* Create writer. */

		firsterr = torture_create_kthread(lock_torture_writer, &cxt.lwsa[i],

						  writer_tasks[i]);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;



	create_reader:
@@ -1091,13 +1091,13 @@ static int __init lock_torture_init(void) 
		/* Create reader. */

		firsterr = torture_create_kthread(lock_torture_reader, &cxt.lrsa[j],

						  reader_tasks[j]);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	if (stat_interval > 0) {

		firsterr = torture_create_kthread(lock_torture_stats, NULL,

						  stats_task);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	torture_init_end();

kernel/rcu/rcuscale.c

+5 −5
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ kfree_scale_init(void) 
		init_waitqueue_head(&shutdown_wq);

		firsterr = torture_create_kthread(kfree_scale_shutdown, NULL,

						  shutdown_task);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

		schedule_timeout_uninterruptible(1);

	}
@@ -775,7 +775,7 @@ kfree_scale_init(void) 
	for (i = 0; i < kfree_nrealthreads; i++) {

		firsterr = torture_create_kthread(kfree_scale_thread, (void *)i,

						  kfree_reader_tasks[i]);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}
@@ -838,7 +838,7 @@ rcu_scale_init(void) 
		init_waitqueue_head(&shutdown_wq);

		firsterr = torture_create_kthread(rcu_scale_shutdown, NULL,

						  shutdown_task);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

		schedule_timeout_uninterruptible(1);

	}
@@ -852,7 +852,7 @@ rcu_scale_init(void) 
	for (i = 0; i < nrealreaders; i++) {

		firsterr = torture_create_kthread(rcu_scale_reader, (void *)i,

						  reader_tasks[i]);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	while (atomic_read(&n_rcu_scale_reader_started) < nrealreaders)
@@ -879,7 +879,7 @@ rcu_scale_init(void) 
		}

		firsterr = torture_create_kthread(rcu_scale_writer, (void *)i,

						  writer_tasks[i]);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	torture_init_end();

kernel/rcu/rcutorture.c

+54 −30
Original line number Diff line number Diff line
@@ -1432,28 +1432,34 @@ static void rcutorture_one_extend(int *readstate, int newstate, 
	/* First, put new protection in place to avoid critical-section gap. */

	if (statesnew & RCUTORTURE_RDR_BH)

		local_bh_disable();

	if (statesnew & RCUTORTURE_RDR_RBH)

		rcu_read_lock_bh();

	if (statesnew & RCUTORTURE_RDR_IRQ)

		local_irq_disable();

	if (statesnew & RCUTORTURE_RDR_PREEMPT)

		preempt_disable();

	if (statesnew & RCUTORTURE_RDR_RBH)

		rcu_read_lock_bh();

	if (statesnew & RCUTORTURE_RDR_SCHED)

		rcu_read_lock_sched();

	if (statesnew & RCUTORTURE_RDR_RCU)

		idxnew = cur_ops->readlock() << RCUTORTURE_RDR_SHIFT;



	/* Next, remove old protection, irq first due to bh conflict. */

	/*

	 * Next, remove old protection, in decreasing order of strength

	 * to avoid unlock paths that aren't safe in the stronger

	 * context. Namely: BH can not be enabled with disabled interrupts.

	 * Additionally PREEMPT_RT requires that BH is enabled in preemptible

	 * context.

	 */

	if (statesold & RCUTORTURE_RDR_IRQ)

		local_irq_enable();

	if (statesold & RCUTORTURE_RDR_BH)

		local_bh_enable();

	if (statesold & RCUTORTURE_RDR_PREEMPT)

		preempt_enable();

	if (statesold & RCUTORTURE_RDR_RBH)

		rcu_read_unlock_bh();

	if (statesold & RCUTORTURE_RDR_SCHED)

		rcu_read_unlock_sched();

	if (statesold & RCUTORTURE_RDR_BH)

		local_bh_enable();

	if (statesold & RCUTORTURE_RDR_RBH)

		rcu_read_unlock_bh();

	if (statesold & RCUTORTURE_RDR_RCU) {

		bool lockit = !statesnew && !(torture_random(trsp) & 0xffff);
@@ -1496,6 +1502,9 @@ rcutorture_extend_mask(int oldmask, struct torture_random_state *trsp) 
	int mask = rcutorture_extend_mask_max();

	unsigned long randmask1 = torture_random(trsp) >> 8;

	unsigned long randmask2 = randmask1 >> 3;

	unsigned long preempts = RCUTORTURE_RDR_PREEMPT | RCUTORTURE_RDR_SCHED;

	unsigned long preempts_irq = preempts | RCUTORTURE_RDR_IRQ;

	unsigned long bhs = RCUTORTURE_RDR_BH | RCUTORTURE_RDR_RBH;



	WARN_ON_ONCE(mask >> RCUTORTURE_RDR_SHIFT);

	/* Mostly only one bit (need preemption!), sometimes lots of bits. */
@@ -1503,11 +1512,26 @@ rcutorture_extend_mask(int oldmask, struct torture_random_state *trsp) 
		mask = mask & randmask2;

	else

		mask = mask & (1 << (randmask2 % RCUTORTURE_RDR_NBITS));

	/* Can't enable bh w/irq disabled. */

	if ((mask & RCUTORTURE_RDR_IRQ) &&

	    ((!(mask & RCUTORTURE_RDR_BH) && (oldmask & RCUTORTURE_RDR_BH)) ||

	     (!(mask & RCUTORTURE_RDR_RBH) && (oldmask & RCUTORTURE_RDR_RBH))))

		mask |= RCUTORTURE_RDR_BH | RCUTORTURE_RDR_RBH;



	/*

	 * Can't enable bh w/irq disabled.

	 */

	if (mask & RCUTORTURE_RDR_IRQ)

		mask |= oldmask & bhs;



	/*

	 * Ideally these sequences would be detected in debug builds

	 * (regardless of RT), but until then don't stop testing

	 * them on non-RT.

	 */

	if (IS_ENABLED(CONFIG_PREEMPT_RT)) {

		/* Can't modify BH in atomic context */

		if (oldmask & preempts_irq)

			mask &= ~bhs;

		if ((oldmask | mask) & preempts_irq)

			mask |= oldmask & bhs;

	}



	return mask ?: RCUTORTURE_RDR_RCU;

}
@@ -2741,7 +2765,7 @@ static int rcu_torture_read_exit(void *unused) 
static int rcu_torture_read_exit_init(void)

{

	if (read_exit_burst <= 0)

		return -EINVAL;

		return 0;

	init_waitqueue_head(&read_exit_wq);

	read_exit_child_stop = false;

	read_exit_child_stopped = false;
@@ -2819,7 +2843,7 @@ rcu_torture_cleanup(void) 
		 rcutorture_seq_diff(gp_seq, start_gp_seq));

	torture_stop_kthread(rcu_torture_stats, stats_task);

	torture_stop_kthread(rcu_torture_fqs, fqs_task);

	if (rcu_torture_can_boost())

	if (rcu_torture_can_boost() && rcutor_hp >= 0)

		cpuhp_remove_state(rcutor_hp);



	/*
@@ -3037,7 +3061,7 @@ rcu_torture_init(void) 
	rcu_torture_write_types();

	firsterr = torture_create_kthread(rcu_torture_writer, NULL,

					  writer_task);

	if (firsterr)

	if (torture_init_error(firsterr))

		goto unwind;

	if (nfakewriters > 0) {

		fakewriter_tasks = kcalloc(nfakewriters,
@@ -3052,7 +3076,7 @@ rcu_torture_init(void) 
	for (i = 0; i < nfakewriters; i++) {

		firsterr = torture_create_kthread(rcu_torture_fakewriter,

						  NULL, fakewriter_tasks[i]);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	reader_tasks = kcalloc(nrealreaders, sizeof(reader_tasks[0]),
@@ -3068,7 +3092,7 @@ rcu_torture_init(void) 
		rcu_torture_reader_mbchk[i].rtc_chkrdr = -1;

		firsterr = torture_create_kthread(rcu_torture_reader, (void *)i,

						  reader_tasks[i]);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	nrealnocbers = nocbs_nthreads;
@@ -3088,18 +3112,18 @@ rcu_torture_init(void) 
	}

	for (i = 0; i < nrealnocbers; i++) {

		firsterr = torture_create_kthread(rcu_nocb_toggle, NULL, nocb_tasks[i]);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	if (stat_interval > 0) {

		firsterr = torture_create_kthread(rcu_torture_stats, NULL,

						  stats_task);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	if (test_no_idle_hz && shuffle_interval > 0) {

		firsterr = torture_shuffle_init(shuffle_interval * HZ);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	if (stutter < 0)
@@ -3109,7 +3133,7 @@ rcu_torture_init(void) 


		t = cur_ops->stall_dur ? cur_ops->stall_dur() : stutter * HZ;

		firsterr = torture_stutter_init(stutter * HZ, t);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	if (fqs_duration < 0)
@@ -3118,7 +3142,7 @@ rcu_torture_init(void) 
		/* Create the fqs thread */

		firsterr = torture_create_kthread(rcu_torture_fqs, NULL,

						  fqs_task);

		if (firsterr)

		if (torture_init_error(firsterr))

			goto unwind;

	}

	if (test_boost_interval < 1)
@@ -3132,9 +3156,9 @@ rcu_torture_init(void) 
		firsterr = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "RCU_TORTURE",

					     rcutorture_booster_init,

					     rcutorture_booster_cleanup);

		if (firsterr < 0)

			goto unwind;

		rcutor_hp = firsterr;

		if (torture_init_error(firsterr))

			goto unwind;



		// Testing RCU priority boosting requires rcutorture do

		// some serious abuse.  Counter this by running ksoftirqd
@@ -3153,23 +3177,23 @@ rcu_torture_init(void) 
	}

	shutdown_jiffies = jiffies + shutdown_secs * HZ;

	firsterr = torture_shutdown_init(shutdown_secs, rcu_torture_cleanup);

	if (firsterr)

	if (torture_init_error(firsterr))

		goto unwind;

	firsterr = torture_onoff_init(onoff_holdoff * HZ, onoff_interval,

				      rcutorture_sync);

	if (firsterr)

	if (torture_init_error(firsterr))

		goto unwind;

	firsterr = rcu_torture_stall_init();

	if (firsterr)

	if (torture_init_error(firsterr))

		goto unwind;

	firsterr = rcu_torture_fwd_prog_init();

	if (firsterr)

	if (torture_init_error(firsterr))

		goto unwind;

	firsterr = rcu_torture_barrier_init();

	if (firsterr)

	if (torture_init_error(firsterr))

		goto unwind;

	firsterr = rcu_torture_read_exit_init();

	if (firsterr)

	if (torture_init_error(firsterr))

		goto unwind;

	if (object_debug)

		rcu_test_debug_objects();